diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Routing] Ensure uniqueness without repeated check

Browse Source
This commit is contained in:
endroid 2017-10-14 00:01:11 +00:00 committed by Fabien Potencier
parent 42390a2b00
commit 16f7281178
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Routing/RouteCollection.php
View File

@ -128,7 +128,9 @@ class RouteCollection implements \IteratorAggregate, \Countable
$this->routes[$name] = $route;
}
$this->resources = array_merge($this->resources, $collection->getResources());
foreach ($collection->getResources() as $resource) {
$this->addResource($resource);
}
}
/**
@ -262,16 +264,21 @@ class RouteCollection implements \IteratorAggregate, \Countable
*/
public function getResources()
{
return array_unique($this->resources);
return array_values($this->resources);
}
/**
* Adds a resource for this collection.
* Adds a resource for this collection. If the resource already exists
* it is not added.
*
* @param ResourceInterface $resource A resource instance
*/
public function addResource(ResourceInterface $resource)
{
$this->resources[] = $resource;
$key = (string) $resource;
if (!isset($this->resources[$key])) {
$this->resources[$key] = $resource;
}
}
}