diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml index 9a2fc97..b7dba34 100644 --- a/.github/workflows/composer-normalize.yml +++ b/.github/workflows/composer-normalize.yml @@ -9,7 +9,7 @@ on: jobs: normalize: timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Git checkout uses: actions/checkout@v4 diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml index 80e7639..da75524 100644 --- a/.github/workflows/fix-code-style.yml +++ b/.github/workflows/fix-code-style.yml @@ -7,7 +7,7 @@ jobs: fix-style: name: Fix Code Style timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: COMPOSER_NO_INTERACTION: 1 diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index a3a4eff..ed33366 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -12,7 +12,7 @@ on: jobs: php-laravel-integration-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 15 env: COMPOSER_NO_INTERACTION: 1 diff --git a/.github/workflows/run-static-analysis.yml b/.github/workflows/run-static-analysis.yml index e31f00c..2c9ea0d 100644 --- a/.github/workflows/run-static-analysis.yml +++ b/.github/workflows/run-static-analysis.yml @@ -9,7 +9,7 @@ on: jobs: build: timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 43176ee..9aa055f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,11 +20,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019] + os: [ubuntu-22.04, windows-2019] php: [8.3, 8.2, 8.1] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] - dependency-version: [prefer-lowest, prefer-stable] exclude: - php: 8.1 laravel: 11.* diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c90a7..fe6fa3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,17 @@ All notable changes to this project will be documented in this file. ### Fixed -### Changed -- Use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) - With this functionality gone, a few changes have been made: -- support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent -- You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise - ### Added - Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520) +### Removed +- Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) + With this functionality gone, a few changes have been made: + - support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent + - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise + - Minimum PHP version, due to Laravel 10, is now PHP 8.1 + + 2024-02-15, 2.15.1 ------------------ diff --git a/composer.json b/composer.json index a38b986..3ff3f21 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "barryvdh/reflection-docblock": "^2.1.1", "composer/class-map-generator": "^1.0", @@ -38,7 +38,7 @@ "illuminate/view": "^9 || ^10 || ^11", "mockery/mockery": "^1.4", "orchestra/testbench": "^8 || ^9", - "phpunit/phpunit": "^9 || ^10.5", + "phpunit/phpunit": "^10.5", "spatie/phpunit-snapshot-assertions": "^4 || ^5", "vimeo/psalm": "^5.4" }, diff --git a/tests/Console/ModelsCommand/AdvancedCasts/Test.php b/tests/Console/ModelsCommand/AdvancedCasts/Test.php index 7856703..7e46e26 100644 --- a/tests/Console/ModelsCommand/AdvancedCasts/Test.php +++ b/tests/Console/ModelsCommand/AdvancedCasts/Test.php @@ -6,18 +6,11 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts; use Barryvdh\LaravelIdeHelper\Console\ModelsCommand; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand; -use Illuminate\Foundation\Application; class Test extends AbstractModelsCommand { public function test(): void { - if (!version_compare(Application::VERSION, '8.28', '>=')) { - $this->markTestSkipped( - 'This test only works in Laravel >= 8.28' - ); - } - $command = $this->app->make(ModelsCommand::class); $tester = $this->runCommand($command, [ diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php index 0eb640d..bb3821e 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php @@ -11,12 +11,6 @@ class Test extends AbstractModelsCommand { public function test(): void { - if (!version_compare(PHP_VERSION, '8.1', '>=')) { - $this->markTestSkipped( - 'This test only works in PHP >= 8.1' - ); - } - $command = $this->app->make(ModelsCommand::class); $tester = $this->runCommand($command, [