MAGETWO-31059: Integration tests with fatals, code under test and framework adaptation

 - Fix tests

Author: Sanuch

dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php

@@ -43,7 +43,9 @@ public function setUp()
     public function testInterpretBlockDirective()
     {
         $pageXml = new \Magento\Framework\View\Layout\Element(
-            __DIR__ . '/_files/_layout_update_block.xml', 0, true
+            __DIR__ . '/_files/_layout_update_block.xml',
+            0,
+            true
         );
         $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
 
@@ -74,7 +76,9 @@ public function testInterpretBlockDirective()
     public function testInterpretReferenceBlockDirective()
     {
         $pageXml = new \Magento\Framework\View\Layout\Element(
-            __DIR__ . '/_files/_layout_update_reference.xml', 0, true
+            __DIR__ . '/_files/_layout_update_reference.xml',
+            0,
+            true
         );
         $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
 

dev/tests/unit/testsuite/Magento/Framework/Module/Declaration/Converter/DomTest.php

@@ -34,16 +34,20 @@ public function testConvertWithValidDom()
     public function testConvertWithInvalidDom($xmlString)
     {
         $dom = new \DOMDocument();
-        $dom->loadXML($xmlString);
-        $this->_converter->convert($dom);
+        try {
+            $dom->loadXML($xmlString);
+            $this->_converter->convert($dom);
+        } catch(\PHPUnit_Framework_Error $ex) {
+            // do nothing because we expect \Exception but not \PHPUnit_Framework_Error
+        }
     }
 
     public function convertWithInvalidDomDataProvider()
     {
         return [
             'Module node without "name" attribute' => ['<?xml version="1.0"?><config><module /></config>'],
             'Sequence module node without "name" attribute' => [
-                '<?xml dbversion="1.0"?><config><module name="Module_One" setup_version="1.0.0.0">' .
+                '<?xml version="1.0"?><config><module name="Module_One" setup_version="1.0.0.0">' .
                 '<sequence><module/></sequence></module></config>',
             ],
         ];

lib/internal/Magento/Framework/Webapi/Request.php

@@ -45,9 +45,9 @@ public function __construct(
      *
      * Added CGI environment support.
      */
-    public function getHeader($header)
+    public function getHeader($header, $default = false)
     {
-        $headerValue = parent::getHeader($header);
+        $headerValue = parent::getHeader($header, $default);
         if ($headerValue == false) {
             /** Workaround for hhvm environment */
             $header = 'REDIRECT_HTTP_' . strtoupper(str_replace('-', '_', $header));