Merge branch 'main' into MOODLE_4

brickfield · Dec 10, 2024 · 6f1c448 · 6f1c448
2 parents 5a9c870 + 18fe3e1
commit 6f1c448
Show file tree

Hide file tree

Showing 29 changed files with 670 additions and 235 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,14 +77,22 @@ jobs:
         include:
           - php: '8.3'
             moodle-branch: 'main'
+            moodle-app: 'true'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            moodle-app: 'true'
           - php: '8.3'
             moodle-branch: 'MOODLE_404_STABLE'
+            moodle-app: 'true'
           - php: '8.2'
             moodle-branch: 'MOODLE_403_STABLE'
+            moodle-app: 'true'
           - php: '8.2'
             moodle-branch: 'MOODLE_402_STABLE'
+            moodle-app: 'true'
           - php: '8.1'
             moodle-branch: 'MOODLE_401_STABLE'
+            moodle-app: 'true'
           - php: '8.0'
             moodle-branch: 'MOODLE_400_STABLE'
           - php: '8.0'
@@ -126,7 +134,7 @@ jobs:
         IGNORE_PATHS: 'ignore'
         IGNORE_NAMES: 'ignore_name.php'
         MUSTACHE_IGNORE_NAMES: 'broken.mustache'
-        MOODLE_APP: 'true'
+        MOODLE_APP: ${{ matrix.moodle-app }}
 
     - name: Run Integration tests
       env:
@@ -196,14 +204,22 @@ jobs:
           # Each supported PHP version once. That's enough.
           - php: '8.3'
             moodle-branch: 'main'
+            moodle-app: 'true'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            moodle-app: 'true'
           - php: '8.3'
             moodle-branch: 'MOODLE_404_STABLE'
+            moodle-app: 'true'
           - php: '8.2'
             moodle-branch: 'MOODLE_403_STABLE'
+            moodle-app: 'true'
           - php: '8.1'
             moodle-branch: 'MOODLE_402_STABLE'
+            moodle-app: 'true'
           - php: '8.0'
             moodle-branch: 'MOODLE_401_STABLE'
+            moodle-app: 'true'
           - php: '7.4'
             moodle-branch: 'MOODLE_400_STABLE'
 
@@ -245,7 +261,7 @@ jobs:
         IGNORE_PATHS: 'ignore'
         IGNORE_NAMES: 'ignore_name.php'
         MUSTACHE_IGNORE_NAMES: 'broken.mustache'
-        MOODLE_APP: 'true'
+        MOODLE_APP: ${{ matrix.moodle-app }}
 
     - name: Run Integration tests (PHAR)
       env:
@@ -294,7 +310,7 @@ jobs:
         coverage: none
 
     - name: Download base ${{ env.lowest_release }} PHAR artifact
-      uses: robinraju/release-downloader@v1.8
+      uses: robinraju/release-downloader@v1.10
       with:
         repository: moodlehq/moodle-plugin-ci
         tag: ${{ env.lowest_release }}

diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,7 @@ before_install:
     fi
 
 install:
-  - MOODLE_APP=true moodle-plugin-ci install -vvv
+  - moodle-plugin-ci install -vvv
 
 script:
   # This is basically "integration" testing.
@@ -91,10 +91,14 @@ jobs:
       if: env(MOODLE_BRANCH) IS present
     # Only main with highest supported PHP version.
     - php: 8.3
-      env: MOODLE_BRANCH=main
+      env:
+        - MOODLE_BRANCH=main
+        - MOODLE_APP=true
     # Last stable with highest supported PHP version.
     - php: 8.3
-      env: MOODLE_BRANCH=MOODLE_404_STABLE
+      env:
+        - MOODLE_BRANCH=MOODLE_405_STABLE
+        - MOODLE_APP=true
     # And older stable supported (with lowest supported PHP version).
     - php: 7.4
       env: MOODLE_BRANCH=MOODLE_39_STABLE
diff --git a/bin/moodle-plugin-ci b/bin/moodle-plugin-ci
@@ -45,7 +45,7 @@ if (file_exists(__DIR__ . '/../../../autoload.php')) {
 }
 
 // Current version. Keep it updated on releases.
-define('MOODLE_PLUGIN_CI_VERSION', '4.4.5');
+define('MOODLE_PLUGIN_CI_VERSION', '4.5.5');
 
 define('MOODLE_PLUGIN_CI_BOXED', '@is_boxed@');
 

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "brickfield/moodle-plugin-ci",
+  "name": "moodlehq/moodle-plugin-ci",
   "description": "Helps running Moodle plugins analysis checks and tests under various CI environments.",
   "keywords": ["moodle", "travis", "ci", "testing", "github", "actions"],
   "type": "project",
@@ -55,8 +55,8 @@
   ],
   "require": {
     "php": ">=7.4",
-    "moodlehq/moodle-cs": "^3.4.6",
-    "moodlehq/moodle-local_ci": "^1.0.29",
+    "moodlehq/moodle-cs": "^3.4.10",
+    "moodlehq/moodle-local_ci": "^1.0.31",
     "moodlehq/moodle-local_moodlecheck": "^1.3.2",
     "sebastian/phpcpd": "^6.0.3",
     "sebastian/version": "^3.0.2",
@@ -73,13 +73,13 @@
     "psr/log": "^1.1.4",
     "nikic/php-parser": "^4.14",
     "marcj/topsort": "^2.0.0",
-    "phpcompatibility/php-compatibility": "dev-develop#e5cd2e24",
+    "phpcompatibility/php-compatibility": "dev-develop#96072c30",
     "laravel-zero/phar-updater": "^1.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6",
     "mockery/mockery": "^1.5.0",
-    "friendsofphp/php-cs-fixer": "^3.52.1",
+    "friendsofphp/php-cs-fixer": "^3.59.3",
     "vimeo/psalm": "5.19.*"
   },
   "config": {