From 3ba3feb3bbabaae12cae369ab03f59f74bc8368e Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Wed, 10 Jul 2024 19:49:31 +0200 Subject: [PATCH 1/4] add support to laravel 11 --- .github/workflows/analyse.yml | 2 +- .github/workflows/style.yml | 2 +- .github/workflows/tests.yml | 2 +- composer.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index cb9e5c6..ca56ea4 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -17,7 +17,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 - name: Get Composer Cache Directory id: composer-cache diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 40de50e..2b2d3b9 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -15,7 +15,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 - name: Get Composer Cache Directory id: composer-cache diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 61984b7..873106d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2'] + php-versions: ['8.1', '8.2', '8.3'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 0f910b6..6018e28 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "php": "^8.1", - "laravel/framework": "^10.0", + "laravel/framework": "^10.0|^11.0", "laravel/sanctum": "^3.3" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^8.10", + "orchestra/testbench": "^8.10|^9.0", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^9.3" }, From 7c19dca5156d4991b4474bee3609cc401b605f3c Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Wed, 10 Jul 2024 19:55:33 +0200 Subject: [PATCH 2/4] remove support to php8.1 --- .github/workflows/tests.yml | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 873106d..6fc3722 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.2', '8.3'] steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 6018e28..e81e46c 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,9 @@ } ], "require": { - "php": "^8.1", + "php": "^8.2", "laravel/framework": "^10.0|^11.0", - "laravel/sanctum": "^3.3" + "laravel/sanctum": "^3.3|^4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", From b04da90499fe9ea2324101ebc35136c4000f5fa8 Mon Sep 17 00:00:00 2001 From: Cesar Date: Wed, 10 Jul 2024 20:07:16 +0200 Subject: [PATCH 3/4] test matrix laravel --- .github/workflows/tests.yml | 18 +++++++++++++----- composer.json | 2 +- tests/TestCase.php | 2 ++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6fc3722..5c6f22f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,15 @@ jobs: strategy: matrix: - php-versions: ['8.2', '8.3'] + php: ['8.2', '8.3'] + laravel: ['10.*', '11.*'] + include: + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + + name: P${{ matrix.php }} - L${{ matrix.laravel }} steps: - uses: actions/checkout@v2 @@ -39,15 +47,15 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-composer-${{ matrix.php-versions }} + ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }} - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' run: | - composer install - composer dump + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --prefer-stable --prefer-dist --no-interact - name: Run test phpunit run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index e81e46c..1235cca 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "nunomaduro/larastan": "^2.0", "orchestra/testbench": "^8.10|^9.0", "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.3|^10.5" }, "autoload": { "psr-4": { diff --git a/tests/TestCase.php b/tests/TestCase.php index 8ba26a9..8def87d 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -53,5 +53,7 @@ protected function getEnvironmentSetUp($app) ]); $app['config']->set('auth.providers.users.model', User::class); + + $app['config']->set('session.driver', 'array'); } } From 4989ca00403dc29fd685f3bef825c2af6c4ef892 Mon Sep 17 00:00:00 2001 From: Cesar Date: Wed, 10 Jul 2024 20:08:56 +0200 Subject: [PATCH 4/4] test matrix laravel --- .github/workflows/tests.yml | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c6f22f..348bd3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,7 +55,7 @@ jobs: if: steps.composer-cache.outputs.cache-hit != 'true' run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --prefer-stable --prefer-dist --no-interact + composer update --prefer-stable --prefer-dist - name: Run test phpunit run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 1235cca..65b8a53 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "php": "^8.2", - "laravel/framework": "^10.0|^11.0", - "laravel/sanctum": "^3.3|^4.0" + "laravel/framework": "10.*", + "laravel/sanctum": "^3.3|^4.0", + "orchestra/testbench": "8.*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^8.10|^9.0", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^9.3|^10.5" },