From b9ce915b43b1b7c36f06b60db33b6ce67c4e8be0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 6 Mar 2021 02:08:05 -0800
Subject: [PATCH] (Cleanup) Upgrader - Remove empty steps from 5.10-series

---
 CRM/Upgrade/Incremental/php/FiveEighteen.php      | 2 +-
 CRM/Upgrade/Incremental/php/FiveEleven.php        | 3 ++-
 CRM/Upgrade/Incremental/php/FiveFourteen.php      | 2 +-
 CRM/Upgrade/Incremental/php/FiveNineteen.php      | 2 +-
 CRM/Upgrade/Incremental/php/FiveSeventeen.php     | 1 +
 CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl      | 1 -
 CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl      | 1 -
 CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl      | 1 -
 CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl      | 1 -
 CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl  | 1 -
 22 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/php/FiveEighteen.php b/CRM/Upgrade/Incremental/php/FiveEighteen.php
index 8cf31ff1f2..6428be7bec 100644
--- a/CRM/Upgrade/Incremental/php/FiveEighteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveEighteen.php
@@ -58,7 +58,7 @@ class CRM_Upgrade_Incremental_php_FiveEighteen extends CRM_Upgrade_Incremental_B
    * @param string $rev
    */
   public function upgrade_5_18_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     $this->addTask('Update smart groups to reflect change of unique name for is_override', 'updateSmartGroups', [
       'renameField' => [
         ['old' => 'is_override', 'new' => 'member_is_override'],
diff --git a/CRM/Upgrade/Incremental/php/FiveEleven.php b/CRM/Upgrade/Incremental/php/FiveEleven.php
index feb11b4b7c..6ad79515b2 100644
--- a/CRM/Upgrade/Incremental/php/FiveEleven.php
+++ b/CRM/Upgrade/Incremental/php/FiveEleven.php
@@ -58,7 +58,7 @@ class CRM_Upgrade_Incremental_php_FiveEleven extends CRM_Upgrade_Incremental_Bas
    * @param string $rev
    */
   public function upgrade_5_11_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Update smart groups where jcalendar fields have been converted to datepicker', 'updateSmartGroups', [
       'datepickerConversion' => [
         'grant_application_received_date',
@@ -78,6 +78,7 @@ class CRM_Upgrade_Incremental_php_FiveEleven extends CRM_Upgrade_Incremental_Bas
    * @param string $rev
    */
   public function upgrade_5_11_beta1($rev) {
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
       $this->addTask('Update any on hold groups to reflect field change', 'updateOnHold', $rev);
     }
diff --git a/CRM/Upgrade/Incremental/php/FiveFourteen.php b/CRM/Upgrade/Incremental/php/FiveFourteen.php
index 66468d761a..49755d6d17 100644
--- a/CRM/Upgrade/Incremental/php/FiveFourteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveFourteen.php
@@ -58,7 +58,7 @@ class CRM_Upgrade_Incremental_php_FiveFourteen extends CRM_Upgrade_Incremental_B
    * @param string $rev
    */
   public function upgrade_5_14_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     // Additional tasks here...
     // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
     // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
diff --git a/CRM/Upgrade/Incremental/php/FiveNineteen.php b/CRM/Upgrade/Incremental/php/FiveNineteen.php
index 24136bf6da..5ebb867b5e 100644
--- a/CRM/Upgrade/Incremental/php/FiveNineteen.php
+++ b/CRM/Upgrade/Incremental/php/FiveNineteen.php
@@ -52,7 +52,7 @@ class CRM_Upgrade_Incremental_php_FiveNineteen extends CRM_Upgrade_Incremental_B
    * @param string $rev
    */
   public function upgrade_5_19_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Add api4 menu', 'api4Menu');
     $this->addTask('Add is_active field to civicrm_status_pref', 'addColumn', 'civicrm_status_pref', 'is_active',
       "tinyint(4) DEFAULT '1' COMMENT 'Is this status check active'", FALSE, '5.19.0');
diff --git a/CRM/Upgrade/Incremental/php/FiveSeventeen.php b/CRM/Upgrade/Incremental/php/FiveSeventeen.php
index c999fe2c34..5f86560b0c 100644
--- a/CRM/Upgrade/Incremental/php/FiveSeventeen.php
+++ b/CRM/Upgrade/Incremental/php/FiveSeventeen.php
@@ -96,6 +96,7 @@ class CRM_Upgrade_Incremental_php_FiveSeventeen extends CRM_Upgrade_Incremental_
    * @param string $rev
    */
   public function upgrade_5_17_1($rev) {
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     // Need to do this again because the alpha1 version had a typo and so didn't do anything.
     $this->addTask(ts('Add pptx to accepted attachment file types'), 'updateFileTypes');
   }
diff --git a/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl
deleted file mode 100644
index d89730e619..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.10.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl
deleted file mode 100644
index 05d4311767..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl
deleted file mode 100644
index 26170aa423..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl
deleted file mode 100644
index a4a894ded5..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.11.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl
deleted file mode 100644
index ff319ed9f0..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.12.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl
deleted file mode 100644
index 8813e5af9b..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.13.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl
deleted file mode 100644
index 051f6eac08..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.14.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl
deleted file mode 100644
index e45ab2285d..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.15.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl
deleted file mode 100644
index e6d2920514..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.15.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl
deleted file mode 100644
index 22be6dcfb8..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.16.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl
deleted file mode 100644
index 00d208673b..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.17.1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl
deleted file mode 100644
index b40cdb2b9c..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.17.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
deleted file mode 100644
index 34af8cc252..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl
deleted file mode 100644
index 9db49d5112..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl
deleted file mode 100644
index 341608e6f1..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.18.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl
deleted file mode 100644
index 01c1f5b167..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.19.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl
deleted file mode 100644
index e565ce5d78..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.19.beta1 during upgrade *}
-- 
2.25.1