Skip to content

Commit f5fb373

Browse files
authored
[4.x] PHP 8.5 Compatibility (#576)
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
1 parent 2fde6ea commit f5fb373

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
matrix:
2020
php: [8.2, 8.3, 8.4]
2121
laravel: [11, 12]
22+
include:
23+
- php: 8.5
24+
laravel: 12
2225

2326
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2427

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
},
2525
"require-dev": {
2626
"mockery/mockery": "^1.6",
27-
"orchestra/testbench": "^9.0|^10.0",
28-
"phpstan/phpstan": "^1.10",
29-
"phpunit/phpunit": "^11.3"
27+
"orchestra/testbench": "^9.15|^10.8",
28+
"phpstan/phpstan": "^1.10"
3029
},
3130
"autoload": {
3231
"psr-4": {

tests/Controller/AuthenticateRequestsTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Laravel\Sanctum\Sanctum;
99
use Orchestra\Testbench\Concerns\WithWorkbench;
1010
use Orchestra\Testbench\TestCase;
11+
use PHPUnit\Framework\Attributes\DataProvider;
1112
use Workbench\App\Models\User;
1213
use Workbench\Database\Factories\PersonalAccessTokenFactory;
1314
use Workbench\Database\Factories\UserFactory;
@@ -56,9 +57,7 @@ public function test_can_authorize_valid_user_using_authorization_header()
5657
->assertSee($user->email);
5758
}
5859

59-
/**
60-
* @dataProvider sanctumGuardsDataProvider
61-
*/
60+
#[DataProvider('sanctumGuardsDataProvider')]
6261
public function test_can_authorize_valid_user_using_sanctum_acting_as($guard)
6362
{
6463
PersonalAccessTokenFactory::new()->for(

tests/Controller/FrontendRequestsAreStatefulTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Laravel\Sanctum\Sanctum;
99
use Orchestra\Testbench\Concerns\WithWorkbench;
1010
use Orchestra\Testbench\TestCase;
11+
use PHPUnit\Framework\Attributes\DataProvider;
1112
use Workbench\App\Models\User;
1213
use Workbench\Database\Factories\UserFactory;
1314

@@ -97,9 +98,7 @@ public function test_middleware_keeps_session_logged_in_when_sanctum_request_cha
9798
->assertSee($user->email);
9899
}
99100

100-
/**
101-
* @dataProvider sanctumGuardsDataProvider
102-
*/
101+
#[DataProvider('sanctumGuardsDataProvider')]
103102
public function test_middleware_can_deauthorize_valid_user_using_acting_as_after_password_change_from_sanctum_guard($guard)
104103
{
105104
$user = UserFactory::new()->create();

tests/Feature/GuardTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Mockery;
1616
use Orchestra\Testbench\Concerns\WithWorkbench;
1717
use Orchestra\Testbench\TestCase;
18+
use PHPUnit\Framework\Attributes\DataProvider;
1819
use stdClass;
1920
use Workbench\App\Models\User;
2021
use Workbench\Database\Factories\PersonalAccessTokenFactory;
@@ -221,9 +222,7 @@ public function test_authentication_with_token_fails_if_user_provider_is_invalid
221222
Event::assertNotDispatched(TokenAuthenticated::class);
222223
}
223224

224-
/**
225-
* @dataProvider invalidTokenDataProvider
226-
*/
225+
#[DataProvider('invalidTokenDataProvider')]
227226
public function test_authentication_with_token_fails_if_token_has_invalid_format($invalidToken)
228227
{
229228
$factory = Mockery::mock(AuthFactory::class);

0 commit comments

Comments
 (0)