Added comments to missing table civicrm_mailing_abtest in 4.6.alpha1.mysql.tpl

[civicrm-core.git] / CRM / Upgrade / Form.php

diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
index 2114c9e575573f5edce4f9d2b09157a8878b2b00..6f40d682b11509b36aee97abb9edc4f3f8c4a56b 100644 (file)
--- a/CRM/Upgrade/Form.php
+++ b/CRM/Upgrade/Form.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -91,7 +91,6 @@ class CRM_Upgrade_Form extends CRM_Core_Form {
    *   The name of the form if different from class name.
    *
    * @return \CRM_Core_Form
-  @access public
    */
   /**
    * @param null|object $state
@@ -99,7 +98,7 @@ class CRM_Upgrade_Form extends CRM_Core_Form {
    * @param string $method
    * @param null|string $name
    */
-  function __construct(
+  public function __construct(
     $state = NULL,
     $action = CRM_Core_Action::NONE,
     $method = 'post',
@@ -361,7 +360,7 @@ SET    version = '$version'
 
     // sample test list
     /*         $revList = array(
-      '2.1.0', '2.2.beta2', '2.2.beta1', '2.2.alpha1', */
+    '2.1.0', '2.2.beta2', '2.2.beta1', '2.2.alpha1', */
 
     /*                          '2.2.alpha3', '2.2.0', '2.2.2', '2.1.alpha1', '2.1.3'); */
 
@@ -417,8 +416,10 @@ SET    version = '$version'
   public function processSQL($rev) {
     $sqlFile = implode(DIRECTORY_SEPARATOR,
       array(
-        dirname(__FILE__), 'Incremental',
-        'sql', $rev . '.mysql',
+        dirname(__FILE__),
+        'Incremental',
+        'sql',
+        $rev . '.mysql',
       )
     );
     $tplFile = "$sqlFile.tpl";
@@ -498,17 +499,17 @@ SET    version = '$version'
     $minPhpVersion = '5.3.3';
     if (version_compare($phpVersion, $minPhpVersion) < 0) {
       $error = ts('CiviCRM %3 requires PHP version %1 (or newer), but the current system uses %2 ',
-               array(
-                 1 => $minPhpVersion,
-                 2 => $phpVersion,
-                 3 => $latestVer,
-               ));
+        array(
+          1 => $minPhpVersion,
+          2 => $phpVersion,
+          3 => $latestVer,
+        ));
     }
 
     // check for mysql trigger privileges
     if (!CRM_Core_DAO::checkTriggerViewPermission(FALSE, TRUE)) {
       $error = ts('CiviCRM %1 requires MySQL trigger privileges.',
-               array(1 => $latestVer));
+        array(1 => $latestVer));
     }
 
     if (CRM_Core_DAO::getGlobalSetting('thread_stack', 0) < (1024 * self::MINIMUM_THREAD_STACK)) {
@@ -571,17 +572,17 @@ SET    version = '$version'
       CRM_Core_Error::fatal(ts('Failed to find or create queueing table'));
     }
     $queue = CRM_Queue_Service::singleton()->create(array(
-        'name' => self::QUEUE_NAME,
-        'type' => 'Sql',
-        'reset' => TRUE,
-      ));
+      'name' => self::QUEUE_NAME,
+      'type' => 'Sql',
+      'reset' => TRUE,
+    ));
 
     $revisions = $upgrade->getRevisionSequence();
     foreach ($revisions as $rev) {
       // proceed only if $currentVer < $rev
       if (version_compare($currentVer, $rev) < 0) {
         $beginTask = new CRM_Queue_Task(
-          // callback
+        // callback
           array('CRM_Upgrade_Form', 'doIncrementalUpgradeStart'),
           // arguments
           array($rev),
@@ -590,7 +591,7 @@ SET    version = '$version'
         $queue->createItem($beginTask);
 
         $task = new CRM_Queue_Task(
-          // callback
+        // callback
           array('CRM_Upgrade_Form', 'doIncrementalUpgradeStep'),
           // arguments
           array($rev, $currentVer, $latestVer, $postUpgradeMessageFile),
@@ -599,7 +600,7 @@ SET    version = '$version'
         $queue->createItem($task);
 
         $task = new CRM_Queue_Task(
-          // callback
+        // callback
           array('CRM_Upgrade_Form', 'doIncrementalUpgradeFinish'),
           // arguments
           array($rev, $currentVer, $latestVer, $postUpgradeMessageFile),
@@ -656,7 +657,10 @@ SET    version = '$version'
     // pre-db check for major release.
     if ($upgrade->checkVersionRelease($rev, 'alpha1')) {
       if (!(is_callable(array(
-        $versionObject, 'verifyPreDBstate')))) {
+        $versionObject,
+        'verifyPreDBstate',
+      )))
+      ) {
         CRM_Core_Error::fatal("verifyPreDBstate method was not found for $rev");
       }
 
@@ -673,7 +677,9 @@ SET    version = '$version'
     $upgrade->setSchemaStructureTables($rev);
 
     if (is_callable(array(
-      $versionObject, $phpFunctionName))) {
+      $versionObject,
+      $phpFunctionName,
+    ))) {
       $versionObject->$phpFunctionName($rev, $originalVer, $latestVer);
     }
     else {
@@ -682,7 +688,9 @@ SET    version = '$version'
 
     // set post-upgrade-message if any
     if (is_callable(array(
-      $versionObject, 'setPostUpgradeMessage'))) {
+      $versionObject,
+      'setPostUpgradeMessage',
+    ))) {
       $postUpgradeMessage = file_get_contents($postUpgradeMessageFile);
       $versionObject->setPostUpgradeMessage($postUpgradeMessage, $rev);
       file_put_contents($postUpgradeMessageFile, $postUpgradeMessage);
@@ -769,10 +777,13 @@ SET    version = '$version'
       ) {
         $versionObject = $this->incrementalPhpObject($rev);
         if (is_callable(array(
-          $versionObject, 'setPreUpgradeMessage'))) {
+          $versionObject,
+          'setPreUpgradeMessage',
+        ))) {
           $versionObject->setPreUpgradeMessage($preUpgradeMessage, $rev, $currentVer);
         }
       }
     }
   }
+
 }