Merge pull request #117 from mebis-lp/MBS-9798-Restore-compatibility-…

…with-php-7.4 MBS-9798: Restore compatibility with PHP 7.4
mebis-lp · Dec 16, 2024 · 6d1868c · 6d1868c
2 parents 1df5192 + b759107
commit 6d1868c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -43,28 +43,22 @@ jobs:
           - php: '8.2'
             moodle-branch: 'main'
             database: 'pgsql'
-          - php: '8.1'
-            moodle-branch: 'main'
-            database: 'mariadb'
-          - php: '8.1'
-            moodle-branch: 'main'
-            database: 'pgsql'
           - php: '8.3'
-            moodle-branch: 'MOODLE_404_STABLE'
+            moodle-branch: 'MOODLE_405_STABLE'
             database: 'mariadb'
           - php: '8.3'
-            moodle-branch: 'MOODLE_404_STABLE'
+            moodle-branch: 'MOODLE_405_STABLE'
             database: 'pgsql'
           - php: '8.3'
             moodle-branch: 'MOODLE_404_STABLE'
             database: 'mariadb'
           - php: '8.3'
             moodle-branch: 'MOODLE_404_STABLE'
             database: 'pgsql'
-          - php: '8.1'
+          - php: '7.4'
             moodle-branch: 'MOODLE_401_STABLE'
             database: 'mariadb'
-          - php: '8.1'
+          - php: '7.4'
             moodle-branch: 'MOODLE_401_STABLE'
             database: 'pgsql'
     steps:

diff --git a/classes/mapworker.php b/classes/mapworker.php
@@ -72,7 +72,13 @@ class mapworker {
      * @param bool $edit Whether the mapworker should prepare the map for edit mode (false by default)
      * @param int $group Group id to use (default 0 means no group)
      */
-    public function __construct(string $svgcode, array $placestore, \cm_info|null $cm = null, bool $edit = false, int $group = 0) {
+    public function __construct(
+        string $svgcode,
+        array $placestore,
+        \cm_info $cm = null, // phpcs:ignore
+        bool $edit = false,
+        int $group = 0
+    ) {
         global $USER;
         $svgcode = preg_replace(
             '/<text(.*)>(?!(<\!\[CDATA\[))(.*)<\/text>/',