From 96247016b9787ad8d47a8b24b2185f17a835f676 Mon Sep 17 00:00:00 2001 From: Wendell Adriel Date: Wed, 13 Mar 2024 13:00:29 +0000 Subject: [PATCH 1/5] Laravel 11 support --- .github/workflows/tests.yml | 75 +++++++++++++++----------- README.md | 2 +- composer.json | 18 +++---- src/Console/Commands/LiftMigration.php | 2 +- 4 files changed, 55 insertions(+), 42 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c734a3d..83d1770 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,34 +3,47 @@ name: run-tests on: [push, pull_request] jobs: - test: - runs-on: ubuntu-latest - strategy: - matrix: - php: [8.2, 8.1] - dependency-version: [prefer-lowest, prefer-stable] - - name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Install dependencies - run: | - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - - - name: Code Style ๐Ÿ‘จโ€๐Ÿญ - run: composer test:lint - - - name: Pest Tests ๐Ÿงซ - run: composer test:unit - - - name: PHPStan ๐Ÿงช - run: composer test:static + test: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + php: [8.3, 8.2, 8.1] + laravel: [9.*, 10.*, 11.*] + dependency-version: [prefer-stable] + include: + - laravel: 9.* + testbench: 7.* + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 + + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + coverage: none + + - name: Install dependencies + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.62.1" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + + - name: Code Style ๐Ÿ‘จโ€๐Ÿญ + run: composer test:lint + + - name: Pest Tests ๐Ÿงซ + run: composer test:unit + + - name: PHPStan ๐Ÿงช + run: composer test:static diff --git a/README.md b/README.md index 6107c22..9c8e1b9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

Packagist PHP from Packagist - Laravel Version + Laravel Version GitHub Workflow Status (main)

diff --git a/composer.json b/composer.json index e93f786..b4bbeff 100644 --- a/composer.json +++ b/composer.json @@ -33,17 +33,17 @@ ], "require": { "php": "^8.1", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", - "illuminate/validation": "^9.0|^10.0" + "illuminate/database": "^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0", + "illuminate/validation": "^9.0|^10.0|^11.0" }, "require-dev": { - "pestphp/pest": "^2.15", - "laravel/pint": "^1.11", - "phpstan/phpstan": "^1.10", - "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^8.9", - "pestphp/pest-plugin-faker": "^2.0" + "larastan/larastan": "^2.0", + "laravel/pint": "^1.14", + "orchestra/testbench": "^7.0|^8.0|^9.0", + "pestphp/pest": "^1.20|^2.0", + "pestphp/pest-plugin-faker": "^1.0|^2.0", + "phpstan/phpstan": "^1.10" }, "scripts": { "lint": "pint", diff --git a/src/Console/Commands/LiftMigration.php b/src/Console/Commands/LiftMigration.php index 4138870..8dca4cc 100644 --- a/src/Console/Commands/LiftMigration.php +++ b/src/Console/Commands/LiftMigration.php @@ -24,7 +24,7 @@ final class LiftMigration extends Command protected $signature = 'lift:migration {model} {--namespace=App\\Models\\}'; - protected static $defaultName = 'lift:migration'; + protected static string $defaultName = 'lift:migration'; protected $description = 'Create migration files based on Lift models'; From 9dc7f270e6bfb4e106ee0689b1114ea7fd498a21 Mon Sep 17 00:00:00 2001 From: Wendell Adriel Date: Wed, 13 Mar 2024 13:03:41 +0000 Subject: [PATCH 2/5] Update dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b4bbeff..5b16699 100644 --- a/composer.json +++ b/composer.json @@ -41,8 +41,8 @@ "larastan/larastan": "^2.0", "laravel/pint": "^1.14", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.20|^2.0", - "pestphp/pest-plugin-faker": "^1.0|^2.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-faker": "^2.0", "phpstan/phpstan": "^1.10" }, "scripts": { From aff788f876cf35b70eca6b2c237c7bfd479fb89a Mon Sep 17 00:00:00 2001 From: Wendell Adriel Date: Wed, 13 Mar 2024 13:06:46 +0000 Subject: [PATCH 3/5] Drop Laravel 9 support --- .github/workflows/tests.yml | 4 +--- README.md | 2 +- composer.json | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 83d1770..5a163d6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,11 +9,9 @@ jobs: matrix: os: [ubuntu-latest] php: [8.3, 8.2, 8.1] - laravel: [9.*, 10.*, 11.*] + laravel: [10.*, 11.*] dependency-version: [prefer-stable] include: - - laravel: 9.* - testbench: 7.* - laravel: 10.* testbench: 8.* - laravel: 11.* diff --git a/README.md b/README.md index 9c8e1b9..9912499 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

Packagist PHP from Packagist - Laravel Version + Laravel Version GitHub Workflow Status (main)

diff --git a/composer.json b/composer.json index 5b16699..44f9aec 100644 --- a/composer.json +++ b/composer.json @@ -33,14 +33,14 @@ ], "require": { "php": "^8.1", - "illuminate/database": "^9.0|^10.0|^11.0", - "illuminate/support": "^9.0|^10.0|^11.0", - "illuminate/validation": "^9.0|^10.0|^11.0" + "illuminate/database": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", + "illuminate/validation": "^10.0|^11.0" }, "require-dev": { "larastan/larastan": "^2.0", "laravel/pint": "^1.14", - "orchestra/testbench": "^7.0|^8.0|^9.0", + "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-faker": "^2.0", "phpstan/phpstan": "^1.10" From d5cb259cf41eb317a075b67ccb1e026066eb2431 Mon Sep 17 00:00:00 2001 From: Wendell Adriel Date: Wed, 13 Mar 2024 13:08:31 +0000 Subject: [PATCH 4/5] Fix PHPStan issue --- src/Console/Commands/LiftMigration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/Commands/LiftMigration.php b/src/Console/Commands/LiftMigration.php index 8dca4cc..d9b763c 100644 --- a/src/Console/Commands/LiftMigration.php +++ b/src/Console/Commands/LiftMigration.php @@ -24,7 +24,7 @@ final class LiftMigration extends Command protected $signature = 'lift:migration {model} {--namespace=App\\Models\\}'; - protected static string $defaultName = 'lift:migration'; + protected static $defaultName = 'lift:migration'; // @phpstan-ignore-line protected $description = 'Create migration files based on Lift models'; From 2ad23349c300c4c844b81ccbb507c734c56fb541 Mon Sep 17 00:00:00 2001 From: Wendell Adriel Date: Wed, 13 Mar 2024 13:11:41 +0000 Subject: [PATCH 5/5] Remove defaultName --- src/Console/Commands/LiftMigration.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Console/Commands/LiftMigration.php b/src/Console/Commands/LiftMigration.php index d9b763c..128854e 100644 --- a/src/Console/Commands/LiftMigration.php +++ b/src/Console/Commands/LiftMigration.php @@ -24,8 +24,6 @@ final class LiftMigration extends Command protected $signature = 'lift:migration {model} {--namespace=App\\Models\\}'; - protected static $defaultName = 'lift:migration'; // @phpstan-ignore-line - protected $description = 'Create migration files based on Lift models'; public function handle(): int