[5.x] PHP 8.5 Compatibility (#1588)

crynobone · web-flow · commit 5a83a20b419c · 2025-11-25T08:46:14.000-06:00
* [5.x] PHP 8.5 Compatibility

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;

* wip

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;

---------

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;
diff --git a/.github/workflows/tests.yml b/.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 }}
 
diff --git a/composer.json b/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",
diff --git a/tests/AddTeamMemberTest.php b/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);
diff --git a/tests/CreateTeamTest.php b/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);
     }
diff --git a/tests/CurrentTeamControllerTest.php b/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);
     }
diff --git a/tests/DeleteTeamTest.php b/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);
     }
diff --git a/tests/DeleteUserWithTeamsTest.php b/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);
     }
diff --git a/tests/HasTeamsTest.php b/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 = [];
 
diff --git a/tests/InviteTeamMemberTest.php b/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);
     }
 
diff --git a/tests/JetstreamTest.php b/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());
diff --git a/tests/OrchestraTestCase.php b/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', []);
diff --git a/tests/RemoveTeamMemberTest.php b/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);
     }
 
diff --git a/tests/TeamBehaviorTest.php b/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);
     }
diff --git a/tests/TeamInvitationControllerTest.php b/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);
     }
diff --git a/tests/TeamMemberControllerTest.php b/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);
     }
diff --git a/tests/UpdateTeamTest.php b/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);
     }
diff --git a/tests/UserProfileControllerTest.php b/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);
     }

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ class AddTeamMemberTest extends OrchestraTestCase`
`18`	`18`	`{`
`19`	`19`	`use RefreshDatabase;`
`20`	`20`
	`21`	`+ /** {@inheritdoc} */`
	`22`	`+ #[\Override]`
`21`	`23`	`protected function defineEnvironment($app)`
`22`	`24`	`{`
`23`		`- parent::defineEnvironment($app);`
`24`		`-`
`25`	`25`	`Gate::policy(Team::class, TeamPolicy::class);`
`26`	`26`
`27`	`27`	`Jetstream::useUserModel(User::class);`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@`
`12`	`12`
`13`	`13`	`class CreateTeamTest extends OrchestraTestCase`
`14`	`14`	`{`
	`15`	`+ /** {@inheritdoc} */`
	`16`	`+ #[\Override]`
`15`	`17`	`protected function defineEnvironment($app)`
`16`	`18`	`{`
`17`		`- parent::defineEnvironment($app);`
`18`		`-`
`19`	`19`	`Gate::policy(Team::class, TeamPolicy::class);`
`20`	`20`	`Jetstream::useUserModel(User::class);`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@`
`15`	`15`
`16`	`16`	`class DeleteTeamTest extends OrchestraTestCase`
`17`	`17`	`{`
	`18`	`+ /** {@inheritdoc} */`
	`19`	`+ #[\Override]`
`18`	`20`	`protected function defineEnvironment($app)`
`19`	`21`	`{`
`20`		`- parent::defineEnvironment($app);`
`21`		`-`
`22`	`22`	`Gate::policy(Team::class, TeamPolicy::class);`
`23`	`23`	`Jetstream::useUserModel(User::class);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ class DeleteUserWithTeamsTest extends OrchestraTestCase`
`19`	`19`	`{`
`20`	`20`	`use RefreshDatabase;`
`21`	`21`
	`22`	`+ /** {@inheritdoc} */`
	`23`	`+ #[\Override]`
`22`	`24`	`protected function defineEnvironment($app)`
`23`	`25`	`{`
`24`		`- parent::defineEnvironment($app);`
`25`		`-`
`26`	`26`	`Gate::policy(Team::class, TeamPolicy::class);`
`27`	`27`	`Jetstream::useUserModel(User::class);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ class HasTeamsTest extends OrchestraTestCase`
`14`	`14`	`{`
`15`	`15`	`use RefreshDatabase;`
`16`	`16`
	`17`	`+ /** {@inheritdoc} */`
	`18`	`+ #[\Override]`
`17`	`19`	`protected function defineEnvironment($app)`
`18`	`20`	`{`
`19`		`- parent::defineEnvironment($app);`
`20`		`-`
`21`	`21`	`Jetstream::$permissions = [];`
`22`	`22`	`Jetstream::$roles = [];`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,11 @@`
`14`	`14`
`15`	`15`	`class InviteTeamMemberTest extends OrchestraTestCase`
`16`	`16`	`{`
	`17`	`+ /** {@inheritdoc} */`
	`18`	`+ #[\Override]`
`17`	`19`	`protected function defineEnvironment($app)`
`18`	`20`	`{`
`19`		`- parent::defineEnvironment($app);`
`20`		`-`
`21`	`21`	`Gate::policy(Team::class, TeamPolicy::class);`
`22`		`-`
`23`	`22`	`Jetstream::useUserModel(User::class);`
`24`	`23`	`}`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Laravel\Jetstream\Tests;`
`4`	`4`
`5`	`5`	`use Laravel\Jetstream\Jetstream;`
	`6`	`+use Orchestra\Testbench\Attributes\DefineEnvironment;`
`6`	`7`
`7`	`8`	`class JetstreamTest extends OrchestraTestCase`
`8`	`9`	`{`
`@@ -57,9 +58,7 @@ public function test_has_team_feature_will_always_return_false_when_team_is_not_`
`57`	`58`	`$this->assertFalse(Jetstream::userHasTeamFeatures(new Fixtures\Admin));`
`58`	`59`	`}`
`59`	`60`
`60`		`- /**`
`61`		`- * @define-env defineHasTeamEnvironment`
`62`		`- */`
	`61`	`+ #[DefineEnvironment('defineHasTeamEnvironment')]`
`63`	`62`	`public function test_has_team_feature_can_be_determined_when_team_is_enabled()`
`64`	`63`	`{`
`65`	`64`	`$this->assertTrue(Jetstream::hasTeamFeatures());`