diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d7a6ce13..c541b6c39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: fail-fast: true matrix: stack: [blade, react, vue, api] - laravel: [9, 10] + laravel: [10] args: ["", --pest] include: - stack: vue diff --git a/composer.json b/composer.json index 8da4a27ff..045d61567 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,11 @@ } ], "require": { - "php": "^8.0.2", - "illuminate/console": "^9.21|^10.0", - "illuminate/filesystem": "^9.21|^10.0", - "illuminate/support": "^9.21|^10.0", - "illuminate/validation": "^9.21|^10.0" - }, - "conflict": { - "laravel/framework": "<9.37.0" + "php": "^8.1.0", + "illuminate/console": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/support": "^10.0", + "illuminate/validation": "^10.0" }, "autoload": { "psr-4": { diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 793e9ff9b..328f37630 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -107,9 +107,9 @@ protected function installTests() $stubStack = $this->argument('stack') === 'api' ? 'api' : 'default'; if ($this->option('pest')) { - $this->removeComposerPackages(['nunomaduro/collision', 'phpunit/phpunit'], true); + $this->removeComposerPackages(['phpunit/phpunit'], true); - if (! $this->requireComposerPackages(['nunomaduro/collision:^6.4', 'pestphp/pest:^1.22', 'pestphp/pest-plugin-laravel:^1.2'], true)) { + if (! $this->requireComposerPackages(['pestphp/pest:^2.0', 'pestphp/pest-plugin-laravel:^2.0'], true)) { return false; } diff --git a/stubs/default/pest-tests/Feature/ExampleTest.php b/stubs/default/pest-tests/Feature/ExampleTest.php index b46239fd0..8b5843f49 100644 --- a/stubs/default/pest-tests/Feature/ExampleTest.php +++ b/stubs/default/pest-tests/Feature/ExampleTest.php @@ -1,6 +1,6 @@ get('/'); $response->assertStatus(200); diff --git a/stubs/default/pest-tests/Unit/ExampleTest.php b/stubs/default/pest-tests/Unit/ExampleTest.php index 61cd84c32..44a4f337a 100644 --- a/stubs/default/pest-tests/Unit/ExampleTest.php +++ b/stubs/default/pest-tests/Unit/ExampleTest.php @@ -1,5 +1,5 @@ toBeTrue(); });