Delete .sql.zip files per maxBackups setting

Resolves #11241
craftcms · Jun 4, 2022 · 607d1e0 · 607d1e0
1 parent 94003ab
commit 607d1e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -31,6 +31,7 @@
 - Field layout elements within field layout designers now support double-clicking to open their settings slideout. ([#11277](https://github.com/craftcms/cms/discussions/11277))
 - The control panel’s JavaScript queue is now paused when the browser tab isn’t visible. ([#10632](https://github.com/craftcms/cms/issues/10632))
 - The `users/create` command now asks whether the user should be activated when saved.
+- The `maxBackups` config setting now impacts `.sql.zip` files in addition to `.sql` files. ([#11241](https://github.com/craftcms/cms/issues/11241))
 - Deprecation messages are now consistently referred to as “deprecation warnings” in the control panel.
 - Callback functions returned by elements’ `sortOptions()`/`defineSortOptions()` methods are now passed a `craft\db\Connection` object as a second argument.
 - The `searchindex` table is now uses the InnoDB storage engine by default for MySQL installs. ([#11374](https://github.com/craftcms/cms/discussions/11374))

diff --git a/src/db/Connection.php b/src/db/Connection.php
@@ -265,7 +265,10 @@ public function backupTo(string $filePath): void
             $backupPath = Craft::$app->getPath()->getDbBackupPath();
 
             // Grab all .sql files in the backup folder.
-            $files = glob($backupPath . DIRECTORY_SEPARATOR . '*.sql');
+            $files = array_merge(
+                glob($backupPath . DIRECTORY_SEPARATOR . '*.sql'),
+                glob($backupPath . DIRECTORY_SEPARATOR . '*.sql.zip'),
+            );
 
             // Sort them by file modified time descending (newest first).
             usort($files, static function($a, $b) {