REPO-66: [EQP][Sniffs Consolidation] Deliver Magento Coding Standard to magento2ce

lenaorobei · lenaorobei · commit 147d11d158c2 · 2019-03-29T09:04:55.000-05:00
- review fixes
diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Config\Observer\Config\Backend\Admin;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Customer\Api\AccountManagementInterface;
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Deploy\Process;
 
 use Magento\Deploy\Package\Package;
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Controller\Ipn;
 
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Controller\Download;
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
diff --git a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Mtf\EntryPoint;
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Test\Legacy;
 
 use Magento\Framework\App\Utility\Files;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Test\Php;
 
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App;
 
@@ -244,10 +245,9 @@ public function createApplication($type, $arguments = [])
      * Runs an application
      *
      * @param \Magento\Framework\AppInterface $application
-     * @throws \Exception
      * @return void
      *
-     * phpcs:disable Magento2.Exceptions
+     * phpcs:disable Magento2.Exceptions,Squiz.Commenting.FunctionCommentThrowTag
      */
     public function run(AppInterface $application)
     {
@@ -419,13 +419,14 @@ public function isDeveloperMode()
      * Display an exception and terminate program execution
      *
      * @param \Exception $e
-     * @throws \DomainException
      * @return void
+     *
+     * phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag
      */
     protected function terminate(\Exception $e)
     {
+
         if ($this->isDeveloperMode()) {
-            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $e;
         } else {
             $message = "An error has happened during application run. See exception log for details.\n";
@@ -437,10 +438,9 @@ protected function terminate(\Exception $e)
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
-            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $message;
         }
-        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit(1);
     }
+    // phpcs:enable
 }
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Console;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Response\Http;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -5,6 +5,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Router;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App\Test\Unit\Router;
 
+/**
+ * Base router unit test.
+ */
 class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
 {
     /**
@@ -49,6 +52,11 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
      */
     private $defaultPathMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Router\PathConfigInterface
+     */
+    private $pathConfigMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -60,6 +68,7 @@ protected function setUp()
         $this->actionFactoryMock = $this->basicMock(\Magento\Framework\App\ActionFactory::class);
         $this->nameBuilderMock = $this->basicMock(\Magento\Framework\Code\NameBuilder::class);
         $this->defaultPathMock = $this->basicMock(\Magento\Framework\App\DefaultPathInterface::class);
+        $this->pathConfigMock = $this->basicMock(\Magento\Framework\App\Router\PathConfigInterface::class);
 
         // Prepare SUT
         $mocks = [
@@ -69,6 +78,7 @@ protected function setUp()
             'appState' => $this->appStateMock,
             'nameBuilder' => $this->nameBuilderMock,
             'defaultPath' => $this->defaultPathMock,
+            'pathConfigMock' => $this->pathConfigMock,
         ];
         $this->model = $this->objectManager->getObject(\Magento\Framework\App\Router\Base::class, $mocks);
     }
@@ -83,15 +93,19 @@ public function testMatch()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $pathInfo = 'path/info/';
+        $defaultPath = 'default/path/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($pathInfo);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(true);
         $this->actionListMock->expects($this->any())->method('get')->willReturn($actionClassName);
         $this->actionFactoryMock->expects($this->any())->method('create')->willReturn($actionInstance);
+        $this->pathConfigMock->expects($this->any())->method('getDefaultPath')->willReturn($defaultPath);
 
         // Expectations and Test
         $this->requestExpects('setModuleName', $moduleFrontName)
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Console;
 
 use Magento\Framework\App\Bootstrap;
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\DB;
 
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Data\Collection;
 
 use Magento\Framework\Data\Collection;
@@ -686,13 +688,13 @@ public function getAllIds()
      * Callback method for 'like' fancy filter.
      *
      * @param string $field
-     * @param mixed $filterValue
+     * @param string $filterValue
      * @param array $row
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
      */
-    public function filterCallbackLike($field, $filterValue, $row)
+    public function filterCallbackLike(string $field, string $filterValue, array $row) : bool
     {
         $filterValue = trim(stripslashes($filterValue), '\'');
         $filterValue = trim($filterValue, '%');
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Webapi;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Error;
 
 use Magento\Framework\Serialize\Serializer\Json;
