Merge pull request #1441 from ga-devfront/feat/let-backup-on-uninstall

[FEAT] remove all folder on uninstall except backups

Author: ga-devfront

autoupgrade.php

@@ -131,8 +131,8 @@ public function uninstall()
             $ajaxTab->delete();
         }
 
-        // Remove the 1-click upgrade working directory
-        self::_removeDirectory(_PS_ADMIN_DIR_ . DIRECTORY_SEPARATOR . 'autoupgrade');
+        // Remove the 'autoupgrade' admin directory except backups
+        $this->getUpgradeContainer()->getFilesystemAdapter()->clearDirectory(_PS_ADMIN_DIR_ . DIRECTORY_SEPARATOR . 'autoupgrade', ['backup']);
 
         return parent::uninstall();
     }
@@ -159,29 +159,6 @@ protected function _abortInstall($error)
         return false;
     }
 
-    /**
-     * @param string $dir
-     *
-     * @return void
-     */
-    private static function _removeDirectory($dir)
-    {
-        if ($handle = @opendir($dir)) {
-            while (false !== ($entry = @readdir($handle))) {
-                if ($entry != '.' && $entry != '..') {
-                    if (is_dir($dir . DIRECTORY_SEPARATOR . $entry) === true) {
-                        self::_removeDirectory($dir . DIRECTORY_SEPARATOR . $entry);
-                    } else {
-                        @unlink($dir . DIRECTORY_SEPARATOR . $entry);
-                    }
-                }
-            }
-
-            @closedir($handle);
-            @rmdir($dir);
-        }
-    }
-
     /**
      * Adapter for trans calls, existing only on PS 1.7.
      * Making them available for PS 1.6 as well.

classes/UpgradeTools/FilesystemAdapter.php

@@ -232,36 +232,43 @@ public function isReleaseValid(string $path): bool
     }
 
     /**
-     * Clears the contents of a given directory, optionally deleting the directory itself.
-     *
-     * @throws IOException if the removal of a file or directory fails
+     * Clears the contents of a given directory, excluding specified items,
+     * * optionally deleting the directory itself.
      *
      * @param string $folderToClear the absolute path of the directory to be cleared
+     * @param string[] $excluded list of file or directory names to exclude from deletion
      *
      * @return bool returns `true` if any files/folders were deleted, `false` otherwise
+     *
+     * @throws IOException if the removal of a file or directory fails
      */
-    public function clearDirectory(string $folderToClear): bool
+    public function clearDirectory(string $folderToClear, array $excluded = []): bool
     {
         $hasDeletedItems = false;
 
         if (!$this->filesystem->exists($folderToClear)) {
             return $hasDeletedItems;
         }
 
+        $excluded[] = 'index.php';
+
         $directory = new FilesystemIterator(
             $folderToClear, FilesystemIterator::SKIP_DOTS | FilesystemIterator::CURRENT_AS_FILEINFO
         );
-        $filter = new CallbackFilterIterator($directory, function ($current) {
-            return $current->getFilename() !== 'index.php';
+
+        $filter = new CallbackFilterIterator($directory, function ($current) use ($excluded) {
+            return !in_array($current->getFilename(), $excluded, true);
         });
+
         $iterator = new IteratorIterator($filter);
 
         foreach ($iterator as $file) {
             $this->filesystem->remove($file);
+            $hasDeletedItems = true;
         }
 
         clearstatcache();
 
-        return (bool) iterator_count($iterator);
+        return $hasDeletedItems;
     }
 }