Make Framework coding standard compliant

.travis.yml

@@ -24,10 +24,6 @@ env:
 cache:
   apt: true
   directories: $HOME/.composer/cache
-matrix:
-  exclude:
-    - php: 7.0
-      env: TEST_SUITE=static
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

@@ -114,37 +114,6 @@ function ($path) use ($directoriesToCheck, $fileTypes) {
         return $changedFiles;
     }
 
-    /**
-     * Run the PSR2 code sniffs on the code
-     *
-     * @TODO: combine with testCodeStyle
-     * @return void
-     */
-    public function testCodeStylePsr2()
-    {
-        $reportFile = self::$reportDir . '/phpcs_psr2_report.txt';
-        $wrapper = new Wrapper();
-        $codeSniffer = new CodeSniffer('PSR2', $reportFile, $wrapper);
-        if (!$codeSniffer->canRun()) {
-            $this->markTestSkipped('PHP Code Sniffer is not installed.');
-        }
-        if (version_compare($wrapper->version(), '1.4.7') === -1) {
-            $this->markTestSkipped('PHP Code Sniffer Build Too Old.');
-        }
-
-        $result = $codeSniffer->run(self::getWhitelist());
-
-        $output = "";
-        if (file_exists($reportFile)) {
-            $output = file_get_contents($reportFile);
-        }
-        $this->assertEquals(
-            0,
-            $result,
-            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $output
-        );
-    }
-
     /**
      * Run the magento specific coding standards on the code
      *
@@ -155,9 +124,15 @@ public function testCodeStyle()
         $reportFile = self::$reportDir . '/phpcs_report.txt';
         $wrapper = new Wrapper();
         $codeSniffer = new CodeSniffer(realpath(__DIR__ . '/_files/phpcs'), $reportFile, $wrapper);
+
         if (!$codeSniffer->canRun()) {
             $this->markTestSkipped('PHP Code Sniffer is not installed.');
         }
+
+        if (version_compare($wrapper->version(), '1.4.7') === -1) {
+            $this->markTestSkipped('PHP Code Sniffer Build Too Old.');
+        }
+
         $codeSniffer->setExtensions(['php', 'phtml']);
         $result = $codeSniffer->run(self::getWhitelist(['php', 'phtml']));
 

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml

@@ -7,6 +7,9 @@
 -->
 <ruleset name="Magento">
     <description>Magento coding standard.</description>
+    <!-- We don't want to test stub file for unit testing -->
+    <exclude-pattern>*/_files/*</exclude-pattern>
+    <rule ref="PSR2"/>
     <rule ref="Zend.Files.ClosingTag"/>
     <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
     <rule ref="Generic.WhiteSpace.ScopeIndent"/>

lib/internal/Magento/Framework/Acl/AclResource/Provider.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Acl\AclResource;
 
 class Provider implements ProviderInterface
@@ -24,8 +22,10 @@ class Provider implements ProviderInterface
      * @param \Magento\Framework\Config\ReaderInterface $configReader
      * @param TreeBuilder $resourceTreeBuilder
      */
-    public function __construct(\Magento\Framework\Config\ReaderInterface $configReader, TreeBuilder $resourceTreeBuilder)
-    {
+    public function __construct(
+        \Magento\Framework\Config\ReaderInterface $configReader,
+        TreeBuilder $resourceTreeBuilder
+    ) {
         $this->_configReader = $configReader;
         $this->_resourceTreeBuilder = $resourceTreeBuilder;
     }
@@ -37,7 +37,9 @@ public function getAclResources()
     {
         $aclResourceConfig = $this->_configReader->read();
         if (!empty($aclResourceConfig['config']['acl']['resources'])) {
-            return $this->_resourceTreeBuilder->build($aclResourceConfig['config']['acl']['resources']);
+            return $this->_resourceTreeBuilder->build(
+                $aclResourceConfig['config']['acl']['resources']
+            );
         }
         return [];
     }

lib/internal/Magento/Framework/Api/DataObjectHelper.php

@@ -144,6 +144,7 @@ protected function _setDataValues($dataObject, array $data, $interfaceName)
      * @param string $interfaceName
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function setComplexValue(
         $dataObject,
@@ -176,7 +177,7 @@ protected function setComplexValue(
         if (is_subclass_of($returnType, \Magento\Framework\Api\ExtensibleDataInterface::class)) {
             $object = $this->objectFactory->create($returnType, []);
             $this->populateWithArray($object, $value, $returnType);
-        } else if (is_subclass_of($returnType, \Magento\Framework\Api\ExtensionAttributesInterface::class)) {
+        } elseif (is_subclass_of($returnType, \Magento\Framework\Api\ExtensionAttributesInterface::class)) {
             foreach ($value as $extensionAttributeKey => $extensionAttributeValue) {
                 $extensionAttributeGetterMethodName
                     = 'get' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase(

lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php

@@ -48,7 +48,7 @@ public function toNestedArray(
         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
             /** @var AttributeValue[] $customAttributes */
             $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
-            unset ($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]);
+            unset($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]);
             foreach ($customAttributes as $attributeValue) {
                 if (!in_array($attributeValue[AttributeValue::ATTRIBUTE_CODE], $skipAttributes)) {
                     $dataObjectArray[$attributeValue[AttributeValue::ATTRIBUTE_CODE]]
@@ -59,7 +59,7 @@ public function toNestedArray(
         if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
             /** @var array $extensionAttributes */
             $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
-            unset ($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
             foreach ($extensionAttributes as $attributeKey => $attributeValue) {
                 if (!in_array($attributeKey, $skipAttributes)) {
                     $dataObjectArray[$attributeKey] = $attributeValue;

lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor;
 
-
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\JoinProcessor\CustomJoinInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;

lib/internal/Magento/Framework/Api/SortOrder.php

@@ -31,8 +31,7 @@ public function __construct(array $data = [])
             $this->validateDirection($this->getDirection());
         }
     }
-
-
+
     /**
      * Get sorting field.
      *
@@ -78,7 +77,7 @@ public function setDirection($direction)
 
     /**
      * Validate direction argument ASC or DESC
-     * 
+     *
      * @param mixed $direction
      * @return null
      * @throws InputException

lib/internal/Magento/Framework/Api/SortOrderBuilder.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Api;
 
-
 /**
  * Builder for sort order data object.
  * @method SortOrder create()

lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit\Api;
 
 /**
@@ -26,8 +24,8 @@ class ImageContentValidatorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->imageContentValidator = $this->objectManager->getObject(
-            \Magento\Framework\Api\ImageContentValidator::class
+        $this->imageContentValidator = $this->objectManager->getObject(
+            \Magento\Framework\Api\ImageContentValidator::class
         );
     }
 

lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit\Api;
 
 /**
@@ -57,7 +55,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->directoryWriteMock = $this->getMockForAbstractClass(
+        $this->directoryWriteMock = $this->getMockForAbstractClass(
             \Magento\Framework\Filesystem\Directory\WriteInterface::class
         );
         $this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
@@ -66,8 +64,9 @@ protected function setUp()
         $this->fileSystemMock->expects($this->any())
             ->method('getDirectoryWrite')
             ->willReturn($this->directoryWriteMock);
-        $this->contentValidatorMock = $this->getMockBuilder(
-            \Magento\Framework\Api\ImageContentValidatorInterface::class)
+        $this->contentValidatorMock = $this->getMockBuilder(
+            \Magento\Framework\Api\ImageContentValidatorInterface::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
         $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
@@ -90,7 +89,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imageProcessor = $this->objectManager->getObject(
+        $this->imageProcessor = $this->objectManager->getObject(
             \Magento\Framework\Api\ImageProcessor::class,
             [
                 'fileSystem' => $this->fileSystemMock,

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesGeneratorTest.php

@@ -3,7 +3,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter;

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesInterfaceGeneratorTest.php

@@ -3,7 +3,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter;

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
-
 /**
  * Class SearchResultTest
  */

lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit;
 
 use Magento\Framework\Api\CustomAttributesDataInterface;
@@ -144,7 +142,8 @@ public function testPopulateWithArrayWithSimpleAttributes()
 
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());
@@ -198,7 +197,8 @@ public function testPopulateWithArrayWithCustomAttribute()
             ->willReturn($customAttribute);
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());
@@ -260,7 +260,8 @@ public function testPopulateWithArrayWithCustomAttributes()
             ->willReturn($customAttribute);
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());

lib/internal/Magento/Framework/Api/Uploader.php

@@ -17,7 +17,6 @@ class Uploader extends \Magento\Framework\File\Uploader
      */
     public function __construct()
     {
-
     }
 
     /**

lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php

@@ -15,6 +15,8 @@
 
 /**
  * Deployment configuration writer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Writer
 {
@@ -101,7 +103,6 @@ public function saveConfig(array $data, $override = false)
 
         foreach ($data as $fileKey => $config) {
             if (isset($paths[$fileKey])) {
-
                 if ($this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->isExist($paths[$fileKey])) {
                     $currentData = $this->reader->load($fileKey);
                     if ($override) {

lib/internal/Magento/Framework/App/Response/HttpInterface.php

@@ -38,7 +38,7 @@ public function setHeader($name, $value, $replace = false);
 
     /**
      * Get header value by name
-     * 
+     *
      * Returns first found header by passed name.
      * If header with specified name was not found returns false.
      *
@@ -57,14 +57,14 @@ public function clearHeader($name);
 
     /**
      * Allow granular setting of HTTP response status code, version and phrase
-     * 
+     *
      * For example, a HTTP response as the following:
      *     HTTP 200 1.1 Your response has been served
      * Can be set with the arguments
      *     $httpCode = 200
      *     $version = 1.1
      *     $phrase = 'Your response has been served'
-     * 
+     *
      * @param int|string $httpCode
      * @param null|int|string $version
      * @param null|string $phrase
@@ -74,17 +74,17 @@ public function setStatusHeader($httpCode, $version = null, $phrase = null);
 
     /**
      * Append the given string to the response body
-     * 
+     *
      * @param string $value
      * @return self
      */
     public function appendBody($value);
 
     /**
      * Set the response body to the given value
-     * 
+     *
      * Any previously set contents will be replaced by the new content.
-     * 
+     *
      * @param string $value
      * @return self
      */

lib/internal/Magento/Framework/App/SetupInfo.php

@@ -111,7 +111,7 @@ public function getProjectUrl()
         $isProjectInDocRoot = false !== strpos($this->projectRoot . '/', $this->docRoot . '/');
         if (empty($this->server['HTTP_HOST'])) {
             return '';
-        } else if (!$isProjectInDocRoot) {
+        } elseif (!$isProjectInDocRoot) {
             return 'http://' . $this->server['HTTP_HOST'] . '/';
         }
         return 'http://' . $this->server['HTTP_HOST'] . substr($this->projectRoot . '/', strlen($this->docRoot));