#24076: 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/Directory/Setup/Patch/Data/InitializeDirectoryData.php

@@ -13,6 +13,7 @@
 
 /**
  * Class InitializeDirectoryData
+ *
  * @package Magento\Directory\Setup\Patch
  */
 class InitializeDirectoryData implements DataPatchInterface, PatchVersionInterface
@@ -41,7 +42,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function apply()
@@ -437,7 +439,7 @@ public function apply()
             ['CH', 'VS', 'Wallis'],
             ['CH', 'ZG', 'Zug'],
             ['CH', 'ZH', 'Zürich'],
-            ['ES', 'A Coruca', 'A Coruña'],
+            ['ES', 'A Coruсa', 'A Coruña'],
             ['ES', 'Alava', 'Alava'],
             ['ES', 'Albacete', 'Albacete'],
             ['ES', 'Alicante', 'Alicante'],
@@ -874,23 +876,23 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
         return [];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
         return '2.0.0';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {