Merge pull request #42 from laravel-shift/l12-compatibility

Laravel 12.x Compatibility
wotzebra · Mar 5, 2025 · 54af73d · 54af73d
2 parents d220610 + a0d87bb
commit 54af73d
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 58 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,68 +1,71 @@
 name: run-tests
 
 on:
-    push:
-    pull_request:
+  push:
+  pull_request:
 
 jobs:
-    run-tests:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                php: [8.1, 8.2, 8.3, 8.4]
-                laravel: [9.*, 10.*, 11.*]
-                dependency-version: [prefer-lowest, prefer-stable]
-                exclude:
-                    -   php: 8.4
-                        laravel: 11.*
-                        dependency-version: prefer-lowest
-                    -   php: 8.4
-                        laravel: 10.*
-                    -   php: 8.4
-                        laravel: 9.*
-                    -   php: 8.3
-                        laravel: 9.*
-                        dependency-version: prefer-lowest
-                    -   php: 8.2
-                        laravel: 9.*
-                        dependency-version: prefer-lowest
-                    -   php: 8.1
-                        laravel: 11.*
+  run-tests:
+    runs-on: ubuntu-latest
 
-        name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: ['9.*', '10.*', '11.*', '12.*']
+        dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.4
+            laravel: 11.*
+            dependency-version: prefer-lowest
+          - php: 8.4
+            laravel: 10.*
+          - php: 8.4
+            laravel: 9.*
+          - php: 8.3
+            laravel: 9.*
+            dependency-version: prefer-lowest
+          - php: 8.2
+            laravel: 9.*
+            dependency-version: prefer-lowest
+          - php: 8.1
+            laravel: 11.*
+          - laravel: 12.*
+            php: 8.1
 
-        steps:
-            -   name: Update apt
-                run: sudo apt-get update --fix-missing
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
-            -   name: Checkout code
-                uses: actions/checkout@v3
+    steps:
+      - name: Update apt
+        run: sudo apt-get update --fix-missing
 
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    coverage: xdebug
-                    extensions: yaml
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-            - name: Get Composer cache cirectory
-              id: composer-cache
-              run: |
-                echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          extensions: yaml
 
-            - name: Cache Composer packages
-              uses: actions/cache@v3
-              with:
-                path: ${{ steps.composer-cache.outputs.dir }}
-                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-                restore-keys: |
-                  ${{ runner.os }}-composer-
+      - name: Get Composer cache cirectory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-            -   name: Install dependencies
-                run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
-                    composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+      - name: Cache Composer packages
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
 
-            -   name: Execute tests
-                run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "require": {
         "php": "^8.1|^8.2|^8.3|^8.4",
         "ext-json": "*",
-        "laravel/framework": "^9.0|^10.0|^11.0"
+        "laravel/framework": "^9.0|^10.0|^11.0|^12.0"
     },
     "suggest": {
         "ext-yaml": "*"
@@ -30,8 +30,8 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "guzzlehttp/guzzle": "^7.5",
         "jasonmccreary/laravel-test-assertions": "^2.3",
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
-        "phpunit/phpunit": "^9.5|^10.0",
+        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^9.5|^10.0|^11.5.3",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {