added laravel 9 support (#1297)

* added laravel 9 support * added exclude directives to matrix * fixed matrix * Update composer.json * Update run-integration-tests.yml * Update CHANGELOG.md Co-authored-by: Ricardo Čerljenko <[email protected]> Co-authored-by: Barry vd. Heuvel <[email protected]>
barryvdh · Jan 13, 2022 · de64d66 · de64d66
1 parent 93d9873
commit de64d66
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           coverage: none
 
       - name: Install dependencies

diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml
@@ -77,6 +77,11 @@ jobs:
             matrix:
                 php: [8.1, 8.0, 7.4, 7.3]
                 laravel: [8.*]
+                exclude:
+                  - php: 7.4
+                    laravel: 9.*
+                  - php: 7.3
+                    laravel: 9.*
         name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
         steps:
             - name: Checkout code

diff --git a/.github/workflows/run-static-analysis.yml b/.github/workflows/run-static-analysis.yml
@@ -17,7 +17,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                php-version: 7.4
+                php-version: 8.0
                 coverage: none
                 extensions: pdo_sqlite
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -21,11 +21,15 @@ jobs:
       matrix:
         os: [ubuntu-20.04, windows-2019]
         php: [8.1, 8.0, 7.4, 7.3]
-        laravel: [8.*]
+        laravel: [8.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.0
             dependency-version: prefer-lowest
+          - php: 7.4
+            laravel: 9.*
+          - php: 7.3
+            laravel: 9.*
           - os: windows-2019
             php: 7.4
           - os: windows-2019

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 --------------
 ### Added
 - Add support for custom casts that using `Castable` [#1287 / binotaliu](https://github.com/barryvdh/laravel-ide-helper/pull/1287)
+- Added Laravel 9 support [#1297 / rcerljenko](https://github.com/barryvdh/laravel-ide-helper/pull/1297)
 
 2022-01-03, 2.11.0
 ------------------

diff --git a/composer.json b/composer.json
@@ -25,25 +25,25 @@
         "barryvdh/reflection-docblock": "^2.0.6",
         "composer/composer": "^1.10.23 || ^2.1.9",
         "doctrine/dbal": "^2.6 || ^3",
-        "illuminate/console": "^8",
-        "illuminate/filesystem": "^8",
-        "illuminate/support": "^8",
+        "illuminate/console": "^8|^9",
+        "illuminate/filesystem": "^8|^9",
+        "illuminate/support": "^8|^9",
         "nikic/php-parser": "^4.7",
         "phpdocumentor/type-resolver": "^1.1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "friendsofphp/php-cs-fixer": "^2",
-        "illuminate/config": "^8",
-        "illuminate/view": "^8",
+        "illuminate/config": "^8|^9",
+        "illuminate/view": "^8|^9",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^6",
+        "orchestra/testbench": "^6|^7",
         "phpunit/phpunit": "^8.5 || ^9",
         "spatie/phpunit-snapshot-assertions": "^3 || ^4",
         "vimeo/psalm": "^3.12"
     },
     "suggest": {
-        "illuminate/events": "Required for automatic helper generation (^6|^7|^8)."
+        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)."
     },
     "config": {
         "sort-packages": true