Use clearDirectory for cache cleaner

PrestaShop · Feb 6, 2025 · e0c5ef4 · e0c5ef4
1 parent 45aed49
commit e0c5ef4
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 13 deletions.
diff --git a/classes/UpgradeContainer.php b/classes/UpgradeContainer.php
@@ -455,6 +455,7 @@ public function getFilesystemAdapter(): FilesystemAdapter
     {
         if (null === $this->filesystemAdapter) {
             $this->filesystemAdapter = new FilesystemAdapter(
+                $this->getFileSystem(),
                 $this->getFileFilter(),
                 $this->getProperty(self::WORKSPACE_PATH),
                 str_replace(

diff --git a/classes/UpgradeTools/CacheCleaner.php b/classes/UpgradeTools/CacheCleaner.php
@@ -75,7 +75,7 @@ public function cleanFolders(): void
                 if ($file[0] === '.' || $file === 'index.php') {
                     continue;
                 }
-                $this->container->getFileSystem()->remove($dir . $file);
+                $this->container->getFilesystemAdapter()->clearDirectory($dir . $file, true);
                 $this->logger->debug($this->container->getTranslator()->trans('File %s removed', [$file]));
             }
         }

diff --git a/classes/UpgradeTools/FilesystemAdapter.php b/classes/UpgradeTools/FilesystemAdapter.php
@@ -25,27 +25,24 @@
 use RecursiveCallbackFilterIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
 
 class FilesystemAdapter
 {
-    /**
-     * @var FileFilter
-     */
+    /** @var Filesystem */
+    private $filesystem;
+
+    /** @var FileFilter */
     private $fileFilter;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $autoupgradeDir;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $adminSubDir;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $prodRootDir;
 
     /**
@@ -66,11 +63,13 @@ class FilesystemAdapter
     ];
 
     public function __construct(
+        Filesystem $filesystem,
         FileFilter $fileFilter,
         string $autoupgradeDir,
         string $adminSubDir,
         string $prodRootDir
     ) {
+        $this->filesystem = $filesystem;
         $this->fileFilter = $fileFilter;
 
         $this->autoupgradeDir = $autoupgradeDir;
@@ -230,4 +229,37 @@ public function isReleaseValid(string $path): bool
 
         return true;
     }
+
+    /**
+     * Clears the contents of a given directory, optionally deleting the directory itself.
+     *
+     * @throws IOException if the removal of a file or directory fails
+     *
+     * @param string $folderToClear the absolute path of the directory to be cleared
+     * @param bool $deleteFolder whether to delete the entire directory after clearing its contents
+     *
+     * @return bool returns `true` if any files or the directory itself were deleted, `false` otherwise
+     */
+    public function clearDirectory(string $folderToClear, bool $deleteFolder = false): bool
+    {
+        $hasDeletedItems = false;
+
+        if ($this->filesystem->exists($folderToClear)) {
+            foreach (scandir($folderToClear) as $item) {
+                if ($item !== '.' && $item !== '..' && $item !== 'index.php') {
+                    $path = $folderToClear . DIRECTORY_SEPARATOR . $item;
+                    $this->filesystem->remove($path);
+
+                    $hasDeletedItems = true;
+                }
+            }
+
+            if ($deleteFolder) {
+                $this->filesystem->remove($folderToClear);
+                $hasDeletedItems = true;
+            }
+        }
+
+        return $hasDeletedItems;
+    }
 }