CRM_Upgrade_Form::buildQueue - Scan CRM/Upgrade/Incremental/any/{VERS…

…ION}/*
civicrm · Dec 10, 2015 · 444869b · 444869b
1 parent 6fb3601
commit 444869b
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
@@ -594,6 +594,8 @@ public static function buildQueue($currentVer, $latestVer, $postUpgradeMessageFi
         );
         $queue->createItem($beginTask);
 
+        // Traditional handler for files like CRM/Upgrade/Incremental/php/FourFour.php
+        // and CRM/Upgrade/Incremental/sql/*.mysql.tpl.
         $task = new CRM_Queue_Task(
         // callback
           array('CRM_Upgrade_Form', 'doIncrementalUpgradeStep'),
@@ -603,6 +605,25 @@ public static function buildQueue($currentVer, $latestVer, $postUpgradeMessageFi
         );
         $queue->createItem($task);
 
+        // Newer handler for files like CRM/Upgrade/Incremental/any/{VERSION}/{*.php,*.mysql.tpl}
+        $incDir = implode(DIRECTORY_SEPARATOR,
+          array(dirname(__FILE__), 'Incremental', 'any', $rev)
+        );
+        if (is_dir($incDir)) {
+          $taskDir = new CRM_Queue_TaskDir($incDir);
+          $taskDir
+            ->addCallback('/\.task\.php$/', array('CRM_Upgrade_Form', 'doPhpFileStep'))
+            ->addCallback('/\.mysql\.tpl$/', array('CRM_Upgrade_Form', 'doSqlTplFileStep'))
+            ->setTitle("Upgrade DB to $rev: {file.name}")
+            ->setData(array(
+              'rev' => $rev,
+              'currentVer' => $currentVer,
+              'latestVer' => $latestVer,
+              'postUpgradeMessageFile' => $postUpgradeMessageFile,
+            ))
+            ->fill($queue);
+        }
+
         $task = new CRM_Queue_Task(
         // callback
           array('CRM_Upgrade_Form', 'doIncrementalUpgradeFinish'),
@@ -693,6 +714,51 @@ public static function doIncrementalUpgradeStep(CRM_Queue_TaskContext $ctx, $rev
     return TRUE;
   }
 
+  /**
+   * Handle any file matching "CRM/Upgrade/Incremental/any/*.task.php".
+   *
+   * @param \CRM_Queue_TaskContext $ctx
+   * @param string $file
+   * @param array $data
+   *   Array('rev'=>, 'latestVer'=>, ...).
+   * @return bool
+   * @throws \Exception
+   */
+  public static function doPhpFileStep(CRM_Queue_TaskContext $ctx, $file, $data) {
+    $stack = CRM_Utils_GlobalStack::singleton();
+    $stack->push(array(
+      '_TASK' => array('ctx' => $ctx, 'file' => $file) + $data,
+    ));
+
+    try {
+      include $file;
+    }
+    catch (Exception $e) {
+      $stack->pop();
+      throw $e;
+    }
+
+    $stack->pop();
+    return TRUE;
+  }
+
+  /**
+   * Handle any file matching "CRM/Upgrade/Incremental/any/*.mysql.tpl".
+   *
+   * @param \CRM_Queue_TaskContext $ctx
+   * @param string $file
+   * @param array $data
+   *   Array('rev'=>, 'latestVer'=>, ...).
+   * @return bool
+   * @throws \Exception
+   */
+  public static function doSqlTplFileStep(CRM_Queue_TaskContext $ctx, $file, $data) {
+    $upgrade = new CRM_Upgrade_Form();
+    $upgrade->processLocales($file, $data['rev']);
+    return TRUE;
+  }
+
+
   /**
    * Perform an incremental version update.
    *

diff --git a/CRM/Upgrade/Incremental/any/.gitkeep b/CRM/Upgrade/Incremental/any/.gitkeep