Skip to content

Commit 4bfb40e

Browse files
rubenvanasscherubenvanassche
committed
Switch . in routes
1 parent 0e6682b commit 4bfb40e

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎src/Laravel/Actions/ResolveLaravelRoutControllerCollectionsAction.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public function execute(
5858

5959
$controllerClass = Str::of($controllerClass)->trim('\\');
6060

61-
if ($defaultNamespace) {
62-
$controllerClass = $this->replaceDefaultNamespace($controllerClass, $defaultNamespace);
63-
}
61+
$controllerClass = $defaultNamespace
62+
? $this->replaceDefaultNamespace($controllerClass, $defaultNamespace)
63+
: $controllerClass->prepend('.');
6464

6565
$controllerClass = (string) $controllerClass->replace('\\', '.');
6666

@@ -97,10 +97,10 @@ protected function replaceDefaultNamespace(
9797
$defaultNamespace = Str::of($defaultNamespace)->trim('\\');
9898

9999
if (! $controllerClass->contains($defaultNamespace)) {
100-
return $controllerClass;
100+
return $controllerClass->prepend('.');
101101
}
102102

103-
return $controllerClass->replace($defaultNamespace, '')->trim('\\')->prepend('.');
103+
return $controllerClass->replace($defaultNamespace, '')->trim('\\');
104104
}
105105

106106
protected function resolveRouteParameters(

‎tests/Laravel/Actions/ResolveLaravelRoutControllerCollectionsActionTest.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function (RouteCollection $routes) {
3838
expect($routes->controllers)->toHaveCount(1);
3939
expect($routes->closures)->toBeEmpty();
4040

41-
$actions = $routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions;
41+
$actions = $routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions;
4242

4343
expect($actions)->toHaveCount(1);
4444
expect($actions['update'])->toBeInstanceOf(RouteControllerAction::class);
@@ -55,7 +55,7 @@ function (RouteCollection $routes) {
5555
expect($routes->controllers)->toHaveCount(1);
5656
expect($routes->closures)->toBeEmpty();
5757

58-
$controller = $routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController'];
58+
$controller = $routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController'];
5959

6060
expect($controller)->toBeInstanceOf(RouteInvokableController::class);
6161
expect($controller->url)->toBe('invokable');
@@ -71,7 +71,7 @@ function (RouteCollection $routes) {
7171
expect($routes->controllers)->toHaveCount(1);
7272
expect($routes->closures)->toBeEmpty();
7373

74-
$controller = $routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController'];
74+
$controller = $routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController'];
7575

7676
expect($controller)->toBeInstanceOf(RouteController::class);
7777
expect($controller->actions)->toHaveCount(7);
@@ -181,9 +181,9 @@ function (RouteCollection $routes) {
181181

182182
expect($routes->closures['Closure(simple)']->name)->toBe('simple');
183183

184-
expect($routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController']->name)->toBe('invokable');
184+
expect($routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController']->name)->toBe('invokable');
185185

186-
$resourceController = $routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController'];
186+
$resourceController = $routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController'];
187187

188188
expect($resourceController->actions['index']->name)->toBe('resource.index');
189189
expect($resourceController->actions['show']->name)->toBe('resource.show');
@@ -203,8 +203,8 @@ function (RouteCollection $routes) {
203203
$routes = app(ResolveLaravelRoutControllerCollectionsAction::class)->execute('Spatie\TypeScriptTransformer\Tests\Laravel\FakeClasses', true);
204204

205205
expect($routes->controllers)->toHaveCount(2)->toHaveKeys([
206-
'Symfony.Component.HttpKernel.Controller.ErrorController',
207-
'.InvokableController',
206+
'.Symfony.Component.HttpKernel.Controller.ErrorController',
207+
'InvokableController',
208208
]);
209209
});
210210

@@ -234,10 +234,10 @@ function (RouteCollection $routes) {
234234
expect($routes->controllers)
235235
->toHaveCount(2)
236236
->toHaveKeys([
237-
'Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController',
238-
'Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController',
237+
'.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController',
238+
'.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController',
239239
]);
240-
expect($routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions)
240+
expect($routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions)
241241
->toHaveCount(5)
242242
->toHaveKeys([
243243
'show',
@@ -259,14 +259,14 @@ function (RouteCollection $routes) {
259259
WithoutRoutes::controller(ResourceController::class),
260260
function (RouteCollection $routes) {
261261
expect($routes->closures)->toHaveCount(1);
262-
expect($routes->controllers)->toHaveCount(1)->toHaveKey('Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController');
262+
expect($routes->controllers)->toHaveCount(1)->toHaveKey('.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController');
263263
},
264264
];
265265
yield 'multiple controllers' => [
266266
WithoutRoutes::controller(ResourceController::class),
267267
function (RouteCollection $routes) {
268268
expect($routes->closures)->toHaveCount(1);
269-
expect($routes->controllers)->toHaveCount(1)->toHaveKey('Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController');
269+
expect($routes->controllers)->toHaveCount(1)->toHaveKey('.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController');
270270
},
271271
];
272272
yield 'controller wildcard' => [
@@ -283,10 +283,10 @@ function (RouteCollection $routes) {
283283
expect($routes->controllers)
284284
->toHaveCount(2)
285285
->toHaveKeys([
286-
'Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController',
287-
'Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController',
286+
'.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController',
287+
'.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.InvokableController',
288288
]);
289-
expect($routes->controllers['Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions)
289+
expect($routes->controllers['.Spatie.TypeScriptTransformer.Tests.Laravel.FakeClasses.ResourceController']->actions)
290290
->toHaveCount(5)
291291
->toHaveKeys([
292292
'show',

0 commit comments

Comments
 (0)