#24036: Static tests fix.

Author: engcom-Foxtrot

app/code/Magento/Deploy/Model/Filesystem.php

@@ -285,22 +285,7 @@ public function cleanupFilesystem($directoryCodeList)
         $excludePatterns = ['#.htaccess#', '#deployed_version.txt#'];
         foreach ($directoryCodeList as $code) {
             if ($code == DirectoryList::STATIC_VIEW) {
-                $directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
-                if ($this->driverFile->isExists($directoryPath)) {
-                    $files = $this->driverFile->readDirectory($directoryPath);
-                    foreach ($files as $file) {
-                        foreach ($excludePatterns as $pattern) {
-                            if (preg_match($pattern, $file)) {
-                                continue 2;
-                            }
-                        }
-                        if ($this->driverFile->isFile($file)) {
-                            $this->driverFile->deleteFile($file);
-                        } else {
-                            $this->driverFile->deleteDirectory($file);
-                        }
-                    }
-                }
+                $this->cleanupStaticDirectory($excludePatterns);
             } else {
                 $this->filesystem->getDirectoryWrite($code)
                     ->delete();
@@ -374,4 +359,30 @@ private function reinitCacheDirectories()
         $command = $this->functionCallPath . 'cache:flush';
         $this->shell->execute($command);
     }
+
+    /**
+     * Cleanup directory with static view files.
+     *
+     * @param array $excludePatterns
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function cleanupStaticDirectory(array $excludePatterns): void
+    {
+        $directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
+        if ($this->driverFile->isExists($directoryPath)) {
+            $files = $this->driverFile->readDirectory($directoryPath);
+            foreach ($files as $file) {
+                foreach ($excludePatterns as $pattern) {
+                    if (preg_match($pattern, $file)) {
+                        continue 2;
+                    }
+                }
+                if ($this->driverFile->isFile($file)) {
+                    $this->driverFile->deleteFile($file);
+                } else {
+                    $this->driverFile->deleteDirectory($file);
+                }
+            }
+        }
+    }
 }

app/code/Magento/Indexer/Model/Message/Invalid.php

@@ -59,6 +59,7 @@ public function isDisplayed()
      */
     public function getIdentity()
     {
+        // phpcs:ignore Magento2.Security.InsecureFunction
         return md5('INDEX_INVALID');
     }
 

app/code/Magento/Payment/Model/Method/AbstractMethod.php

@@ -18,6 +18,7 @@
 /**
  * Payment method abstract model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyFields)

dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php

@@ -49,10 +49,13 @@ public function process(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         if (T_WHITESPACE !== $tokens[$stackPtr - 1]['code']
-            && !in_array($tokens[$stackPtr - 1]['content'], [
-                TokenizerSymbolsInterface::INDENT_SPACES,
-                TokenizerSymbolsInterface::NEW_LINE,
-            ])
+            && !in_array(
+                $tokens[$stackPtr - 1]['content'],
+                [
+                    TokenizerSymbolsInterface::INDENT_SPACES,
+                    TokenizerSymbolsInterface::NEW_LINE,
+                ]
+            )
         ) {
             return;
         }

dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php

@@ -97,6 +97,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $phpcsFile->addError($error, $i, 'Incorrect', [$expectedIndent, $foundIndent]);
             }
 
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
             if ($indentLevel > $this->maxIndentLevel) {
                 // Will be implemented in MAGETWO-49778
                 // $phpcsFile->addWarning('Avoid using more than three levels of nesting', $i, 'IncorrectNestingLevel');

dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php

@@ -81,6 +81,7 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         if ((T_STRING === $tokens[$stackPtr - 1]['code'])
             && in_array($tokens[$stackPtr - 1]['content'], $this->tags)
         ) {

setup/src/Magento/Setup/Model/SystemPackage.php

@@ -53,8 +53,8 @@ public function __construct(
     /**
      * Returns system package and available versions
      *
-     * @throws \RuntimeException
      * @return array
+     * @throws \RuntimeException
      */
     public function getPackageVersions()
     {
@@ -150,7 +150,7 @@ public function getSystemPackageVersions($systemPackageInfo)
                 'current' => true,
             ];
         }
-        return  $versions;
+        return $versions;
     }
 
     /**
@@ -196,12 +196,15 @@ public function getInstalledSystemPackages()
      */
     public function sortVersions($enterpriseVersions)
     {
-        usort($enterpriseVersions[InfoCommand::AVAILABLE_VERSIONS], function ($versionOne, $versionTwo) {
-            if (version_compare($versionOne, $versionTwo, '==')) {
-                return 0;
+        usort(
+            $enterpriseVersions[InfoCommand::AVAILABLE_VERSIONS],
+            function ($versionOne, $versionTwo) {
+                if (version_compare($versionOne, $versionTwo, '==')) {
+                    return 0;
+                }
+                return (version_compare($versionOne, $versionTwo, '<')) ? 1 : -1;
             }
-            return (version_compare($versionOne, $versionTwo, '<')) ? 1 : -1;
-        });
+        );
 
         return $enterpriseVersions;
     }
@@ -231,15 +234,18 @@ private function formatPackages($packages)
             }
         }
 
-        usort($versions, function ($versionOne, $versionTwo) {
-            if (version_compare($versionOne['id'], $versionTwo['id'], '==')) {
-                if ($versionOne['package'] === static::EDITION_COMMUNITY) {
-                    return 1;
+        usort(
+            $versions,
+            function ($versionOne, $versionTwo) {
+                if (version_compare($versionOne['id'], $versionTwo['id'], '==')) {
+                    if ($versionOne['package'] === static::EDITION_COMMUNITY) {
+                        return 1;
+                    }
+                    return 0;
                 }
-                return 0;
+                return (version_compare($versionOne['id'], $versionTwo['id'], '<')) ? 1 : -1;
             }
-            return (version_compare($versionOne['id'], $versionTwo['id'], '<')) ? 1 : -1;
-        });
+        );
 
         return $versions;
     }