From 1181545c471dc03db5c85aa11926dbd0da27149f Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 26 May 2022 00:36:15 -0700 Subject: [PATCH] Upgrader - Fix error on Snapshot::cleanupTask This is a follow-up to #23522. Before ------ Upgrade works on `cv upgrade:db` but fails on `drush civicrm-upgrade-db` After ----- Upgrades on both `cv upgrade:db` and `drush civicrm-upgrade-db` --- CRM/Upgrade/Snapshot.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Upgrade/Snapshot.php b/CRM/Upgrade/Snapshot.php index 5968ae54e0..9f5a493844 100644 --- a/CRM/Upgrade/Snapshot.php +++ b/CRM/Upgrade/Snapshot.php @@ -184,8 +184,9 @@ class CRM_Upgrade_Snapshot { * How long should we retain old snapshots? * Time is measured in terms of MINOR versions - eg "4" means "retain for 4 MINOR versions". * Thus, on v5.60, you could delete any snapshots predating 5.56. + * @return bool */ - public static function cleanupTask(?CRM_Queue_TaskContext $ctx = NULL, string $owner = 'civicrm', ?string $version = NULL, ?int $cleanupAfter = NULL): void { + public static function cleanupTask(?CRM_Queue_TaskContext $ctx = NULL, string $owner = 'civicrm', ?string $version = NULL, ?int $cleanupAfter = NULL): bool { $version = $version ?: CRM_Core_BAO_Domain::version(); $cleanupAfter = $cleanupAfter ?: static::$cleanupAfter; @@ -213,6 +214,7 @@ class CRM_Upgrade_Snapshot { }); array_map(['CRM_Core_BAO_SchemaHandler', 'dropTable'], $oldTables); + return TRUE; } } -- 2.25.1