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

- stabilization

Author: lenaorobei

lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php

@@ -52,11 +52,6 @@ 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();
@@ -68,7 +63,6 @@ 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 = [
@@ -78,7 +72,6 @@ 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);
     }
@@ -93,19 +86,17 @@ public function testMatch()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
-        $pathInfo = 'path/info/';
-        $defaultPath = 'default/path/';
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // 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->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $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)
@@ -154,13 +145,15 @@ public function testMatchUseDefaultPath()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $defaultReturnMap = [
             ['module', $moduleFrontName],
             ['controller', $actionPath],
             ['action', $actionName],
         ];
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->defaultPathMock->expects($this->any())->method('getPart')->willReturnMap($defaultReturnMap);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(false);
@@ -185,9 +178,11 @@ public function testMatchEmptyModuleList()
         $actionName = 'action name';
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $emptyModuleList = [];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($emptyModuleList);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
@@ -209,9 +204,11 @@ public function testMatchEmptyActionInstance()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);

lib/internal/Magento/Framework/Data/Collection/Filesystem.php

@@ -688,14 +688,17 @@ public function getAllIds()
      * Callback method for 'like' fancy filter.
      *
      * @param string $field
-     * @param string $filterValue
+     * @param mixed $filterValue
      * @param array $row
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
      */
-    public function filterCallbackLike(string $field, string $filterValue, array $row) : bool
+    public function filterCallbackLike($field, $filterValue, $row)
     {
+        // Forced to do this in order to keep backward compatibility for @api class.
+        // Strict typing must be added to this method next major release.
+        $filterValue = (string)$filterValue;
         $filterValue = trim(stripslashes($filterValue), '\'');
         $filterValue = trim($filterValue, '%');
         $filterValueRegex = '(.*?)' . preg_quote($filterValue, '/') . '(.*?)';