Fix: Matrix

Author: localheinz

.github/settings.yml

@@ -25,40 +25,32 @@ branches:
           - context: "Tests (7.4, 8.5.19, locked)"
           - context: "Tests (7.4, 8.5.19, lowest)"
           - context: "Tests (7.4, 9.0.0, highest)"
-          - context: "Tests (7.4, 9.0.0, locked)"
           - context: "Tests (7.4, 9.0.0, lowest)"
           - context: "Tests (8.0, 8.5.19, highest)"
           - context: "Tests (8.0, 8.5.19, locked)"
           - context: "Tests (8.0, 8.5.19, lowest)"
           - context: "Tests (8.0, 9.0.0, highest)"
-          - context: "Tests (8.0, 9.0.0, locked)"
           - context: "Tests (8.0, 9.0.0, lowest)"
           - context: "Tests (8.1, 10.0.0, highest)"
-          - context: "Tests (8.1, 10.0.0, locked)"
           - context: "Tests (8.1, 10.0.0, lowest)"
           - context: "Tests (8.1, 8.5.19, highest)"
           - context: "Tests (8.1, 8.5.19, locked)"
           - context: "Tests (8.1, 8.5.19, lowest)"
           - context: "Tests (8.1, 9.0.0, highest)"
-          - context: "Tests (8.1, 9.0.0, locked)"
           - context: "Tests (8.1, 9.0.0, lowest)"
           - context: "Tests (8.2, 10.0.0, highest)"
-          - context: "Tests (8.2, 10.0.0, locked)"
           - context: "Tests (8.2, 10.0.0, lowest)"
           - context: "Tests (8.2, 8.5.19, highest)"
           - context: "Tests (8.2, 8.5.19, locked)"
           - context: "Tests (8.2, 8.5.19, lowest)"
           - context: "Tests (8.2, 9.0.0, highest)"
-          - context: "Tests (8.2, 9.0.0, locked)"
           - context: "Tests (8.2, 9.0.0, lowest)"
           - context: "Tests (8.3, 10.0.0, highest)"
-          - context: "Tests (8.3, 10.0.0, locked)"
           - context: "Tests (8.3, 10.0.0, lowest)"
           - context: "Tests (8.3, 8.5.19, highest)"
           - context: "Tests (8.3, 8.5.19, locked)"
           - context: "Tests (8.3, 8.5.19, lowest)"
           - context: "Tests (8.3, 9.0.0, highest)"
-          - context: "Tests (8.3, 9.0.0, locked)"
           - context: "Tests (8.3, 9.0.0, lowest)"
         strict: false
       restrictions:

.github/workflows/integrate.yaml

@@ -466,45 +466,72 @@ jobs:
 
         phpunit-version:
           - "8.5.19"
-          - "9.0.0"
 
         dependencies:
           - "lowest"
           - "locked"
           - "highest"
 
         include:
+          - php-version: "7.4"
+            phpunit-version: "9.0.0"
+            dependencies: "lowest"
+
+          - php-version: "7.4"
+            phpunit-version: "9.0.0"
+            dependencies: "highest"
+
+          - php-version: "8.0"
+            phpunit-version: "9.0.0"
+            dependencies: "lowest"
+
+          - php-version: "8.0"
+            phpunit-version: "9.0.0"
+            dependencies: "highest"
+
           - php-version: "8.1"
-            phpunit-version: "10.0.0"
+            phpunit-version: "9.0.0"
             dependencies: "lowest"
 
+          - php-version: "8.1"
+            phpunit-version: "9.0.0"
+            dependencies: "highest"
+
           - php-version: "8.1"
             phpunit-version: "10.0.0"
-            dependencies: "locked"
+            dependencies: "lowest"
 
           - php-version: "8.1"
             phpunit-version: "10.0.0"
             dependencies: "highest"
 
           - php-version: "8.2"
-            phpunit-version: "10.0.0"
+            phpunit-version: "9.0.0"
             dependencies: "lowest"
 
+          - php-version: "8.2"
+            phpunit-version: "9.0.0"
+            dependencies: "highest"
+
           - php-version: "8.2"
             phpunit-version: "10.0.0"
-            dependencies: "locked"
+            dependencies: "lowest"
 
           - php-version: "8.2"
             phpunit-version: "10.0.0"
             dependencies: "highest"
 
           - php-version: "8.3"
-            phpunit-version: "10.0.0"
+            phpunit-version: "9.0.0"
             dependencies: "lowest"
 
+          - php-version: "8.3"
+            phpunit-version: "9.0.0"
+            dependencies: "highest"
+
           - php-version: "8.3"
             phpunit-version: "10.0.0"
-            dependencies: "locked"
+            dependencies: "lowest"
 
           - php-version: "8.3"
             phpunit-version: "10.0.0"
@@ -545,9 +572,11 @@ jobs:
         run: "composer config platform.php --ansi --unset"
 
       - name: "Remove incompatible dependencies with composer"
+        if: "matrix.dependencies != 'locked'"
         run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"
 
       - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
+        if: "matrix.dependencies != 'locked'"
         run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
 
       - name: "Install ${{ matrix.dependencies }} dependencies with composer"