0.1.4

Wunderbyte-GmbH · Oct 18, 2024 · 5ecf815 · 5ecf815
1 parent ec654fa
commit 5ecf815
Show file tree

Hide file tree

Showing 76 changed files with 1,350 additions and 237 deletions.
diff --git a/admin/tool/forcedcache/version.php b/admin/tool/forcedcache/version.php
@@ -29,4 +29,5 @@
 $plugin->requires  = 2017051500;
 $plugin->component = 'tool_forcedcache'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity = MATURITY_ALPHA;
-$plugin->supported  = [400, 402];
+$plugin->supported  = [400, 404];
+$plugin->incompatible = 405;
diff --git a/customfield/field/textregex/.github/workflows/gha.yml b/customfield/field/textregex/.github/workflows/gha.yml
@@ -35,6 +35,12 @@ jobs:
 #        database: [pgsql, mariadb]
       matrix:
         include:
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: mariadb
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: pgsql
           - php: '8.3'
             moodle-branch: 'MOODLE_404_STABLE'
             database: mariadb

diff --git a/customfield/field/textregex/classes/privacy/provider.php b/customfield/field/textregex/classes/privacy/provider.php
@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Privacy Subsystem implementation for 'customfield_textregex'.
  *

diff --git a/customfield/field/textregex/tests/plugin_test.php b/customfield/field/textregex/tests/plugin_test.php
@@ -57,6 +57,7 @@ final class plugin_test extends \advanced_testcase {
      * Tests set up.
      */
     public function setUp(): void {
+        parent::setUp();
         $this->resetAfterTest();
 
         $this->cfcat = $this->get_generator()->create_category();
@@ -94,7 +95,7 @@ protected function get_generator(): core_customfield_generator {
 
     /**
      * Test for initialising field and data controllers
-     * @covers \customfield\field_controller::create
+     * @covers \core_customfield\field_controller::create
      */
     public function test_initialise(): void {
         $f = field_controller::create($this->cfields[1]->get('id'));

diff --git a/customfield/field/textregex/version.php b/customfield/field/textregex/version.php
@@ -26,8 +26,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'customfield_textregex';
-$plugin->version   = 2024053100;
+$plugin->version   = 2024101400;
 $plugin->requires  = 2021051718;
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '1.0.3';
-$plugin->supported = [311, 404];
+$plugin->release = '1.0.4';
+$plugin->supported = [311, 405];
diff --git a/filter/filtercodes/CHANGELOG.md b/filter/filtercodes/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.6.1] 2024-10-11
+### Update
+- Fix-308: Fixed compatibility issue with PHP 8.3.
+
 ## [2.6.0] 2024-10-07
 ### Added
 - New {menulanguages} tag.

diff --git a/filter/filtercodes/classes/text_filter.php b/filter/filtercodes/classes/text_filter.php
@@ -1581,6 +1581,7 @@ public function filter($text, array $options = []) {
         static $profiledata;
         static $mygroupslist;
         static $mygroupingslist;
+        static $mycohorts;
 
         $replace = []; // Array of key/value filterobjects.
 
@@ -4281,7 +4282,6 @@ function ($matches) use ($USER) {
             // Parameters: id name or id number of the cohort.
             // Requires content between tags.
             if (stripos($text, '{ifincohort ') !== false) {
-                static $mycohorts;
                 if (empty($mycohorts)) { // Cache list of cohorts.
                     require_once($CFG->dirroot . '/cohort/lib.php');
                     $mycohorts = cohort_get_user_cohorts($USER->id);
@@ -4308,7 +4308,6 @@ function ($matches) use ($mycohorts) {
             // Parameters: id name or id number of the cohort.
             // Requires content between tags.
             if (stripos($text, '{ifnotincohort ') !== false) {
-                static $mycohorts;
                 if (empty($mycohorts)) { // Cache list of cohorts.
                     require_once($CFG->dirroot . '/cohort/lib.php');
                     $mycohorts = cohort_get_user_cohorts($USER->id);

diff --git a/filter/filtercodes/version.php b/filter/filtercodes/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024100700;            // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2024100701;            // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2014051200;            // Requires Moodle version 2.7 or later.
 $plugin->component = 'filter_filtercodes';  // Full name of the plugin (used for diagnostics).
-$plugin->release   = '2.6.0';
+$plugin->release   = '2.6.1';
 $plugin->maturity  = MATURITY_STABLE;
diff --git a/local/shopping_cart/CHANGES.md b/local/shopping_cart/CHANGES.md
@@ -1,3 +1,11 @@
+## Version 0.9.35 (2024101702)
+* Bugfix: Function to check for rebookings not breaking checkout
+* Bugfix: Correctly trigger item_notbought event
+
+## Version 0.9.34 (2024101700)
+* Improvement: Disable rebooking without new item and display modal about checkout failures
+* Improvement: New phpunit test class to test credits
+
 ## Version 0.9.33 (2024100700)
 * Improvement: Server callback verify_purchase improvement, triggers now transaction_complete
 * Bugfix: User Serverside callback only for checking, not actual verification

diff --git a/local/shopping_cart/amd/build/cashier.min.js b/local/shopping_cart/amd/build/cashier.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     //
     // You should have received a copy of the GNU General Public License
     // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
     /**
      * Privacy Subsystem implementation for 'customfield_textregex'.
      *
@@ Expand Down @@