Skip to content

Commit

Permalink
Merge pull request #1144 from M0rgan01/remove-old-backup-config
Browse files Browse the repository at this point in the history
Remove previous backup config
  • Loading branch information
M0rgan01 authored Jan 31, 2025
2 parents 5131f22 + 727999c commit 1a1f9f3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion classes/Analytics.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ public function getProperties($type): array
switch ($type) {
case self::WITH_BACKUP_PROPERTIES:
$additionalProperties = [
'backup_files_and_databases' => $this->updateConfiguration->shouldBackupFilesAndDatabase(),
'backup_images' => $this->updateConfiguration->shouldBackupImages(),
];
$upgradeProperties = $this->properties[self::WITH_BACKUP_PROPERTIES] ?? [];
Expand Down
8 changes: 0 additions & 8 deletions classes/Parameters/UpgradeConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ class UpgradeConfiguration extends ArrayCollection
const PS_AUTOUP_CUSTOM_MOD_DESACT = 'PS_AUTOUP_CUSTOM_MOD_DESACT';
const PS_AUTOUP_CHANGE_DEFAULT_THEME = 'PS_AUTOUP_CHANGE_DEFAULT_THEME';
const PS_AUTOUP_REGEN_EMAIL = 'PS_AUTOUP_REGEN_EMAIL';
const PS_AUTOUP_BACKUP = 'PS_AUTOUP_BACKUP';
const PS_AUTOUP_KEEP_IMAGES = 'PS_AUTOUP_KEEP_IMAGES';
const PS_DISABLE_OVERRIDES = 'PS_DISABLE_OVERRIDES';
const CHANNEL = 'channel';
Expand All @@ -59,7 +58,6 @@ class UpgradeConfiguration extends ArrayCollection
self::PS_AUTOUP_CUSTOM_MOD_DESACT,
self::PS_AUTOUP_CHANGE_DEFAULT_THEME,
self::PS_AUTOUP_REGEN_EMAIL,
self::PS_AUTOUP_BACKUP,
self::PS_AUTOUP_KEEP_IMAGES,
self::PS_DISABLE_OVERRIDES,
self::CHANNEL,
Expand All @@ -72,7 +70,6 @@ class UpgradeConfiguration extends ArrayCollection
self::PS_AUTOUP_CUSTOM_MOD_DESACT => true,
self::PS_AUTOUP_CHANGE_DEFAULT_THEME => false,
self::PS_AUTOUP_REGEN_EMAIL => true,
self::PS_AUTOUP_BACKUP => true,
self::PS_AUTOUP_KEEP_IMAGES => true,
self::BACKUP_COMPLETED => false,
];
Expand Down Expand Up @@ -199,11 +196,6 @@ public function getMaxFileToBackup(): int
return $this::PERFORMANCE_VALUES['maxBackupFileSize'];
}

public function shouldBackupFilesAndDatabase(): bool
{
return $this->computeBooleanConfiguration(self::PS_AUTOUP_BACKUP);
}

/**
* @return bool True if the autoupgrade module backup should include the images
*/
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/AnalyticsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public function testProperties()
UpgradeConfiguration::PS_AUTOUP_CUSTOM_MOD_DESACT => false,
UpgradeConfiguration::PS_AUTOUP_CHANGE_DEFAULT_THEME => true,
UpgradeConfiguration::PS_AUTOUP_REGEN_EMAIL => true,
UpgradeConfiguration::PS_AUTOUP_BACKUP => true,
UpgradeConfiguration::PS_AUTOUP_KEEP_IMAGES => false,
UpgradeConfiguration::CHANNEL => UpgradeConfiguration::CHANNEL_LOCAL,
UpgradeConfiguration::ARCHIVE_ZIP => 'zip.zip',
Expand Down Expand Up @@ -131,7 +130,6 @@ public function testProperties()
'autoupgrade_version' => '9.8.7',
'module' => 'autoupgrade',

'backup_files_and_databases' => true,
'backup_images' => false,
],
],
Expand Down

0 comments on commit 1a1f9f3

Please sign in to comment.