Fixed coding standard violations in the Framework\App namespace, so t…

…hat it will be checked bij PHP CS and no longer be ignored while doing CI checks. Made the following changes: - Removed @codingStandardsIgnoreFile from the head of the file - Move ActionFake to it's own file, because PSR-2 dicates only one class per file. - Fixed indentation - Fixed number of chars per line
magento · Apr 21, 2017 · ce29154 · ce29154
1 parent c3040d3
commit ce29154
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 64 deletions.
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\Test\Unit\Action;
+
+use \Magento\Framework\App\Action\Action;
+
+class ActionFake extends Action
+{
+    /**
+     * Fake action to check a method call from a parent
+     */
+    public function execute()
+    {
+        $this->_forward(
+            ActionTest::ACTION_NAME,
+            ActionTest::CONTROLLER_NAME,
+            ActionTest::MODULE_NAME,
+            ActionTest::$actionParams
+        );
+        $this->_redirect(ActionTest::FULL_ACTION_NAME, ActionTest::$actionParams);
+        return;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\Action;
 
 use \Magento\Framework\App\Action\Action;
@@ -185,20 +183,3 @@ public function testDispatchPostDispatch()
         $this->assertEquals($this->_responseMock, $this->action->dispatch($this->_requestMock));
     }
 }
-
-class ActionFake extends Action
-{
-    /**
-     * Fake action to check a method call from a parent
-     */
-    public function execute()
-    {
-        $this->_forward(
-            ActionTest::ACTION_NAME,
-            ActionTest::CONTROLLER_NAME,
-            ActionTest::MODULE_NAME,
-            ActionTest::$actionParams);
-        $this->_redirect(ActionTest::FULL_ACTION_NAME, ActionTest::$actionParams);
-        return;
-    }
-}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit;
 
 use \Magento\Framework\App\AreaList;
@@ -48,12 +46,12 @@ public function testGetCodeByFrontNameWhenAreaDoesNotContainFrontName()
         $this->_resolverFactory->expects(
             $this->any()
         )->method(
-                'create'
-            )->with(
-                'testValue'
-            )->will(
-                $this->returnValue($resolverMock)
-            );
+            'create'
+        )->with(
+            'testValue'
+        )->will(
+            $this->returnValue($resolverMock)
+        );
 
         $actual = $this->_model->getCodeByFrontName('testFrontName');
         $this->assertEquals($expected, $actual);
@@ -106,7 +104,10 @@ public function testGetCodes()
     {
         $areas = ['area1' => 'value1', 'area2' => 'value2'];
         $this->_model = new \Magento\Framework\App\AreaList(
-            $this->objectManagerMock, $this->_resolverFactory, $areas, ''
+            $this->objectManagerMock,
+            $this->_resolverFactory,
+            $areas,
+            ''
         );
 
         $expected = array_keys($areas);
@@ -118,7 +119,10 @@ public function testGetDefaultRouter()
     {
         $areas = ['area1' => ['router' => 'value1'], 'area2' => 'value2'];
         $this->_model = new \Magento\Framework\App\AreaList(
-            $this->objectManagerMock, $this->_resolverFactory, $areas, ''
+            $this->objectManagerMock,
+            $this->_resolverFactory,
+            $areas,
+            ''
         );
 
         $this->assertEquals($this->_model->getDefaultRouter('area1'), $areas['area1']['router']);
@@ -131,7 +135,10 @@ public function testGetArea()
         $objectManagerMock = $this->getObjectManagerMockGetArea();
         $areas = ['area1' => ['router' => 'value1'], 'area2' => 'value2'];
         $this->_model = new AreaList(
-            $objectManagerMock, $this->_resolverFactory, $areas, ''
+            $objectManagerMock,
+            $this->_resolverFactory,
+            $areas,
+            ''
         );
 
         $this->assertEquals($this->_model->getArea('testArea'), 'ok');

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Bootstrap;
@@ -99,7 +97,7 @@ protected function setUp()
             [\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class, $this->remoteAddress],
             [\Magento\Framework\Filesystem::class, $filesystem],
             [\Magento\Framework\App\DeploymentConfig::class, $this->deploymentConfig],
-            ['Psr\Log\LoggerInterface', $this->logger],
+            [\Psr\Log\LoggerInterface::class, $this->logger],
         ];
 
         $this->objectManager->expects($this->any())->method('get')
@@ -211,7 +209,7 @@ public function testIsDeveloperModeDataProvider()
             [State::MODE_DEVELOPER, State::MODE_PRODUCTION, true],
             [State::MODE_PRODUCTION, State::MODE_DEVELOPER, false],
             [null, State::MODE_DEVELOPER, true],
-            [null, State::MODE_PRODUCTION, false],
+            [null, State::MODE_PRODUCTION, false]
         ];
     }
 
@@ -280,7 +278,7 @@ public function assertMaintenanceDataProvider()
     {
         return [
             [true, false],
-            [false, true],
+            [false, true]
         ];
     }
 

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/ConfigLoaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/ConfigLoaderTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\ObjectManager;
 
 use Magento\Framework\Serialize\SerializerInterface;
@@ -55,15 +53,18 @@ protected function setUp()
             false
         );
 
-        $this->readerFactoryMock->expects(
-            $this->any()
-        )->method(
-            'create'
-        )->will(
-            $this->returnValue($this->readerMock)
+        $this->readerFactoryMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($this->readerMock));
+
+        $this->cacheMock = $this->getMock(
+            \Magento\Framework\App\Cache\Type\Config::class,
+            [],
+            [],
+            '',
+            false
         );
 
-        $this->cacheMock = $this->getMock(\Magento\Framework\App\Cache\Type\Config::class, [], [], '', false);
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->object = $objectManagerHelper->getObject(
@@ -98,7 +99,10 @@ public function testLoadNotCached($area)
         $this->cacheMock->expects($this->once())
             ->method('save')
             ->with($serializedData);
-        $this->readerMock->expects($this->once())->method('read')->with($area)->will($this->returnValue($configData));
+        $this->readerMock->expects($this->once())
+            ->method('read')
+            ->with($area)
+            ->will($this->returnValue($configData));
 
         $this->serializerMock->expects($this->once())
             ->method('serialize')

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\Request;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -345,8 +343,10 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
             ->getMock();
         $configMock->expects($this->exactly($configCall))
             ->method('getValue')
-            ->with(\Magento\Framework\App\Request\Http::XML_PATH_OFFLOADER_HEADER, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
-            ->willReturn($configOffloadHeader);
+            ->with(
+                \Magento\Framework\App\Request\Http::XML_PATH_OFFLOADER_HEADER,
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            )->willReturn($configOffloadHeader);
 
         $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock);
         $this->objectManager->setBackwardCompatibleProperty($this->_model, 'sslOffloadHeader', null);

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\Response;
 
 use \Magento\Framework\App\Response\Http;
@@ -53,7 +51,8 @@ protected function setUp()
         )->disableOriginalConstructor()->getMock();
         $this->cookieManagerMock = $this->getMock(\Magento\Framework\Stdlib\CookieManagerInterface::class);
         $this->contextMock = $this->getMockBuilder(
-            \Magento\Framework\App\Http\Context::class)->disableOriginalConstructor()
+            \Magento\Framework\App\Http\Context::class
+        )->disableOriginalConstructor()
             ->getMock();
 
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class)
@@ -87,7 +86,8 @@ public function testSendVary()
         $expectedCookieName = Http::COOKIE_VARY_STRING;
         $expectedCookieValue = 'SHA1 Serialized String';
         $sensitiveCookieMetadataMock = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata::class)
+            \Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
         $sensitiveCookieMetadataMock->expects($this->once())

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/NoRouteHandlerListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/NoRouteHandlerListTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\Router;
 
 class NoRouteHandlerListTest extends \PHPUnit_Framework_TestCase

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/NoRouteHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/NoRouteHandlerTest.php
@@ -6,8 +6,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit\Router;
 
 class NoRouteHandlerTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit;
 
 use \Magento\Framework\App\Area;

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Bootstrap;
@@ -77,7 +75,11 @@ protected function setUp()
         $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
         $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
         $this->configLoader = $this->getMock(
-            \Magento\Framework\App\ObjectManager\ConfigLoader::class, [], [], '', false
+            \Magento\Framework\App\ObjectManager\ConfigLoader::class,
+            [],
+            [],
+            '',
+            false
         );
         $this->object = new \Magento\Framework\App\StaticResource(
             $this->state,
@@ -204,7 +206,7 @@ public function testCatchExceptionDeveloperMode()
     {
         $this->objectManager->expects($this->once())
             ->method('get')
-            ->with('Psr\Log\LoggerInterface')
+            ->with(\Psr\Log\LoggerInterface::class)
             ->willReturn($this->logger);
         $this->logger->expects($this->once())
             ->method('critical');

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -33,7 +33,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @codingStandardsIgnoreFile
  */
 class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
 {