Skip to content

Fix breaking change - Revert "[11.x] Replace string class names with ::class constants" #54185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Fix breaking change - Revert "[11.x] Replace string class names with ::class constants" #54185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2f1486
Revert "refactor from string class names to constant (#54134)"
SanderMuller Jan 14, 2025
52d0d3a
Add failing test for #54185
SanderMuller Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Illuminate/Foundation/Console/RouteListCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ protected function isVendorRoute(Route $route)
protected function isFrameworkController(Route $route)
{
return in_array($route->getControllerClass(), [
\Illuminate\Routing\RedirectController::class,
\Illuminate\Routing\ViewController::class,
'\Illuminate\Routing\RedirectController',
'\Illuminate\Routing\ViewController',
Comment on lines +253 to +254
Copy link
Contributor

@shaedrich shaedrich Jan 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'\Illuminate\Routing\RedirectController',
'\Illuminate\Routing\ViewController',
'\\' . Illuminate\Routing\RedirectController::class,
'\\' . Illuminate\Routing\ViewController::class,

probably isn't much better, is it?

], true);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Routing/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function fallback($action)
*/
public function redirect($uri, $destination, $status = 302)
{
return $this->any($uri, \Illuminate\Routing\RedirectController::class)
return $this->any($uri, '\Illuminate\Routing\RedirectController')
->defaults('destination', $destination)
->defaults('status', $status);
}
Expand Down Expand Up @@ -287,7 +287,7 @@ public function permanentRedirect($uri, $destination)
*/
public function view($uri, $view, $data = [], $status = 200, array $headers = [])
{
return $this->match(['GET', 'HEAD'], $uri, \Illuminate\Routing\ViewController::class)
return $this->match(['GET', 'HEAD'], $uri, '\Illuminate\Routing\ViewController')
->setDefaults([
'view' => $view,
'data' => $data,
Expand Down
9 changes: 9 additions & 0 deletions tests/Routing/RouteRegistrarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,15 @@ public function testCanRegisterGroupWithNamespace()
'App\Http\Controllers\UsersController@index',
$this->getRoute()->getAction()['uses']
);

$this->router->namespace('App\Http\Controllers')->group(function ($router) {
$router->redirect('users', '/');
});

$this->assertSame(
'\Illuminate\Routing\RedirectController@__invoke',
$this->getRoute()->getAction()['uses']
);
}

public function testCanRegisterGroupWithPrefix()
Expand Down