get newest folders of subplugins before deleting them in upgrade job

bluetom · bluetom · commit 8d3788585f45 · 2025-04-14T06:29:04.000+02:00
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use \tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * Fix any gaps in the workflows sortindex.
@@ -500,7 +500,7 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {
 
     }
 
-    if ($oldversion < 2025041200) {
+    if ($oldversion < 2025041400) {
 
         // Changing precision of field instancename on table tool_lifecycle_trigger to (100).
         $table = new xmldb_table('tool_lifecycle_trigger');
@@ -595,7 +595,7 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {
             purge_all_caches();
         }
 
-        upgrade_plugin_savepoint(true, 2025041200, 'tool', 'lifecycle');
+        upgrade_plugin_savepoint(true, 2025041400, 'tool', 'lifecycle');
 
     }
 
diff --git a/step/adminapprove/db/upgrade.php b/step/adminapprove/db/upgrade.php
@@ -37,7 +37,7 @@ function xmldb_lifecyclestep_adminapprove_upgrade($oldversion) {
 
     global $DB;
     $dbman = $DB->get_manager();
-    if ($oldversion < 2025041200) {
+    if ($oldversion < 2025041400) {
 
         // Define table lifecyclestep_adminapprove to be created.
         $table = new xmldb_table('lifecyclestep_adminapprove');
@@ -57,7 +57,7 @@ function xmldb_lifecyclestep_adminapprove_upgrade($oldversion) {
         }
 
         // Adminapprove savepoint reached.
-        upgrade_plugin_savepoint(true, 2025041200, 'lifecyclestep', 'adminapprove');
+        upgrade_plugin_savepoint(true, 2025041400, 'lifecyclestep', 'adminapprove');
     }
     return true;
 }
diff --git a/step/adminapprove/version.php b/step/adminapprove/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->component = 'lifecyclestep_adminapprove';
 $plugin->dependencies = [
-        'tool_lifecycle' => 2025041200,
+        'tool_lifecycle' => 2025041400,
 ];
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->release = 'v4.5-r1';
diff --git a/step/createbackup/version.php b/step/createbackup/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecyclestep_createbackup';
 $plugin->release   = 'v4.5-r1';
diff --git a/step/deletecourse/version.php b/step/deletecourse/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecyclestep_deletecourse';
 $plugin->release   = 'v4.5-r1';
diff --git a/step/duplicate/version.php b/step/duplicate/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecyclestep_duplicate';
 $plugin->release   = 'v4.5-r1';
diff --git a/step/email/db/upgrade.php b/step/email/db/upgrade.php
@@ -37,7 +37,7 @@ function xmldb_lifecyclestep_email_upgrade($oldversion) {
 
     global $DB;
     $dbman = $DB->get_manager();
-    if ($oldversion < 2025041200) {
+    if ($oldversion < 2025041400) {
         $table = new xmldb_table('lifecyclestep_email_notified');
 
         // Adding fields to table lifecyclestep_email_notified.
@@ -57,7 +57,7 @@ function xmldb_lifecyclestep_email_upgrade($oldversion) {
         }
 
         // Lifecycle savepoint reached.
-        upgrade_plugin_savepoint(true, 2025041200, 'lifecyclestep', 'email');
+        upgrade_plugin_savepoint(true, 2025041400, 'lifecyclestep', 'email');
     }
     return true;
 }
diff --git a/step/email/version.php b/step/email/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecyclestep_email';
 $plugin->release   = 'v4.5-r1';
diff --git a/step/makeinvisible/version.php b/step/makeinvisible/version.php
@@ -24,11 +24,11 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecyclestep_makeinvisible';
 $plugin->dependencies = [
-    'tool_lifecycle' => 2025041200,
+    'tool_lifecycle' => 2025041400,
 ];
 $plugin->release   = 'v4.5-r1';
 $plugin->maturity = MATURITY_STABLE;
diff --git a/trigger/byrole/version.php b/trigger/byrole/version.php
@@ -24,11 +24,11 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_byrole';
 $plugin->dependencies = [
-    'tool_lifecycle' => 2025041200,
+    'tool_lifecycle' => 2025041400,
 ];
 $plugin->release   = 'v4.5-r1';
 $plugin->maturity = MATURITY_STABLE;
diff --git a/trigger/categories/version.php b/trigger/categories/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_categories';
 $plugin->release   = 'v4.5-r1';
diff --git a/trigger/delayedcourses/lang/de/lifecycletrigger_delayedcourses.php b/trigger/delayedcourses/lang/de/lifecycletrigger_delayedcourses.php
@@ -23,6 +23,7 @@
  */
 
 $string['delay'] = 'Dieser Trigger wird alle Kurse ausschließen, die durch Nutzerinteraktion verzögert wurden.';
+$string['plugindescription'] = 'Schließt Kurse von diesem Workflow aus, die durch Nutzeraktion verzögert wurden.';
 $string['pluginname'] = 'Verzögerte Kurse ausschließen - Trigger';
 $string['privacy:metadata'] = 'Dieses Subplugin speichert keine persönlichen Daten.';
 
diff --git a/trigger/delayedcourses/lang/en/lifecycletrigger_delayedcourses.php b/trigger/delayedcourses/lang/en/lifecycletrigger_delayedcourses.php
@@ -23,6 +23,6 @@
  */
 
 $string['delay'] = 'This module will exclude all courses, which were delayed by user interaction';
+$string['plugindescription'] = 'Exludes all courses which were delayed by user interaction.';
 $string['pluginname'] = 'Exclude delayed courses trigger';
 $string['privacy:metadata'] = 'This subplugin does not store any personal data.';
-
diff --git a/trigger/delayedcourses/tests/generator/lib.php b/trigger/delayedcourses/tests/generator/lib.php
@@ -41,6 +41,8 @@ class tool_lifecycle_trigger_delayedcourses_generator extends testing_module_gen
     /**
      * Creates a trigger delayedcourses for an artificial workflow without steps.
      * @return trigger_subplugin the created delayedcourses trigger.
+     * @throws dml_exception
+     * @throws dml_transaction_exception
      */
     public static function create_trigger_with_workflow() {
         // Create Workflow.
@@ -62,6 +64,8 @@ public static function create_trigger_with_workflow() {
     /**
      * Creates a workflow, which delays only for upcomming processes of itself.
      * @return workflow.
+     * @throws dml_exception
+     * @throws dml_transaction_exception
      */
     public static function create_workflow() {
         // Create Workflow.
@@ -79,6 +83,8 @@ public static function create_workflow() {
     /**
      * Creates a workflow, which delays upcomming processes for all workflows.
      * @return workflow.
+     * @throws dml_exception
+     * @throws dml_transaction_exception
      */
     public static function create_workflow_delaying_for_all_workflows() {
         // Create Workflow.
diff --git a/trigger/delayedcourses/tests/trigger_test.php b/trigger/delayedcourses/tests/trigger_test.php
@@ -22,6 +22,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
 namespace lifecycletrigger_delayedcourses;
 
 use tool_lifecycle\local\entity\trigger_subplugin;
diff --git a/trigger/delayedcourses/version.php b/trigger/delayedcourses/version.php
@@ -19,11 +19,14 @@
  *
  * @package lifecycletrigger_delayedcourses
  * @subpackage delayedcourses
- * @copyright  2017 Tobias Reischmann WWU
+ * @copyright  2025 Thomas Niedermaier Universität Münster
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version  = 2017061900;
+$plugin->version = 2025040600;
+$plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_delayedcourses';
+$plugin->release   = 'v4.5-r1';
+$plugin->maturity = MATURITY_STABLE;
diff --git a/trigger/manual/version.php b/trigger/manual/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_manual';
 $plugin->release   = 'v4.5-r1';
diff --git a/trigger/semindependent/db/upgrade.php b/trigger/semindependent/db/upgrade.php
@@ -41,7 +41,7 @@ function xmldb_lifecycletrigger_semindependent_upgrade($oldversion) {
 
     global $DB;
 
-    if ($oldversion < 2025041200) {
+    if ($oldversion < 2025041400) {
 
         if ($instances = $DB->get_records('tool_lifecycle_trigger', ['subpluginname' => 'semindependent'])) {
             // For each existing semindependent instance.
@@ -60,7 +60,7 @@ function xmldb_lifecycletrigger_semindependent_upgrade($oldversion) {
                 }
             }
         }
-        upgrade_plugin_savepoint(true, 2025041200, 'lifecycletrigger', 'semindependent');
+        upgrade_plugin_savepoint(true, 2025041400, 'lifecycletrigger', 'semindependent');
 
     }
 
diff --git a/trigger/semindependent/version.php b/trigger/semindependent/version.php
@@ -25,11 +25,11 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_semindependent';
 $plugin->dependencies = [
-    'tool_lifecycle' => 2025041200,
+    'tool_lifecycle' => 2025041400,
 ];
 $plugin->release   = 'v4.5-r1';
 $plugin->maturity = MATURITY_STABLE;
diff --git a/trigger/sitecourse/lang/de/lifecycletrigger_sitecourse.php b/trigger/sitecourse/lang/de/lifecycletrigger_sitecourse.php
@@ -23,6 +23,7 @@
  */
 
 $string['delay'] = 'Dieser Trigger wird den Startseitenkurs ausschließen.';
+$string['plugindescription'] = 'Schließt den Startseitenkurs von diesen Workflow aus.';
 $string['pluginname'] = 'Startseitenkurs ausschließen - Trigger';
 $string['privacy:metadata'] = 'Dieses Subplugin speichert keine persönlichen Daten.';
 
diff --git a/trigger/sitecourse/lang/en/lifecycletrigger_sitecourse.php b/trigger/sitecourse/lang/en/lifecycletrigger_sitecourse.php
@@ -23,6 +23,7 @@
  */
 
 $string['delay'] = 'This module will exclude the site course from processing';
+$string['plugindescription'] = 'Excludes the site course from this workflow.';
 $string['pluginname'] = 'Exclude site course trigger';
 $string['privacy:metadata'] = 'This subplugin does not store any personal data.';
 
diff --git a/trigger/sitecourse/lib.php b/trigger/sitecourse/lib.php
@@ -58,7 +58,7 @@ public function check_course($course, $triggerid) {
      */
     public function get_course_recordset_where($triggerid) {
         global $DB;
-        list($insql, $inparam) = $DB->get_in_or_equal(SITEID, SQL_PARAMS_NAMED);
+        list($insql, $inparam) = $DB->get_in_or_equal(SITEID, SQL_PARAMS_NAMED, 'param', false);
         return ["{course}.id {$insql}", $inparam];
     }
 
diff --git a/trigger/sitecourse/version.php b/trigger/sitecourse/version.php
@@ -18,11 +18,14 @@
  * Life Cycle Site Course Trigger
  *
  * @package lifecycletrigger_sitecourse
- * @copyright  2017 Tobias Reischmann WWU
+ * @copyright  2025 Thomas Niedermaier Universität Münster
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version  = 2017050900;
+$plugin->version = 2025040600;
+$plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_sitecourse';
+$plugin->release   = 'v4.5-r1';
+$plugin->maturity = MATURITY_STABLE;
diff --git a/trigger/specificdate/version.php b/trigger/specificdate/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_specificdate';
 $plugin->release   = 'v4.5-r1';
diff --git a/trigger/startdatedelay/version.php b/trigger/startdatedelay/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2025041200;
+$plugin->version = 2025041400;
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->component = 'lifecycletrigger_startdatedelay';
 $plugin->release   = 'v4.5-r1';
diff --git a/version.php b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->maturity = MATURITY_STABLE;
-$plugin->version  = 2025041200;
+$plugin->version  = 2025041400;
 $plugin->component = 'tool_lifecycle';
 $plugin->requires = 2024100700; // Requires Moodle 4.5+.
 $plugin->release   = 'v4.5-r1';

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later`
`23`	`23`	`*/`
`24`	`24`
`25`		`-use \tool_lifecycle\local\manager\workflow_manager;`
	`25`	`+use tool_lifecycle\local\manager\workflow_manager;`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* Fix any gaps in the workflows sortindex.`
`@@ -500,7 +500,7 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {`
`500`	`500`
`501`	`501`	`}`
`502`	`502`
`503`		`- if ($oldversion < 2025041200) {`
	`503`	`+ if ($oldversion < 2025041400) {`
`504`	`504`
`505`	`505`	`// Changing precision of field instancename on table tool_lifecycle_trigger to (100).`
`506`	`506`	`$table = new xmldb_table('tool_lifecycle_trigger');`
`@@ -595,7 +595,7 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {`
`595`	`595`	`purge_all_caches();`
`596`	`596`	`}`
`597`	`597`
`598`		`- upgrade_plugin_savepoint(true, 2025041200, 'tool', 'lifecycle');`
	`598`	`+ upgrade_plugin_savepoint(true, 2025041400, 'tool', 'lifecycle');`
`599`	`599`
`600`	`600`	`}`
`601`	`601`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function xmldb_lifecyclestep_adminapprove_upgrade($oldversion) {`
`37`	`37`
`38`	`38`	`global $DB;`
`39`	`39`	`$dbman = $DB->get_manager();`
`40`		`- if ($oldversion < 2025041200) {`
	`40`	`+ if ($oldversion < 2025041400) {`
`41`	`41`
`42`	`42`	`// Define table lifecyclestep_adminapprove to be created.`
`43`	`43`	`$table = new xmldb_table('lifecyclestep_adminapprove');`
`@@ -57,7 +57,7 @@ function xmldb_lifecyclestep_adminapprove_upgrade($oldversion) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Adminapprove savepoint reached.`
`60`		`- upgrade_plugin_savepoint(true, 2025041200, 'lifecyclestep', 'adminapprove');`
	`60`	`+ upgrade_plugin_savepoint(true, 2025041400, 'lifecyclestep', 'adminapprove');`
`61`	`61`	`}`
`62`	`62`	`return true;`
`63`	`63`	`}`