diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b662705..74e772c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,9 +2,15 @@ name: run-tests on: push: - branches: [main] + branches: + - main + - 1.x + - 2.x pull_request: - branches: [main] + branches: + - main + - 1.x + - 2.x jobs: test: @@ -13,17 +19,21 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.2] - laravel: [9.*, 10.*] + php: [8.1, 8.2, 8.3] + laravel: [10.*, 11.*, 12.*] stability: [prefer-lowest, prefer-stable] include: - - laravel: 9.* - testbench: 7.* - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* + - laravel: 12.* + testbench: 10.* exclude: - - laravel: 9.* - php: 8.2 + - laravel: 11.* + php: 8.1 + - laravel: 12.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 59e3099..79a0117 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ "require": { "php": "^8.1", "spatie/laravel-package-tools": "^1.13.0", - "illuminate/contracts": "^9.0|^10.0" + "illuminate/contracts": "^9.0|^10.0|^11.0|^12.0" }, "require-dev": { "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0|^7.0", - "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0|^8.0", - "pestphp/pest": "^1.21", - "pestphp/pest-plugin-laravel": "^1.1", + "nunomaduro/collision": "^6.0|^7.0|^8.0", + "nunomaduro/larastan": "^2.0.1|^3.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^9.5|^10.0|^11.0", + "pestphp/pest": "^1.21|^2.0|^3.7", + "pestphp/pest-plugin-arch": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5|^10.0" + "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", + "phpstan/phpstan-phpunit": "^1.0|^2.0" }, "autoload": { "psr-4": { @@ -68,4 +68,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} diff --git a/config/laravel_ticket.php b/config/laravel_ticket.php index bb1c898..2c2dfc8 100644 --- a/config/laravel_ticket.php +++ b/config/laravel_ticket.php @@ -81,5 +81,5 @@ 'message' => \Coderflex\LaravelTicket\Models\Message::class, 'category' => \Coderflex\LaravelTicket\Models\Category::class, 'label' => \Coderflex\LaravelTicket\Models\Label::class, - ] + ], ]; diff --git a/tests/Database/Migrations/create_users_table.php b/tests/Database/Migrations/create_users_table.php index 57f0097..d52f72d 100644 --- a/tests/Database/Migrations/create_users_table.php +++ b/tests/Database/Migrations/create_users_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class() extends Migration +return new class extends Migration { public function up() {