diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7d7b0d07f..e953030b6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,11 +16,8 @@ jobs: strategy: fail-fast: true matrix: - php: ['8.0', 8.1, 8.2] - laravel: [9, 10] - exclude: - - php: '8.0' - laravel: 10 + php: [8.1, 8.2] + laravel: [10] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index 9f12b5ee3..634e399a0 100644 --- a/composer.json +++ b/composer.json @@ -14,10 +14,10 @@ } ], "require": { - "php": "^8.0.2", + "php": "^8.1.0", "ext-json": "*", - "illuminate/console": "^9.21|^10.0", - "illuminate/support": "^9.21|^10.0", + "illuminate/console": "^10.0", + "illuminate/support": "^10.0", "jenssegers/agent": "^2.6", "laravel/fortify": "^1.15" }, @@ -26,13 +26,10 @@ "laravel/sanctum": "^3.0", "livewire/livewire": "^2.12", "mockery/mockery": "^1.0", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^8.0", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3" }, - "conflict": { - "laravel/framework": "<9.37.0" - }, "autoload": { "psr-4": { "Laravel\\Jetstream\\": "src/" diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index f3e204c88..5a88c4b55 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -101,9 +101,9 @@ public function handle() $stubs = $this->getTestStubsPath(); if ($this->option('pest')) { - $this->removeComposerDevPackages(['nunomaduro/collision', 'phpunit/phpunit']); + $this->removeComposerDevPackages(['phpunit/phpunit']); - if (! $this->requireComposerDevPackages(['nunomaduro/collision:^6.4', 'pestphp/pest:^1.22', 'pestphp/pest-plugin-laravel:^1.2'])) { + if (! $this->requireComposerDevPackages(['pestphp/pest:^2.0', 'pestphp/pest-plugin-laravel:^2.0'])) { return 1; } diff --git a/stubs/pest-tests/ExampleTest.php b/stubs/pest-tests/ExampleTest.php index b46239fd0..8b5843f49 100644 --- a/stubs/pest-tests/ExampleTest.php +++ b/stubs/pest-tests/ExampleTest.php @@ -1,6 +1,6 @@ get('/'); $response->assertStatus(200); diff --git a/stubs/pest-tests/ExampleUnitTest.php b/stubs/pest-tests/ExampleUnitTest.php index 61cd84c32..44a4f337a 100644 --- a/stubs/pest-tests/ExampleUnitTest.php +++ b/stubs/pest-tests/ExampleUnitTest.php @@ -1,5 +1,5 @@ toBeTrue(); });