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..348bd3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,15 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2'] + 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 - name: Run test phpunit run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 0f910b6..65b8a53 100644 --- a/composer.json +++ b/composer.json @@ -10,16 +10,16 @@ } ], "require": { - "php": "^8.1", - "laravel/framework": "^10.0", - "laravel/sanctum": "^3.3" + "php": "^8.2", + "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", "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'); } }