Improve configuration getter for image backup

PrestaShop · May 3, 2019 · fafc475 · fafc475
1 parent e50f680
commit fafc475
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/AdminSelfUpgrade.php b/AdminSelfUpgrade.php
@@ -242,7 +242,7 @@ public function init()
             $this->upgradeContainer->getFileConfigurationStorage()->cleanAll();
         }
 
-        $this->keepImages = $this->upgradeContainer->getUpgradeConfiguration()->get('PS_AUTOUP_KEEP_IMAGES');
+        $this->keepImages = $this->upgradeContainer->getUpgradeConfiguration()->shouldBackupImages();
         $this->updateDefaultTheme = $this->upgradeContainer->getUpgradeConfiguration()->get('PS_AUTOUP_UPDATE_DEFAULT_THEME');
         $this->changeToDefaultTheme = $this->upgradeContainer->getUpgradeConfiguration()->get('PS_AUTOUP_CHANGE_DEFAULT_THEME');
         $this->keepMails = $this->upgradeContainer->getUpgradeConfiguration()->get('PS_AUTOUP_KEEP_MAILS');

diff --git a/classes/Parameters/UpgradeConfiguration.php b/classes/Parameters/UpgradeConfiguration.php
@@ -116,6 +116,14 @@ public function getPerformanceLevel()
         return $this->get('PS_AUTOUP_PERFORMANCE') - 1;
     }
 
+    /**
+     * @return bool True if the autoupgrade module should backup the images as well
+     */
+    public function shouldBackupImages()
+    {
+        return (bool) $this->get('PS_AUTOUP_KEEP_IMAGES');
+    }
+
     /**
      * @return bool True if non-native modules must be disabled during upgrade
      */

diff --git a/classes/Parameters/UpgradeConfigurationStorage.php b/classes/Parameters/UpgradeConfigurationStorage.php
@@ -72,7 +72,7 @@ public function getDefaultData()
             'PS_AUTOUP_CHANGE_DEFAULT_THEME' => 0,
             'PS_AUTOUP_KEEP_MAILS' => 0,
             'PS_AUTOUP_BACKUP' => 1,
-            'PS_AUTOUP_KEEP_IMAGES' => 0,
+            'PS_AUTOUP_KEEP_IMAGES' => 1,
             'channel' => Upgrader::DEFAULT_CHANNEL,
             'archive.filename' => Upgrader::DEFAULT_FILENAME,
         );

diff --git a/classes/TaskRunner/Upgrade/UpgradeComplete.php b/classes/TaskRunner/Upgrade/UpgradeComplete.php
@@ -60,5 +60,7 @@ public function run()
 
         // Reinit config
         Configuration::deleteByName('PS_AUTOUP_IGNORE_REQS');
+        // removing temporary files
+        $this->upgradeContainer->getFileConfigurationStorage()->cleanAll();
     }
 }
diff --git a/classes/UpgradeTools/FileFilter.php b/classes/UpgradeTools/FileFilter.php
@@ -67,7 +67,7 @@ public function getFilesToIgnoreOnBackup()
             '/admin/autoupgrade',
         );
 
-        if ($this->configuration->get('PS_AUTOUP_KEEP_IMAGES') === '0') {
+        if (!$this->configuration->shouldBackupImages()) {
             $backupIgnoreAbsoluteFiles[] = '/img';
         } else {
             $backupIgnoreAbsoluteFiles[] = '/img/tmp';
@@ -92,7 +92,7 @@ public function getFilesToIgnoreOnRestore()
             '..',
         );
 
-        if ($this->configuration->get('PS_AUTOUP_KEEP_IMAGES') === '0') {
+        if (!$this->configuration->shouldBackupImages()) {
             $restoreIgnoreAbsoluteFiles[] = '/img';
         } else {
             $restoreIgnoreAbsoluteFiles[] = '/img/tmp';