MC-17627: Dependency static test does not analyze content of phtml files

    - Fixed codestyle

Author: Rrego6

dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php

@@ -285,12 +285,11 @@ private function isPluginDependency($dependent, $dependency)
      * @return array
      * @throws LocalizedException
      * @throws \Exception
-     * @SuppressWarnings(PMD.CyclomaticComplexity)
      */
     protected function _caseGetUrl(string $currentModule, string &$contents): array
     {
         $pattern = '#(\->|:)(?<source>getUrl\(([\'"])(?<route_id>[a-z0-9\-_]{3,}|\*)'
-            .'(/(?<controller_name>[a-z0-9\-_]+|\*))?(/(?<action_name>[a-z0-9\-_]+))?\3|\*)#i';
+            .'(\/(?<controller_name>[a-z0-9\-_]+|\*))?(\/(?<action_name>[a-z0-9\-_]+|\*))?\3)#i';
 
         $dependencies = [];
         if (!preg_match_all($pattern, $contents, $matches, PREG_SET_ORDER)) {
@@ -302,18 +301,13 @@ protected function _caseGetUrl(string $currentModule, string &$contents): array
                 $routeId = $item['route_id'];
                 $controllerName = $item['controller_name'] ?? UrlInterface::DEFAULT_CONTROLLER_NAME;
                 $actionName = $item['action_name'] ?? UrlInterface::DEFAULT_ACTION_NAME;
-                if (in_array(
-                    implode('/', [$routeId, $controllerName, $actionName]),
-                    $this->getRoutesWhitelist()
-                )) {
-                    continue;
-                }
+
                 // skip rest
-                if ($routeId == "rest") { //MC-17627
+                if ($routeId === "rest") { //MC-17627
                     continue;
                 }
                 // skip wildcards
-                if ($routeId == "*" || $controllerName == "*" || $actionName == "*") {  //MC-17627
+                if ($routeId === "*" || $controllerName === "*" || $actionName === "*") {  //MC-17627
                     continue;
                 }
                 $modules = $this->routeMapper->getDependencyByRoutePath(
@@ -333,7 +327,9 @@ protected function _caseGetUrl(string $currentModule, string &$contents): array
                 }
             }
         } catch (NoSuchActionException $e) {
-            throw new LocalizedException(__('Invalid URL path: %1', $e->getMessage()), $e);
+            if (array_search($e->getMessage(), $this->getRoutesWhitelist()) === false) {
+                throw new LocalizedException(__('Invalid URL path: %1', $e->getMessage()), $e);
+            }
         }
 
         return $dependencies;

dev/tests/static/framework/Magento/TestFramework/Dependency/Route/RouteMapper.php

@@ -243,15 +243,6 @@ private function processConfigFile(string $module, string $configFile)
                 if (!in_array($module, $this->routers[$routerId][$routeId])) {
                     $this->routers[$routerId][$routeId][] = $module;
                 }
-                if (isset($route['frontName'])) {
-                    $frontName = (string)$route['frontName'];
-                    if (!isset($this->routers[$routerId][$frontName])) {
-                        $this->routers[$routerId][$frontName] = [];
-                    }
-                    if (!in_array($module, $this->routers[$routerId][$frontName])) {
-                        $this->routers[$routerId][$frontName][] = $module;
-                    }
-                }
             }
         }
     }

dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php

@@ -234,7 +234,8 @@ protected static function _initRules()
             . '/_files/dependency_test/tables_*.php';
         $dbRuleTables = [];
         foreach (glob($replaceFilePattern) as $fileName) {
-            $dbRuleTables = array_merge($dbRuleTables, @include $fileName); //phpcs:ignore
+            //phpcs:ignore Magento2.Performance.ForeachArrayMerge
+            $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
         }
         self::$_rulesInstances = [
             new PhpRule(
@@ -264,14 +265,14 @@ private static function getRoutesWhitelist(): array
     {
         if (is_null(self::$routesWhitelist)) {
             $routesWhitelistFilePattern = realpath(__DIR__) . '/_files/dependency_test/whitelist/routes_*.php';
-            self::$routesWhitelist = array_merge(
-                ...array_map(
-                    function ($fileName) {
-                        return include $fileName;
-                    },
-                    glob($routesWhitelistFilePattern)
-                )
-            );
+            self::$routesWhitelist = [];
+            foreach (glob($routesWhitelistFilePattern) as $fileName) {
+                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                self::$routesWhitelist = array_merge(
+                    self::$routesWhitelist,
+                    include $fileName
+                );
+            }
         }
         return self::$routesWhitelist;
     }
@@ -294,7 +295,7 @@ protected function _getCleanedFileContents($fileType, $file)
                 return preg_replace(
                     '~\<!\-\-/.*?\-\-\>~s',
                     '',
-                    (string)file_get_contents($file)
+                    file_get_contents($file)
                 );
             case 'template':
                 $contents = php_strip_whitespace($file);
@@ -310,7 +311,7 @@ function ($matches) use ($contents, &$contentsWithoutHtml) {
                 );
                 return $contentsWithoutHtml;
         }
-        return (string)file_get_contents($file);
+        return file_get_contents($file);
     }
 
     /**
@@ -389,7 +390,8 @@ protected function getDependenciesFromFiles($module, $fileType, $file, $contents
         foreach (self::$_rulesInstances as $rule) {
             /** @var \Magento\TestFramework\Dependency\RuleInterface $rule */
             $newDependencies = $rule->getDependencyInfo($module, $fileType, $file, $contents);
-            $dependencies = array_merge($dependencies, $newDependencies); //phpcs:ignore
+            //phpcs:ignore Magento2.Performance.ForeachArrayMerge
+            $dependencies = array_merge($dependencies, $newDependencies);
         }
         foreach ($dependencies as $key => $dependency) {
             foreach (self::$whiteList as $namespace) {
@@ -504,7 +506,7 @@ public function collectRedundant()
 
         foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-            //phpcs:ignore
+            //phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $found = array_merge(
                 $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
                 $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),

dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/routes_ce.php

@@ -6,5 +6,5 @@
 declare(strict_types=1);
 
 return [
-    'privacy-policy-cookie-restriction-mode/index/index'
+    'privacy-policy-cookie-restriction-mode/index/index',
 ];