- Fixed multiline if statement

- Fixed wrong identation

Author: dverkade

lib/internal/Magento/Framework/Config/Dom.php

@@ -169,15 +169,10 @@ protected function _mergeNode(\DOMElement $node, $parentPath)
         /* Update matched node attributes and value */
         if ($matchedNode) {
             //different node type
-            if ($this->typeAttributeName && $node->hasAttribute(
-                    $this->typeAttributeName
-                ) && $matchedNode->hasAttribute(
-                    $this->typeAttributeName
-                ) && $node->getAttribute(
-                    $this->typeAttributeName
-                ) !== $matchedNode->getAttribute(
-                    $this->typeAttributeName
-                )
+            if ($this->typeAttributeName &&
+                $node->hasAttribute($this->typeAttributeName) &&
+                $matchedNode->hasAttribute($this->typeAttributeName) &&
+                $node->getAttribute($this->typeAttributeName) !== $matchedNode->getAttribute($this->typeAttributeName)
             ) {
                 $parentMatchedNode = $this->_getMatchedNode($parentPath);
                 $newNode = $this->dom->importNode($node, true);

lib/internal/Magento/Framework/Config/Test/Unit/DataTest.php

@@ -8,7 +8,7 @@
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
-   /**
+    /**
      * @var \Magento\Framework\Config\ReaderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $readerMock;