From bd00780f17f50c4f074c714c0879c600b48e4e25 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 15 Nov 2014 23:15:20 -0500
Subject: [PATCH] Remove legacy code from CRM_Upgrade_Form

---
 CRM/Upgrade/Form.php | 87 ++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 55 deletions(-)

diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
index d23d976ff3..b0386d1650 100644
--- a/CRM/Upgrade/Form.php
+++ b/CRM/Upgrade/Form.php
@@ -44,10 +44,6 @@ class CRM_Upgrade_Form extends CRM_Core_Form {
 
   protected $_config;
 
-  // note latestVersion is legacy code, and
-  // only used for 2.0 -> 2.1 upgrade
-  public $latestVersion;
-
   /**
    * Upgrade for multilingual
    *
@@ -110,10 +106,6 @@ class CRM_Upgrade_Form extends CRM_Core_Form {
   ) {
     $this->_config = CRM_Core_Config::singleton();
 
-    // this->latestVersion is legacy code, only used for 2.0 -> 2.1 upgrade
-    // latest ver in 2.1 series
-    $this->latestVersion = '2.1.6';
-
     $domain = new CRM_Core_DAO_Domain();
     $domain->find(TRUE);
 
@@ -656,60 +648,45 @@ SET    version = '$version'
 
     $phpFunctionName = 'upgrade_' . str_replace('.', '_', $rev);
 
-    // follow old upgrade process for all version
-    // below 3.2.alpha1
-    if (version_compare($rev, '3.2.alpha1') < 0) {
-      if (is_callable(array(
-        'CRM_Upgrade_Incremental_Legacy', $phpFunctionName))) {
-        call_user_func(array('CRM_Upgrade_Incremental_Legacy', $phpFunctionName), $rev);
-      }
-      else {
-        $upgrade->processSQL($rev);
+    $versionObject = $upgrade->incrementalPhpObject($rev);
+
+    // pre-db check for major release.
+    if ($upgrade->checkVersionRelease($rev, 'alpha1')) {
+      if (!(is_callable(array(
+        $versionObject, 'verifyPreDBstate')))) {
+        CRM_Core_Error::fatal("verifyPreDBstate method was not found for $rev");
       }
-    }
-    else {
-      // new upgrade process from version
-      // 3.2.alpha1
-      $versionObject = $upgrade->incrementalPhpObject($rev);
-
-      // pre-db check for major release.
-      if ($upgrade->checkVersionRelease($rev, 'alpha1')) {
-        if (!(is_callable(array(
-          $versionObject, 'verifyPreDBstate')))) {
-          CRM_Core_Error::fatal("verifyPreDBstate method was not found for $rev");
-        }
 
-        $error = NULL;
-        if (!($versionObject->verifyPreDBstate($error))) {
-          if (!isset($error)) {
-            $error = "post-condition failed for current upgrade for $rev";
-          }
-          CRM_Core_Error::fatal($error);
+      $error = NULL;
+      if (!($versionObject->verifyPreDBstate($error))) {
+        if (!isset($error)) {
+          $error = "post-condition failed for current upgrade for $rev";
         }
-
+        CRM_Core_Error::fatal($error);
       }
 
-      $upgrade->setSchemaStructureTables($rev);
+    }
 
-      if (is_callable(array(
-        $versionObject, $phpFunctionName))) {
-        $versionObject->$phpFunctionName($rev, $originalVer, $latestVer);
-      }
-      else {
-        $upgrade->processSQL($rev);
-      }
+    $upgrade->setSchemaStructureTables($rev);
 
-      // set post-upgrade-message if any
-      if (is_callable(array(
-        $versionObject, 'setPostUpgradeMessage'))) {
-        $postUpgradeMessage = file_get_contents($postUpgradeMessageFile);
-        $versionObject->setPostUpgradeMessage($postUpgradeMessage, $rev);
-        file_put_contents($postUpgradeMessageFile, $postUpgradeMessage);
-      } else {
-        $postUpgradeMessage = file_get_contents($postUpgradeMessageFile);
-        CRM_Upgrade_Incremental_Legacy::setPostUpgradeMessage($postUpgradeMessage, $rev);
-        file_put_contents($postUpgradeMessageFile, $postUpgradeMessage);
-      }
+    if (is_callable(array(
+      $versionObject, $phpFunctionName))) {
+      $versionObject->$phpFunctionName($rev, $originalVer, $latestVer);
+    }
+    else {
+      $upgrade->processSQL($rev);
+    }
+
+    // set post-upgrade-message if any
+    if (is_callable(array(
+      $versionObject, 'setPostUpgradeMessage'))) {
+      $postUpgradeMessage = file_get_contents($postUpgradeMessageFile);
+      $versionObject->setPostUpgradeMessage($postUpgradeMessage, $rev);
+      file_put_contents($postUpgradeMessageFile, $postUpgradeMessage);
+    } else {
+      $postUpgradeMessage = file_get_contents($postUpgradeMessageFile);
+      CRM_Upgrade_Incremental_Legacy::setPostUpgradeMessage($postUpgradeMessage, $rev);
+      file_put_contents($postUpgradeMessageFile, $postUpgradeMessage);
     }
 
     return TRUE;
-- 
2.25.1