MAGETWO-67612: Fixed coding standard violations in the Framework\Config namespace #9328

 - Merge Pull Request #9328 from dverkade/magento2:Fix_coding_standard_in_Framework-Config

Author: Oleksii Korshenko

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

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Magento configuration XML DOM utility
  */
@@ -120,7 +118,7 @@ public function __construct(
     /**
      * Retrieve array of xml errors
      *
-     * @param $errorFormat
+     * @param string $errorFormat
      * @return string[]
      */
     private static function getXmlErrors($errorFormat)
@@ -171,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);
@@ -247,7 +240,7 @@ protected function _mergeAttributes($baseNode, $mergeNode)
      */
     protected function _getNodePathByParent(\DOMElement $node, $parentPath)
     {
-        $prefix = is_null($this->rootNamespace) ? '' : self::ROOT_NAMESPACE_PREFIX . ':';
+        $prefix = $this->rootNamespace === null ? '' : self::ROOT_NAMESPACE_PREFIX . ':';
         $path = $parentPath . '/' . $prefix . $node->tagName;
         $idAttribute = $this->nodeMergingConfig->getIdAttribute($path);
         if (is_array($idAttribute)) {
@@ -441,7 +434,7 @@ public function setSchemaFile($schemaFile)
      */
     private function _getAttributeName($attribute)
     {
-        if (!is_null($attribute->prefix) && !empty($attribute->prefix)) {
+        if ($attribute->prefix !== null && !empty($attribute->prefix)) {
             $attributeName = $attribute->prefix . ':' . $attribute->name;
         } else {
             $attributeName = $attribute->name;

lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Config\Test\Unit\Composer;
 
 use \Magento\Framework\Config\Composer\Package;

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

@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Config\Test\Unit;
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
-   /**
+    /**
      * @var \Magento\Framework\Config\ReaderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $readerMock;