[5.x] PHP 8.5 Compatibility

.github/workflows/tests.yml

@@ -16,8 +16,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4, 8.5]
         laravel: [11, 12]
+        exclude:
+          - php: 8.5
+            laravel: 11
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

composer.json

@@ -27,9 +27,8 @@
         "laravel/sanctum": "^4.0",
         "livewire/livewire": "^3.3",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^9.0|^10.0",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^11.0"
+        "orchestra/testbench": "^9.15|^10.8",
+        "phpstan/phpstan": "^1.10"
     },
     "autoload": {
         "psr-4": {
@@ -51,6 +50,9 @@
         }
     },
     "config": {
+        "audit": {
+            "block-insecure": false
+        },
         "sort-packages": true
     },
     "minimum-stability": "dev",

tests/AddTeamMemberTest.php

@@ -18,10 +18,10 @@ class AddTeamMemberTest extends OrchestraTestCase
 {
     use RefreshDatabase;
 
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
 
         Jetstream::useUserModel(User::class);

tests/CreateTeamTest.php

@@ -12,10 +12,10 @@
 
 class CreateTeamTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/CurrentTeamControllerTest.php

@@ -8,18 +8,16 @@
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Tests\Fixtures\TeamPolicy;
 use Laravel\Jetstream\Tests\Fixtures\User;
+use Orchestra\Testbench\Attributes\WithConfig;
 
+#[WithConfig('jetstream.stack', 'livewire')]
+#[WithConfig('jetstream.features', ['teams'])]
 class CurrentTeamControllerTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
-        $app['config']->set([
-            'jetstream.stack' => 'livewire',
-            'jetstream.features' => ['teams'],
-        ]);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/DeleteTeamTest.php

@@ -15,10 +15,10 @@
 
 class DeleteTeamTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/DeleteUserWithTeamsTest.php

@@ -19,10 +19,10 @@ class DeleteUserWithTeamsTest extends OrchestraTestCase
 {
     use RefreshDatabase;
 
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/HasTeamsTest.php

@@ -14,10 +14,10 @@ class HasTeamsTest extends OrchestraTestCase
 {
     use RefreshDatabase;
 
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Jetstream::$permissions = [];
         Jetstream::$roles = [];
 

tests/InviteTeamMemberTest.php

@@ -14,12 +14,11 @@
 
 class InviteTeamMemberTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
-
         Jetstream::useUserModel(User::class);
     }
 

tests/JetstreamTest.php

@@ -3,6 +3,7 @@
 namespace Laravel\Jetstream\Tests;
 
 use Laravel\Jetstream\Jetstream;
+use Orchestra\Testbench\Attributes\DefineEnvironment;
 
 class JetstreamTest extends OrchestraTestCase
 {
@@ -57,9 +58,7 @@ public function test_has_team_feature_will_always_return_false_when_team_is_not_
         $this->assertFalse(Jetstream::userHasTeamFeatures(new Fixtures\Admin));
     }
 
-    /**
-     * @define-env defineHasTeamEnvironment
-     */
+    #[DefineEnvironment('defineHasTeamEnvironment')]
     public function test_has_team_feature_can_be_determined_when_team_is_enabled()
     {
         $this->assertTrue(Jetstream::hasTeamFeatures());

tests/OrchestraTestCase.php

@@ -7,18 +7,15 @@
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\JetstreamServiceProvider;
 use Livewire\LivewireServiceProvider;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('database.default', 'testing')]
 abstract class OrchestraTestCase extends TestCase
 {
     use LazilyRefreshDatabase, WithWorkbench;
 
-    protected function defineEnvironment($app)
-    {
-        $app['config']->set('database.default', 'testing');
-    }
-
     protected function defineHasTeamEnvironment($app)
     {
         $features = $app->config->get('jetstream.features', []);

tests/RemoveTeamMemberTest.php

@@ -18,12 +18,11 @@
 
 class RemoveTeamMemberTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
-
         Jetstream::useUserModel(User::class);
     }
 

tests/TeamBehaviorTest.php

@@ -13,10 +13,10 @@
 
 class TeamBehaviorTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(\App\Models\Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/TeamInvitationControllerTest.php

@@ -10,16 +10,16 @@
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Tests\Fixtures\TeamPolicy;
 use Laravel\Jetstream\Tests\Fixtures\User;
+use Orchestra\Testbench\Attributes\WithConfig;
 
+#[WithConfig('jetstream.stack', 'inertia')]
+#[WithConfig('jetstream.features', ['teams'])]
 class TeamInvitationControllerTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
-        $app['config']->set('jetstream.stack', 'inertia');
-        $app['config']->set('jetstream.features', ['teams']);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/TeamMemberControllerTest.php

@@ -9,16 +9,16 @@
 use Laravel\Jetstream\Tests\Fixtures\TeamPolicy;
 use Laravel\Jetstream\Tests\Fixtures\User;
 use Laravel\Sanctum\TransientToken;
+use Orchestra\Testbench\Attributes\WithConfig;
 
+#[WithConfig('jetstream.stack', 'inertia')]
+#[WithConfig('jetstream.features', ['teams'])]
 class TeamMemberControllerTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
-        $app['config']->set('jetstream.stack', 'inertia');
-        $app['config']->set('jetstream.features', ['teams']);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/UpdateTeamTest.php

@@ -13,10 +13,10 @@
 
 class UpdateTeamTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }

tests/UserProfileControllerTest.php

@@ -7,27 +7,30 @@
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Tests\Fixtures\User;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\WithConfig;
 
+#[WithConfig('jetstream.stack', 'inertia')]
 class UserProfileControllerTest extends OrchestraTestCase
 {
+    /** {@inheritdoc} */
+    #[\Override]
     protected function defineEnvironment($app)
     {
-        parent::defineEnvironment($app);
-
-        $app['config']->set([
-            'jetstream.stack' => 'inertia',
-            'fortify.features' => [
-                Features::registration(),
-                Features::resetPasswords(),
-                // Features::emailVerification(),
-                Features::updateProfileInformation(),
-                Features::updatePasswords(),
-                Features::twoFactorAuthentication([
-                    'confirm' => true,
-                    'confirmPassword' => true,
-                ]),
-            ],
-        ]);
+        tap($app->make('config'), function ($config) {
+            $config->set([
+                'fortify.features' => [
+                    Features::registration(),
+                    Features::resetPasswords(),
+                    // Features::emailVerification(),
+                    Features::updateProfileInformation(),
+                    Features::updatePasswords(),
+                    Features::twoFactorAuthentication([
+                        'confirm' => true,
+                        'confirmPassword' => true,
+                    ]),
+                ],
+            ]);
+        });
 
         Jetstream::useUserModel(User::class);
     }