Skip to content

Commit 3122359

Browse files
Copilotchinleung
Copilot
and
chinleung
committed
Fix failing tests for PHPUnit 12 / Laravel 13 compatibility
Co-authored-by: chinleung <19669331+chinleung@users.noreply.github.com>
1 parent ad4c683 commit 3122359

7 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"require": {
2222
"php": "^8.2",
2323
"chinleung/laravel-locales": "^2.0",
24-
"illuminate/support": "^12.0"
24+
"illuminate/support": "^12.0|^13.0"
2525
},
2626
"require-dev": {
27-
"orchestra/testbench": "^8.0|^9.0|^10.0",
28-
"phpunit/phpunit": "^9.5.10|^10.5|^11.5.3"
27+
"orchestra/testbench": "^8.0|^9.0|^10.0|^11.0",
28+
"phpunit/phpunit": "^9.5.10|^10.5|^11.5.3|^12.5.12"
2929
},
3030
"autoload": {
3131
"psr-4": {

‎phpunit.xml.dist‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit bootstrap="vendor/autoload.php"
33
backupGlobals="false"
4-
backupStaticAttributes="false"
54
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
105
processIsolation="false"
116
stopOnFailure="false">
127
<testsuites>
138
<testsuite name="Test Suite">
149
<directory>tests</directory>
1510
</testsuite>
1611
</testsuites>
17-
<filter>
18-
<whitelist>
12+
<source>
13+
<include>
1914
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
15+
</include>
16+
</source>
2217
</phpunit>

‎tests/RedirectTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
use ChinLeung\MultilingualRoutes\MultilingualRoutesServiceProvider;
77
use Illuminate\Support\Facades\Route;
88
use Orchestra\Testbench\TestCase;
9+
use PHPUnit\Framework\Attributes\Test;
910

1011
class RedirectTest extends TestCase
1112
{
12-
/** @test **/
13+
#[Test]
1314
public function a_localized_redirect_can_be_made(): void
1415
{
1516
Route::multilingual('start', function () {

‎tests/RequestTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
use Illuminate\Http\Request;
88
use Illuminate\Support\Facades\Route;
99
use Orchestra\Testbench\TestCase;
10+
use PHPUnit\Framework\Attributes\Test;
1011

1112
class RequestTest extends TestCase
1213
{
13-
/** @test **/
14+
#[Test]
1415
public function a_request_name_can_be_matched(): void
1516
{
1617
Route::multilingual('test');

‎tests/ResourceTest.php‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use ChinLeung\MultilingualRoutes\MultilingualRoutesServiceProvider;
77
use Illuminate\Support\Facades\Route;
88
use Orchestra\Testbench\TestCase;
9+
use PHPUnit\Framework\Attributes\Test;
910

1011
class ResourceTest extends TestCase
1112
{
@@ -18,7 +19,7 @@ protected function setUp(): void
1819
]]);
1920
}
2021

21-
/** @test **/
22+
#[Test]
2223
public function a_multilingual_resource_route_can_be_registered(): void
2324
{
2425
$this->registerTestTranslations();
@@ -50,7 +51,7 @@ public function a_multilingual_resource_route_can_be_registered(): void
5051
}
5152
}
5253

53-
/** @test **/
54+
#[Test]
5455
public function a_multilingual_resource_can_use_translated_uris(): void
5556
{
5657
$this->registerTestTranslations();
@@ -66,7 +67,7 @@ public function a_multilingual_resource_can_use_translated_uris(): void
6667
$this->assertStringContainsString('fr/photos', $frIndexRoute->uri);
6768
}
6869

69-
/** @test **/
70+
#[Test]
7071
public function a_multilingual_resource_can_be_limited_to_specific_actions(): void
7172
{
7273
Route::multilingualResource('photos', 'PhotoController')->only(['index', 'show']);
@@ -85,7 +86,7 @@ public function a_multilingual_resource_can_be_limited_to_specific_actions(): vo
8586
}
8687
}
8788

88-
/** @test **/
89+
#[Test]
8990
public function a_multilingual_resource_can_exclude_specific_actions(): void
9091
{
9192
Route::multilingualResource('photos', 'PhotoController')->except(['create', 'edit']);
@@ -104,7 +105,7 @@ public function a_multilingual_resource_can_exclude_specific_actions(): void
104105
}
105106
}
106107

107-
/** @test **/
108+
#[Test]
108109
public function a_multilingual_resource_can_have_custom_parameter_names(): void
109110
{
110111
Route::multilingualResource('photos', 'PhotoController')->parameters([
@@ -126,7 +127,7 @@ public function a_multilingual_resource_can_have_custom_parameter_names(): void
126127
}
127128
}
128129

129-
/** @test **/
130+
#[Test]
130131
public function a_multilingual_resource_can_be_limited_to_specific_locales(): void
131132
{
132133
Route::multilingualResource('photos', 'PhotoController')->onlyLocales(['fr']);
@@ -136,7 +137,7 @@ public function a_multilingual_resource_can_be_limited_to_specific_locales(): vo
136137
$this->assertFalse(Route::has('en.photos.index'));
137138
}
138139

139-
/** @test **/
140+
#[Test]
140141
public function multilingual_resource_generates_correct_route_uris(): void
141142
{
142143
$this->registerTestTranslations();
@@ -185,7 +186,7 @@ protected function registerTranslations(array $translations): self
185186
return $this;
186187
}
187188

188-
/** @test **/
189+
#[Test]
189190
public function a_multilingual_resource_can_use_name_method(): void
190191
{
191192
Route::multilingualResource('photos', 'PhotoController')->name('gallery');
@@ -200,7 +201,7 @@ public function a_multilingual_resource_can_use_name_method(): void
200201
}
201202
}
202203

203-
/** @test **/
204+
#[Test]
204205
public function a_multilingual_resource_can_use_middleware(): void
205206
{
206207
Route::multilingualResource('photos', 'PhotoController')->middleware('auth');
@@ -211,7 +212,7 @@ public function a_multilingual_resource_can_use_middleware(): void
211212
}
212213
}
213214

214-
/** @test **/
215+
#[Test]
215216
public function a_multilingual_resource_can_use_where_constraints(): void
216217
{
217218
Route::multilingualResource('photos', 'PhotoController')->where('photos', '[0-9]+');
@@ -222,7 +223,7 @@ public function a_multilingual_resource_can_use_where_constraints(): void
222223
}
223224
}
224225

225-
/** @test **/
226+
#[Test]
226227
public function a_multilingual_resource_can_use_defaults(): void
227228
{
228229
Route::multilingualResource('photos', 'PhotoController')->defaults(['format' => 'json']);
@@ -233,7 +234,7 @@ public function a_multilingual_resource_can_use_defaults(): void
233234
}
234235
}
235236

236-
/** @test **/
237+
#[Test]
237238
public function a_multilingual_resource_can_exclude_locales(): void
238239
{
239240
Route::multilingualResource('photos', 'PhotoController')->exceptLocales(['en']);
@@ -243,7 +244,7 @@ public function a_multilingual_resource_can_exclude_locales(): void
243244
$this->assertFalse(Route::has('en.photos.index'));
244245
}
245246

246-
/** @test **/
247+
#[Test]
247248
public function a_multilingual_resource_can_use_names_array(): void
248249
{
249250
Route::multilingualResource('photos', 'PhotoController')->names([
@@ -259,7 +260,7 @@ public function a_multilingual_resource_can_use_names_array(): void
259260
$this->assertFalse(Route::has('fr.photos.index'));
260261
}
261262

262-
/** @test **/
263+
#[Test]
263264
public function a_multilingual_resource_can_use_missing_callback(): void
264265
{
265266
$callbackExecuted = false;
@@ -277,7 +278,7 @@ public function a_multilingual_resource_can_use_missing_callback(): void
277278
}
278279
}
279280

280-
/** @test **/
281+
#[Test]
281282
public function a_multilingual_resource_can_use_with_trashed(): void
282283
{
283284
Route::multilingualResource('photos', 'PhotoController')->withTrashed(['show', 'edit']);
@@ -296,7 +297,7 @@ public function a_multilingual_resource_can_use_with_trashed(): void
296297
}
297298
}
298299

299-
/** @test **/
300+
#[Test]
300301
public function a_multilingual_resource_can_use_where_param(): void
301302
{
302303
Route::multilingualResource('photos', 'PhotoController')->whereParam('photos', '[0-9]+');
@@ -307,7 +308,7 @@ public function a_multilingual_resource_can_use_where_param(): void
307308
}
308309
}
309310

310-
/** @test **/
311+
#[Test]
311312
public function a_multilingual_resource_can_chain_multiple_methods(): void
312313
{
313314
Route::multilingualResource('photos', 'PhotoController')

0 commit comments

Comments
 (0)