Merge branch 'hotfix/293'

Fixes issues seen in #293

Author: weierophinney

.gitignore

@@ -7,3 +7,6 @@ tests/Zend/OpenId/_files/*
 tests/Zend/Translate/Adapter/_files/zend_cache---internal-metadatas---testid
 tests/Zend/Translate/Adapter/_files/zend_cache---testid
 vendor/*
+composer.lock
+bin/dbunit
+bin/phpunit

library/Zend/Xml/Security.php

@@ -51,7 +51,7 @@ protected static function heuristicScan($xml)
      * @param integer $errline
      * @return bool
      */
-    protected static function _loadXmlErrorHandler($errno, $errstr, $errfile, $errline)
+    public static function loadXmlErrorHandler($errno, $errstr, $errfile, $errline)
     {
         if (substr_count($errstr, 'DOMDocument::loadXML()') > 0) {
             return true;
@@ -88,7 +88,7 @@ public static function scan($xml, DOMDocument $dom = null)
 
         // Load XML with network access disabled (LIBXML_NONET)
         // error disabled with @ for PHP-FPM scenario
-        set_error_handler(array('Zend_Xml_Security', '_loadXmlErrorHandler'), E_WARNING);
+        set_error_handler(array('Zend_Xml_Security', 'loadXmlErrorHandler'), E_WARNING);
 
         $result = $dom->loadXml($xml, LIBXML_NONET);
         restore_error_handler();

tests/Zend/Xml/SecurityTest.php

@@ -90,7 +90,7 @@ public function testScanSimpleXmlResult()
     {
         $result = Zend_Xml_Security::scan($this->_getXml());
         $this->assertTrue($result instanceof SimpleXMLElement);
-        $this->assertEquals($result->result, 'test');
+        $this->assertEquals((string) $result->result, 'test');
     }
 
     public function testScanDom()
@@ -130,7 +130,7 @@ public function testScanFile()
 
         $result = Zend_Xml_Security::scanFile($file);
         $this->assertTrue($result instanceof SimpleXMLElement);
-        $this->assertEquals($result->result, 'test');
+        $this->assertEquals((string) $result->result, 'test');
         unlink($file);
     }