COMCL-635: Upgrade civix

compucorp · Jul 26, 2024 · 6d930ee · 6d930ee
1 parent 8015d8c
commit 6d930ee
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 802 deletions.
diff --git a/CRM/CiviAwards/Upgrader.php b/CRM/CiviAwards/Upgrader.php
@@ -27,7 +27,7 @@
 /**
  * Collection of upgrade steps.
  */
-class CRM_CiviAwards_Upgrader extends CRM_CiviAwards_Upgrader_Base {
+class CRM_CiviAwards_Upgrader extends CRM_Extension_Upgrader_Base {
 
   /**
    * A list of directories to be scanned for XML installation files.
@@ -148,27 +148,24 @@ public function hasPendingRevisions() {
    *
    * @inheritdoc
    */
-  public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
+  public function enqueuePendingRevisions() {
     $currentRevisionNum = (int) $this->getCurrentRevision();
     foreach ($this->getRevisions() as $revisionClass => $revisionNum) {
 
       if ($revisionNum <= $currentRevisionNum) {
         continue;
       }
-      $tsParams = [1 => $this->extensionName, 2 => $revisionNum];
-      $title = ts('Upgrade %1 to revision %2', $tsParams);
+      $title = ts('Upgrade %1 to revision %2', [
+        1 => $this->extensionName,
+        2 => $revisionNum,
+      ]);
       $upgradeTask = new CRM_Queue_Task(
         [get_class($this), 'runStepUpgrade'],
         [(new $revisionClass())],
         $title
       );
-      $queue->createItem($upgradeTask);
-      $setRevisionTask = new CRM_Queue_Task(
-        [get_class($this), '_queueAdapter'],
-        ['setCurrentRevision', $revisionNum],
-        $title
-      );
-      $queue->createItem($setRevisionTask);
+      $this->queue->createItem($upgradeTask);
+      $this->appendTask($title, 'setCurrentRevision', $revisionNum);
     }
   }