github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 17:57:04 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

Require unique route names (#2771)

Browse Source
This commit is contained in:
Sami Mazouz 2021-04-10 20:38:25 +01:00 committed by GitHub
parent 68f0dc4d4c
commit 598bb94657
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Extend/Frontend.php
View File

@ -62,7 +62,7 @@ class Frontend implements ExtenderInterface
public function removeRoute(string $name)
{
$this->removedRoutes[] = compact('name');
$this->removedRoutes[] = $name;
return $this;
}
@ -159,8 +159,8 @@ class Frontend implements ExtenderInterface
/** @var RouteHandlerFactory $factory */
$factory = $container->make(RouteHandlerFactory::class);
foreach ($this->removedRoutes as $route) {
$collection->removeRoute('GET', $route['name']);
foreach ($this->removedRoutes as $routeName) {
$collection->removeRoute($routeName);
}
foreach ($this->routes as $route) {

8
framework/core/src/Extend/Routes.php
View File

@ -63,9 +63,9 @@ class Routes implements ExtenderInterface
return $this;
}
public function remove(string $method, string $name)
public function remove(string $name)
{
$this->removedRoutes[] = compact('method', 'name');
$this->removedRoutes[] = $name;
return $this;
}
@ -82,8 +82,8 @@ class Routes implements ExtenderInterface
/** @var RouteHandlerFactory $factory */
$factory = $container->make(RouteHandlerFactory::class);
foreach ($this->removedRoutes as $route) {
$collection->removeRoute($route['method'], $route['name']);
foreach ($this->removedRoutes as $routeName) {
$collection->removeRoute($routeName);
}
foreach ($this->routes as $route) {

24
framework/core/src/Http/RouteCollection.php
View File

@ -73,34 +73,32 @@ class RouteCollection
public function addRoute($method, $path, $name, $handler)
{
if (isset($this->routes[$method][$name])) {
throw new \RuntimeException("Route $name on method $method already exists");
if (isset($this->routes[$name])) {
throw new \RuntimeException("Route $name already exists");
}
$this->routes[$method][$name] = $this->pendingRoutes[$method][$name] = compact('path', 'handler');
$this->routes[$name] = $this->pendingRoutes[$name] = compact('method', 'path', 'handler');
return $this;
}
public function removeRoute(string $method, string $name): self
public function removeRoute(string $name): self
{
unset($this->routes[$method][$name], $this->pendingRoutes[$method][$name]);
unset($this->routes[$name], $this->pendingRoutes[$name]);
return $this;
}
protected function applyRoutes(): void
{
foreach ($this->pendingRoutes as $method => $routes) {
foreach ($routes as $name => $route) {
$routeDatas = $this->routeParser->parse($route['path']);
foreach ($this->pendingRoutes as $name => $route) {
$routeDatas = $this->routeParser->parse($route['path']);
foreach ($routeDatas as $routeData) {
$this->dataGenerator->addRoute($method, $routeData, ['name' => $name, 'handler' => $route['handler']]);
}
$this->reverse[$name] = $routeDatas;
foreach ($routeDatas as $routeData) {
$this->dataGenerator->addRoute($route['method'], $routeData, ['name' => $name, 'handler' => $route['handler']]);
}
$this->reverse[$name] = $routeDatas;
}
$this->pendingRoutes = [];

4
framework/core/tests/integration/extenders/RoutesTest.php
View File

@ -55,7 +55,7 @@ class RoutesTest extends TestCase
{
$this->extend(
(new Extend\Routes('api'))
->remove('GET', 'forum.show')
->remove('forum.show')
);
$response = $this->send(
@ -72,7 +72,7 @@ class RoutesTest extends TestCase
{
$this->extend(
(new Extend\Routes('api'))
->remove('GET', 'forum.show')
->remove('forum.show')
->get('/', 'forum.show', CustomRoute::class)
);