diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 68fd176..d253332 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,11 +14,16 @@ jobs: matrix: os: [ubuntu-latest] php: [8.2, 8.1, 8.0] - laravel: [9.*] + laravel: [10.*, 9.*] stability: [prefer-lowest, prefer-stable] - include: + include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* + exclude: + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} diff --git a/README.md b/README.md index 508bee8..d9eefd9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ authentication, authorization, validation, views, etc. Kontour is there to provide enhancements and reusable elements for your admin area. -You need **Laravel 9** to use the latest version of this package. +You need at least **Laravel 9** to use the latest version of this package. ## Using Kontour in a Laravel app diff --git a/composer.json b/composer.json index c45583c..94b3ad3 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Admin area tool utilities for Laravel", "license": "MIT", "require": { - "laravel/framework": "^9.0", + "laravel/framework": "^9.0 || ^10.0", "laravel/ui": "^4.0" }, "require-dev": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0b48445..55f2306 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,7 @@ - - - - ./src - - + + - - ./tests - ./tests/Feature @@ -33,4 +13,9 @@ + + + ./src + + diff --git a/tests/IntegrationTestSetupTrait.php b/tests/IntegrationTestSetupTrait.php index 95d68f3..be30256 100644 --- a/tests/IntegrationTestSetupTrait.php +++ b/tests/IntegrationTestSetupTrait.php @@ -46,9 +46,11 @@ protected function getEnvironmentSetUp($app) 'driver' => 'eloquent', 'model' => User::class, ]); + + // Use the same password reset table as for the users $app['config']->set('auth.passwords.admins', [ 'provider' => 'admins', - 'table' => 'password_resets', + 'table' => $app['config']['auth']['passwords']['users']['table'], 'expire' => 60, ]); $app['config']->set('kontour.guard', 'admin');