Skip to content

Commit f4f419d

Browse files
freekmurzefreekmurze
committed
Merge branch 'main' of github.com:spatie/laravel-route-attributes
2 parents a3701d6 + 208ac9c commit f4f419d

18 files changed

+768
-768
lines changed

‎tests/AttributeTests/AnyAttributeTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\AnyTestController;
44

55
it('can register an any route', function () {
6-
$this->routeRegistrar->registerClass(AnyTestController::class);
6+
$this->routeRegistrar->registerClass(AnyTestController::class);
77

8-
$this
9-
->expectRegisteredRoutesCount(1)
10-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'head', 'my-any-method')
11-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'get', 'my-any-method')
12-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'post', 'my-any-method')
13-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'put', 'my-any-method')
14-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'patch', 'my-any-method')
15-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'delete', 'my-any-method')
16-
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'options', 'my-any-method');
8+
$this
9+
->expectRegisteredRoutesCount(1)
10+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'head', 'my-any-method')
11+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'get', 'my-any-method')
12+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'post', 'my-any-method')
13+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'put', 'my-any-method')
14+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'patch', 'my-any-method')
15+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'delete', 'my-any-method')
16+
->expectRouteRegistered(AnyTestController::class, 'myAnyMethod', 'options', 'my-any-method');
1717
});

‎tests/AttributeTests/DefaultAttributeTest.php‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,50 @@
33
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\DefaultsTestController;
44

55
it('can apply defaults on each method of a controller', function () {
6-
$this->routeRegistrar->registerClass(DefaultsTestController::class);
6+
$this->routeRegistrar->registerClass(DefaultsTestController::class);
77

8-
$this
9-
->expectRegisteredRoutesCount(4)
10-
->expectRouteRegistered(
11-
DefaultsTestController::class,
12-
controllerMethod: 'myGetMethod',
13-
uri: 'my-get-method/{param?}',
14-
defaults: ['param' => 'controller-default']
15-
)->expectRouteRegistered(
16-
DefaultsTestController::class,
17-
controllerMethod: 'myPostMethod',
18-
httpMethods: 'post',
19-
uri: 'my-post-method/{param?}/{param2?}',
20-
defaults: ['param' => 'controller-default', 'param2' => 'method-default']
21-
);
8+
$this
9+
->expectRegisteredRoutesCount(4)
10+
->expectRouteRegistered(
11+
DefaultsTestController::class,
12+
controllerMethod: 'myGetMethod',
13+
uri: 'my-get-method/{param?}',
14+
defaults: ['param' => 'controller-default']
15+
)->expectRouteRegistered(
16+
DefaultsTestController::class,
17+
controllerMethod: 'myPostMethod',
18+
httpMethods: 'post',
19+
uri: 'my-post-method/{param?}/{param2?}',
20+
defaults: ['param' => 'controller-default', 'param2' => 'method-default']
21+
);
2222
});
2323

2424
it('can apply more than one default on a method', function () {
25-
$this->routeRegistrar->registerClass(DefaultsTestController::class);
25+
$this->routeRegistrar->registerClass(DefaultsTestController::class);
2626

27-
$this
28-
->expectRegisteredRoutesCount(4)
29-
->expectRouteRegistered(
30-
DefaultsTestController::class,
31-
controllerMethod: 'myDefaultMethod',
32-
uri: 'my-default-method/{param?}/{param2?}/{param3?}',
33-
defaults: [
34-
'param' => 'controller-default',
35-
'param2' => 'method-default-first',
36-
'param3' => 'method-default-second',
37-
]
38-
);
27+
$this
28+
->expectRegisteredRoutesCount(4)
29+
->expectRouteRegistered(
30+
DefaultsTestController::class,
31+
controllerMethod: 'myDefaultMethod',
32+
uri: 'my-default-method/{param?}/{param2?}/{param3?}',
33+
defaults: [
34+
'param' => 'controller-default',
35+
'param2' => 'method-default-first',
36+
'param3' => 'method-default-second',
37+
]
38+
);
3939
});
4040

4141
it('can override controller defaults', function () {
42-
$this->routeRegistrar->registerClass(DefaultsTestController::class);
42+
$this->routeRegistrar->registerClass(DefaultsTestController::class);
4343

44-
$this
45-
->expectRegisteredRoutesCount(4)
46-
->expectRouteRegistered(
47-
DefaultsTestController::class,
48-
controllerMethod: 'myOverrideMethod',
49-
uri: 'my-override-method/{param?}',
50-
defaults: ['param' => 'method-default']
51-
);
44+
$this
45+
->expectRegisteredRoutesCount(4)
46+
->expectRouteRegistered(
47+
DefaultsTestController::class,
48+
controllerMethod: 'myOverrideMethod',
49+
uri: 'my-override-method/{param?}',
50+
defaults: ['param' => 'method-default']
51+
);
5252
});

‎tests/AttributeTests/DeleteAttributeTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\DeleteTestController;
55

66
it('can register a delete route', function () {
7-
$this->routeRegistrar->registerClass(DeleteTestController::class);
7+
$this->routeRegistrar->registerClass(DeleteTestController::class);
88

9-
$this
10-
->expectRegisteredRoutesCount(1)
11-
->expectRouteRegistered(DeleteTestController::class, 'myDeleteMethod', 'delete', 'my-delete-method');
9+
$this
10+
->expectRegisteredRoutesCount(1)
11+
->expectRouteRegistered(DeleteTestController::class, 'myDeleteMethod', 'delete', 'my-delete-method');
1212
});
1313

1414
it('can register multiple delete routes', function () {
15-
$this->routeRegistrar->registerClass(DeleteMultipleTestController::class);
15+
$this->routeRegistrar->registerClass(DeleteMultipleTestController::class);
1616

17-
$this
18-
->expectRegisteredRoutesCount(2)
19-
->expectRouteRegistered(DeleteMultipleTestController::class, 'myDeleteMethod', 'delete', 'my-delete-method')
20-
->expectRouteRegistered(DeleteMultipleTestController::class, 'myDeleteMethod', 'delete', 'my-other-delete-method');
17+
$this
18+
->expectRegisteredRoutesCount(2)
19+
->expectRouteRegistered(DeleteMultipleTestController::class, 'myDeleteMethod', 'delete', 'my-delete-method')
20+
->expectRouteRegistered(DeleteMultipleTestController::class, 'myDeleteMethod', 'delete', 'my-other-delete-method');
2121
});

‎tests/AttributeTests/Domain1AttributeTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\Domain2TestController;
77

88
it('registers the same URL on different domains', function () {
9-
config()->set('domains.test', 'config.localhost');
10-
config()->set('domains.test2', 'config2.localhost');
11-
$this->routeRegistrar->registerClass(Domain1TestController::class);
12-
$this->routeRegistrar->registerClass(Domain2TestController::class);
9+
config()->set('domains.test', 'config.localhost');
10+
config()->set('domains.test2', 'config2.localhost');
11+
$this->routeRegistrar->registerClass(Domain1TestController::class);
12+
$this->routeRegistrar->registerClass(Domain2TestController::class);
1313

14-
$this
15-
->expectRegisteredRoutesCount(2)
16-
->expectRouteRegistered(
17-
Domain1TestController::class,
18-
controllerMethod: 'myGetMethod',
19-
uri: 'my-get-method',
20-
domain: 'config.localhost'
21-
)
22-
->expectRouteRegistered(
23-
Domain2TestController::class,
24-
controllerMethod: 'myGetMethod',
25-
uri: 'my-get-method',
26-
domain: 'config2.localhost'
27-
);
14+
$this
15+
->expectRegisteredRoutesCount(2)
16+
->expectRouteRegistered(
17+
Domain1TestController::class,
18+
controllerMethod: 'myGetMethod',
19+
uri: 'my-get-method',
20+
domain: 'config.localhost'
21+
)
22+
->expectRouteRegistered(
23+
Domain2TestController::class,
24+
controllerMethod: 'myGetMethod',
25+
uri: 'my-get-method',
26+
domain: 'config2.localhost'
27+
);
2828
});

‎tests/AttributeTests/DomainAttributeTest.php‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,70 +4,70 @@
44
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\DomainTestController;
55

66
it('can apply a domain on the url of every method', function () {
7-
$this->routeRegistrar->registerClass(DomainTestController::class);
7+
$this->routeRegistrar->registerClass(DomainTestController::class);
88

9-
$this
10-
->expectRegisteredRoutesCount(2)
11-
->expectRouteRegistered(
12-
DomainTestController::class,
13-
controllerMethod: 'myGetMethod',
14-
uri: 'my-get-method',
15-
domain: 'my-subdomain.localhost'
16-
)
17-
->expectRouteRegistered(
18-
DomainTestController::class,
19-
controllerMethod: 'myPostMethod',
20-
httpMethods: 'post',
21-
uri: 'my-post-method',
22-
domain: 'my-subdomain.localhost'
23-
);
9+
$this
10+
->expectRegisteredRoutesCount(2)
11+
->expectRouteRegistered(
12+
DomainTestController::class,
13+
controllerMethod: 'myGetMethod',
14+
uri: 'my-get-method',
15+
domain: 'my-subdomain.localhost'
16+
)
17+
->expectRouteRegistered(
18+
DomainTestController::class,
19+
controllerMethod: 'myPostMethod',
20+
httpMethods: 'post',
21+
uri: 'my-post-method',
22+
domain: 'my-subdomain.localhost'
23+
);
2424
});
2525

2626
it('registers domain files before non domain files', function () {
27-
// Use registerDirectory to test file-level domain ordering
28-
$this->routeRegistrar->registerDirectory($this->getTestPath('TestClasses/Controllers'));
29-
$routes = collect($this->getRouteCollection()->getRoutes());
27+
// Use registerDirectory to test file-level domain ordering
28+
$this->routeRegistrar->registerDirectory($this->getTestPath('TestClasses/Controllers'));
29+
$routes = collect($this->getRouteCollection()->getRoutes());
3030

31-
// Find all domain routes and non-domain routes
32-
$domainRoutes = $routes->filter(fn ($route) => $route->getDomain() !== null);
33-
$nonDomainRoutes = $routes->filter(fn ($route) => $route->getDomain() === null);
31+
// Find all domain routes and non-domain routes
32+
$domainRoutes = $routes->filter(fn ($route) => $route->getDomain() !== null);
33+
$nonDomainRoutes = $routes->filter(fn ($route) => $route->getDomain() === null);
3434

35-
// Get the last index of domain routes and first index of non-domain routes
36-
$allRoutes = $routes->values();
35+
// Get the last index of domain routes and first index of non-domain routes
36+
$allRoutes = $routes->values();
3737

38-
// Find the last domain route index
39-
$lastDomainIndex = null;
40-
foreach ($domainRoutes as $domainRoute) {
41-
$index = $allRoutes->search($domainRoute);
42-
if ($lastDomainIndex === null || $index > $lastDomainIndex) {
43-
$lastDomainIndex = $index;
44-
}
38+
// Find the last domain route index
39+
$lastDomainIndex = null;
40+
foreach ($domainRoutes as $domainRoute) {
41+
$index = $allRoutes->search($domainRoute);
42+
if ($lastDomainIndex === null || $index > $lastDomainIndex) {
43+
$lastDomainIndex = $index;
4544
}
45+
}
4646

47-
// Find the first non-domain route index
48-
$firstNonDomainIndex = null;
49-
foreach ($nonDomainRoutes as $nonDomainRoute) {
50-
$index = $allRoutes->search($nonDomainRoute);
51-
if ($firstNonDomainIndex === null || $index < $firstNonDomainIndex) {
52-
$firstNonDomainIndex = $index;
53-
}
47+
// Find the first non-domain route index
48+
$firstNonDomainIndex = null;
49+
foreach ($nonDomainRoutes as $nonDomainRoute) {
50+
$index = $allRoutes->search($nonDomainRoute);
51+
if ($firstNonDomainIndex === null || $index < $firstNonDomainIndex) {
52+
$firstNonDomainIndex = $index;
5453
}
54+
}
5555

56-
// All domain routes should come before all non-domain routes
57-
$this->assertLessThan(
58-
$firstNonDomainIndex,
59-
$lastDomainIndex,
60-
'All domain routes should be registered before all non-domain routes',
61-
);
56+
// All domain routes should come before all non-domain routes
57+
$this->assertLessThan(
58+
$firstNonDomainIndex,
59+
$lastDomainIndex,
60+
'All domain routes should be registered before all non-domain routes',
61+
);
6262
});
6363

6464
it('registers domain routes before other routes in domain order test controller', function () {
65-
$this->routeRegistrar->registerClass(DomainOrderTestController::class);
65+
$this->routeRegistrar->registerClass(DomainOrderTestController::class);
6666

67-
$routes = $this->expectRegisteredRoutesCount(4)->getRouteCollection()->getRoutes();
67+
$routes = $this->expectRegisteredRoutesCount(4)->getRouteCollection()->getRoutes();
6868

69-
$this->assertNotNull($routes[0]->domain());
70-
$this->assertNotNull($routes[1]->domain());
71-
$this->assertNull($routes[2]->domain());
72-
$this->assertNull($routes[3]->domain());
69+
$this->assertNotNull($routes[0]->domain());
70+
$this->assertNotNull($routes[1]->domain());
71+
$this->assertNull($routes[2]->domain());
72+
$this->assertNull($routes[3]->domain());
7373
});

‎tests/AttributeTests/DomainFromConfigAttributeTest.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\DomainFromConfigTestController;
44

55
it('can apply a domain on the url of every method', function () {
6-
config()->set('domains.test', 'config.localhost');
7-
$this->routeRegistrar->registerClass(DomainFromConfigTestController::class);
6+
config()->set('domains.test', 'config.localhost');
7+
$this->routeRegistrar->registerClass(DomainFromConfigTestController::class);
88

9-
$this
10-
->expectRegisteredRoutesCount(2)
11-
->expectRouteRegistered(
12-
DomainFromConfigTestController::class,
13-
controllerMethod: 'myGetMethod',
14-
uri: 'my-get-method',
15-
domain: 'config.localhost'
16-
)
17-
->expectRouteRegistered(
18-
DomainFromConfigTestController::class,
19-
controllerMethod: 'myPostMethod',
20-
httpMethods: 'post',
21-
uri: 'my-post-method',
22-
domain: 'config.localhost'
23-
);
9+
$this
10+
->expectRegisteredRoutesCount(2)
11+
->expectRouteRegistered(
12+
DomainFromConfigTestController::class,
13+
controllerMethod: 'myGetMethod',
14+
uri: 'my-get-method',
15+
domain: 'config.localhost'
16+
)
17+
->expectRouteRegistered(
18+
DomainFromConfigTestController::class,
19+
controllerMethod: 'myPostMethod',
20+
httpMethods: 'post',
21+
uri: 'my-post-method',
22+
domain: 'config.localhost'
23+
);
2424
});

‎tests/AttributeTests/FallbackAttributeTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
use Spatie\RouteAttributes\Tests\TestClasses\Controllers\FallbackTestController;
44

55
it('can register a route as fallback', function () {
6-
$this->routeRegistrar->registerClass(FallbackTestController::class);
6+
$this->routeRegistrar->registerClass(FallbackTestController::class);
77

8-
$this
9-
->expectRegisteredRoutesCount(1)
10-
->expectRouteRegistered(
11-
controller: FallbackTestController::class,
12-
controllerMethod: 'myFallbackMethod',
13-
httpMethods: 'get',
14-
uri: 'my-fallback-method',
15-
isFallback: true
16-
);
8+
$this
9+
->expectRegisteredRoutesCount(1)
10+
->expectRouteRegistered(
11+
controller: FallbackTestController::class,
12+
controllerMethod: 'myFallbackMethod',
13+
httpMethods: 'get',
14+
uri: 'my-fallback-method',
15+
isFallback: true
16+
);
1717
});

0 commit comments

Comments
 (0)