From 20b3b67c2c8b6274a2f63b81f813a3b62e7abfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20=C4=8Cerljenko?= Date: Thu, 13 Jan 2022 15:38:59 +0100 Subject: [PATCH] added laravel 9 support (#1297) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Co-authored-by: Barry vd. Heuvel --- .github/workflows/fix-code-style.yml | 2 +- .github/workflows/run-integration-tests.yml | 5 +++++ .github/workflows/run-static-analysis.yml | 2 +- .github/workflows/run-tests.yml | 6 +++++- CHANGELOG.md | 1 + composer.json | 14 +++++++------- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml index e9f45bd0f..ef1909e55 100644 --- 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 index 99d77ca75..463f4366e 100644 --- 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 index 3c7ced32a..433c4a67d 100644 --- 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 index 035528841..d0648b1ce 100644 --- 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 index 52bfb3ab7..780da2bfb 100644 --- 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 index 77ea124da..2dd8d3925 100644 --- 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