Refactor

Author: bilfeldt

.github/workflows/run-tests.yml

@@ -16,9 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.5, 8.4, 8.3, 8.2, 8.1]
-        laravel: [12.*, 11.*, 10.*]
-        stability: [prefer-stable]
+        php: [8.1, 8.2, 8.3, 8.4, 8.5]
+        laravel: ['10.*', '11.*', '12.*']
+        dependency-version: [prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
@@ -27,12 +27,16 @@ jobs:
           - laravel: 12.*
             testbench: 10.*
         exclude:
+          - laravel: 10.*
+            php: 8.5
           - laravel: 11.*
             php: 8.1
+          - laravel: 11.*
+            php: 8.5
           - laravel: 12.*
             php: 8.1
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -42,9 +46,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: >
-            dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite,
-            bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
       - name: Setup problem matchers
@@ -55,7 +57,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
         run: composer run-script test

composer.json

@@ -21,11 +21,11 @@
         }
     ],
     "require": {
-        "php": "^8.1 || ^8.2 || ^8.3 || ^8.4 || ^8.5",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "illuminate/contracts": "^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^7.12 || ^8.0",
+        "nunomaduro/collision": "^7.8 || ^8.0",
         "orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
         "phpunit/phpunit": "^10.0 || ^11.0"
     },