MAGETWO-31422: XML file syntax error does not report file name error is in

- fixed code style
- added test for Parser

Author: Ivan Gavryshko

dev/tests/unit/testsuite/Magento/Framework/Xml/ParserTest.php

@@ -11,6 +11,13 @@ class ParserTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Xml\Parser */
     protected $parser;
 
+    /**
+     * A sample invalid XML
+     *
+     * @var string
+     */
+    private static $sampleXml = '<?xml version="1.0"?><config></onfig>';
+
     protected function setUp()
     {
         $this->parser = new \Magento\Framework\Xml\Parser();
@@ -31,4 +38,14 @@ public function testGetXml()
             $this->parser->load(__DIR__ . '/_files/data.xml')->xmlToArray()
         );
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception
+     * @expectedExceptionMessage DOMDocument::loadXML(): Opening and ending tag mismatch
+     */
+    public function testInvalidXml()
+    {
+        $this->parser->initErrorHandler();
+        $this->parser->loadXML(self::$sampleXml);
+    }
 }

lib/internal/Magento/Framework/Module/ModuleList/Loader.php

@@ -32,6 +32,7 @@ class Loader
 
     /**
      * Parser
+     *
      * @var \Magento\Framework\Xml\Parser
      */
     private $parser;
@@ -67,8 +68,9 @@ public function load()
                 $this->parser->loadXML($contents);
             } catch (\Magento\Framework\Exception $e) {
                 throw new \Magento\Framework\Exception(
-                    'Invalid Document: ' . $file . PHP_EOL
-                    . ' Error: ' . $e->getMessage()
+                    'Invalid Document: ' . $file . PHP_EOL . ' Error: ' . $e->getMessage(),
+                    $e->getCode(),
+                    $e
                 );
             }
 

lib/internal/Magento/Framework/Xml/Parser.php

@@ -156,7 +156,12 @@ public function loadXML($string)
             set_error_handler([$this, 'errorHandler']);
         }
 
-        $this->getDom()->loadXML($string);
+        try {
+            $this->getDom()->loadXML($string);
+        } catch(\Magento\Framework\Exception $e) {
+            restore_error_handler();
+            throw new \Magento\Framework\Exception($e->getMessage(), $e->getCode(), $e);
+        }
 
         if ($this->errorHandlerIsActive) {
             restore_error_handler();
@@ -168,10 +173,10 @@ public function loadXML($string)
     /**
      * Custom XML lib error handler
      *
-     * @param $errorNo
-     * @param $errorStr
-     * @param $errorFile
-     * @param $errorLine
+     * @param int $errorNo
+     * @param string $errorStr
+     * @param string $errorFile
+     * @param int $errorLine
      * @throws \Magento\Framework\Exception
      * @return void
      */