Merge branch 'master' into upgrade/phpstan

# Conflicts: # composer.json # phpstan-laravel-8.neon
ash-jc-allen · Jan 1, 2025 · 8700a92 · 8700a92
2 parents dad53b0 + 4f18e70
commit 8700a92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -10,10 +10,8 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.0, 8.1, 8.2, 8.3, 8.4]
-        laravel: [8.*, 9.*, 10.*, 11.*]
+        laravel: [9.*, 10.*, 11.*]
         include:
-          - laravel: 8.*
-            testbench: 6.*
           - laravel: 9.*
             testbench: 7.*
           - laravel: 10.*
@@ -27,12 +25,6 @@ jobs:
             php: 8.0
           - laravel: 11.*
             php: 8.1
-          - laravel: 10.*
-            php: 8.4
-          - laravel: 9.*
-            php: 8.4
-          - laravel: 8.*
-            php: 8.4
 
     name: PHP${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -59,9 +51,5 @@ jobs:
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --prefer-dist --no-interaction --no-suggest
 
-      - name: Copy Laravel 8 Specific Files
-        if: matrix.laravel == '8.*'
-        run: cp phpstan-laravel-8.neon phpstan.neon
-
       - name: Run Larastan
         run: vendor/bin/phpstan analyse
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,29 +10,21 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.0, 8.1, 8.2, 8.3, 8.4]
-        laravel: [8.*, 9.*, 10.*, 11.*]
+        laravel: [9.*, 10.*, 11.*]
         include:
           - laravel: 11.*
             testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.*
         exclude:
           - laravel: 10.*
             php: 8.0
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
             php: 8.1
-          - laravel: 10.*
-            php: 8.4
-          - laravel: 9.*
-            php: 8.4
-          - laravel: 8.*
-            php: 8.4
 
     name: PHP${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

diff --git a/composer.json b/composer.json
@@ -20,16 +20,15 @@
     "php": "^8.0",
     "nesbot/carbon": "^2.0|^3.0",
     "guzzlehttp/guzzle": "^7.0",
-    "illuminate/container": "^8.0|^9.0|^10.0|^11.0",
-    "illuminate/cache": "^8.0|^9.0|^10.0|^11.0",
+    "illuminate/container": "^9.0|^10.0|^11.0",
+    "illuminate/cache": "^9.0|^10.0|^11.0",
     "ext-json": "*"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
-    "phpunit/phpunit": "^9.0|^10.5",
-    "larastan/larastan": "^1.0|^2.0|^3.0",
-    "phpstan/phpstan": "^1.12.14|^2.0"
+    "orchestra/testbench": "^7.0|^8.0|^9.0",
+    "phpunit/phpunit": "^9.0|^10.5|^11.0",
+    "larastan/larastan": "^1.0|^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpstan-laravel-8.neon b/phpstan-laravel-8.neon