Skip to content

Commit a06a0dc

Browse files
authored
Fix breaking change - Revert "[11.x] Replace string class names with ::class constants" (#54185)
* Revert "refactor from string class names to constant (#54134)" This reverts commit aed6bbe. * Add failing test for #54185
1 parent f99942d commit a06a0dc

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/Illuminate/Foundation/Console/RouteListCommand.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ protected function isVendorRoute(Route $route)
250250
protected function isFrameworkController(Route $route)
251251
{
252252
return in_array($route->getControllerClass(), [
253-
\Illuminate\Routing\RedirectController::class,
254-
\Illuminate\Routing\ViewController::class,
253+
'\Illuminate\Routing\RedirectController',
254+
'\Illuminate\Routing\ViewController',
255255
], true);
256256
}
257257

src/Illuminate/Routing/Router.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function fallback($action)
258258
*/
259259
public function redirect($uri, $destination, $status = 302)
260260
{
261-
return $this->any($uri, \Illuminate\Routing\RedirectController::class)
261+
return $this->any($uri, '\Illuminate\Routing\RedirectController')
262262
->defaults('destination', $destination)
263263
->defaults('status', $status);
264264
}
@@ -287,7 +287,7 @@ public function permanentRedirect($uri, $destination)
287287
*/
288288
public function view($uri, $view, $data = [], $status = 200, array $headers = [])
289289
{
290-
return $this->match(['GET', 'HEAD'], $uri, \Illuminate\Routing\ViewController::class)
290+
return $this->match(['GET', 'HEAD'], $uri, '\Illuminate\Routing\ViewController')
291291
->setDefaults([
292292
'view' => $view,
293293
'data' => $data,

tests/Routing/RouteRegistrarTest.php

+9
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,15 @@ public function testCanRegisterGroupWithNamespace()
344344
'App\Http\Controllers\UsersController@index',
345345
$this->getRoute()->getAction()['uses']
346346
);
347+
348+
$this->router->namespace('App\Http\Controllers')->group(function ($router) {
349+
$router->redirect('users', '/');
350+
});
351+
352+
$this->assertSame(
353+
'\Illuminate\Routing\RedirectController@__invoke',
354+
$this->getRoute()->getAction()['uses']
355+
);
347356
}
348357

349358
public function testCanRegisterGroupWithPrefix()

0 commit comments

Comments
 (0)