Merge pull request #367 from alies-dev/no-laravel9

Drop Laravel 9 support
psalm · Mar 12, 2024 · 20d0530 · 20d0530
2 parents 8c2f46b + 2bdcf3a
commit 20d0530
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 85 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,13 +52,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.0]
-        laravel: [^11.0, ^10.0, ^9.0]
+        php: [8.3, 8.2, 8.1]
+        laravel: [^11.0, ^10.0]
         dependencies: [lowest, highest]
         exclude:
-          - php: 8.0
-            laravel: ^10.0
-          - php: 8.0
+          - php: 8.1
             laravel: ^11.0
     name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
     steps:

diff --git a/composer.json b/composer.json
@@ -11,20 +11,20 @@
     ],
     "homepage": "https://github.com/psalm/psalm-plugin-laravel",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
         "ext-simplexml": "*",
         "barryvdh/laravel-ide-helper": "^2.13 || ^3.0",
-        "illuminate/config": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/container": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/contracts": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/database": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/events": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/http": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/routing": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/support": "^9.52.16 || ^10.48 || ^11.0",
-        "illuminate/view": "^9.52.16 || ^10.48 || ^11.0",
+        "illuminate/config": "^10.48 || ^11.0",
+        "illuminate/container": "^10.48 || ^11.0",
+        "illuminate/contracts": "^10.48 || ^11.0",
+        "illuminate/database": "^10.48 || ^11.0",
+        "illuminate/events": "^10.48 || ^11.0",
+        "illuminate/http": "^10.48 || ^11.0",
+        "illuminate/routing": "^10.48 || ^11.0",
+        "illuminate/support": "^10.48 || ^11.0",
+        "illuminate/view": "^10.48 || ^11.0",
         "nikic/php-parser": "^4.18 || ^5.0",
-        "orchestra/testbench": "^7.40 || ^8.21 || ^9.0",
+        "orchestra/testbench": "^8.21 || ^9.0",
         "symfony/console": "^6.0 || ^7.0",
         "vimeo/psalm": "^5.20"
     },

diff --git a/stubs/9/DBFacade.stubphp b/stubs/9/DBFacade.stubphp
diff --git a/stubs/9/Foundation/helpers.stubphp b/stubs/9/Foundation/helpers.stubphp
diff --git a/stubs/legacy-factories/helpers.stubphp b/stubs/legacy-factories/helpers.stubphp
@@ -1,6 +1,6 @@
 <?php
 /**
- * Support old syntax of test factories (still used by some Laravel 9 projects using a composer package).
+ * Support old syntax of test factories (still used by some Laravel 9+ projects using a composer package).
  * Stubs for {@see https://github.com/laravel/legacy-factories/blob/master/helpers.php}
  */
 

diff --git a/tests/Acceptance/acceptance/DBFacadeAlias.feature b/tests/Acceptance/acceptance/DBFacadeAlias.feature
@@ -16,23 +16,7 @@ Feature: DB facade alias
       </psalm>
       """
 
-  Scenario: call the DB facade alias [ Laravel 9 ]
-    Given I have the "laravel/framework" package satisfying the "^9.0"
-    And I have the following code
-    """
-    <?php declare(strict_types=1);
-
-    namespace Tests\Psalm\LaravelPlugin\Sandbox;
-
-    function test_db_raw(): \Illuminate\Database\Query\Expression {
-      return \DB::raw(1);
-    }
-    """
-    When I run Psalm
-    Then I see no errors
-
-  Scenario: call the DB facade alias [ Laravel 10 ]
-    Given I have the "laravel/framework" package satisfying the "^10.0"
+  Scenario: call the DB facade alias
     And I have the following code
     """
     <?php declare(strict_types=1);

diff --git a/tests/Acceptance/acceptance/EloquentBuilderTypes.feature b/tests/Acceptance/acceptance/EloquentBuilderTypes.feature
@@ -155,29 +155,6 @@ Feature: Eloquent Builder types
     When I run Psalm
     Then I see no errors
 
-  Scenario: can call firstOrNew and firstOrCreate without parameters in [ Laravel 9 ]
-    Given I have the "laravel/framework" package satisfying the "^9.0"
-    And I have the following code
-    """
-    /**
-    * @psalm-param Builder<User> $builder
-    * @psalm-return Builder<User>|User
-    */
-    function test_firstOrCreate(Builder $builder): Builder|User {
-      return $builder->firstOrCreate();
-    }
-
-    /**
-    * @psalm-param Builder<User> $builder
-    * @psalm-return Builder<User>|User
-    */
-    function test_firstOrNew(Builder $builder): Builder|User {
-      return $builder->firstOrNew();
-    }
-    """
-    When I run Psalm
-    Then I see no errors
-
   Scenario: can call whereDate with \DateTimeInterface|string|null
     Given I have the following code
     """