update2
This commit is contained in:
parent
98419bd18d
commit
8a69e45efa
4919 changed files with 28311 additions and 224136 deletions
23
pfosten/vendor/symfony/routing/RouteCollectionBuilder.php
vendored
Executable file → Normal file
23
pfosten/vendor/symfony/routing/RouteCollectionBuilder.php
vendored
Executable file → Normal file
|
|
@ -38,9 +38,6 @@ class RouteCollectionBuilder
|
|||
private $methods;
|
||||
private $resources = array();
|
||||
|
||||
/**
|
||||
* @param LoaderInterface $loader
|
||||
*/
|
||||
public function __construct(LoaderInterface $loader = null)
|
||||
{
|
||||
$this->loader = $loader;
|
||||
|
|
@ -79,11 +76,11 @@ class RouteCollectionBuilder
|
|||
foreach ($collection->getResources() as $resource) {
|
||||
$builder->addResource($resource);
|
||||
}
|
||||
|
||||
// mount into this builder
|
||||
$this->mount($prefix, $builder);
|
||||
}
|
||||
|
||||
// mount into this builder
|
||||
$this->mount($prefix, $builder);
|
||||
|
||||
return $builder;
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +118,7 @@ class RouteCollectionBuilder
|
|||
* @param string $prefix
|
||||
* @param RouteCollectionBuilder $builder
|
||||
*/
|
||||
public function mount($prefix, RouteCollectionBuilder $builder)
|
||||
public function mount($prefix, self $builder)
|
||||
{
|
||||
$builder->prefix = trim(trim($prefix), '/');
|
||||
$this->routes[] = $builder;
|
||||
|
|
@ -254,8 +251,6 @@ class RouteCollectionBuilder
|
|||
/**
|
||||
* Adds a resource for this collection.
|
||||
*
|
||||
* @param ResourceInterface $resource
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
private function addResource(ResourceInterface $resource)
|
||||
|
|
@ -318,10 +313,10 @@ class RouteCollectionBuilder
|
|||
|
||||
$routeCollection->addCollection($subCollection);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($this->resources as $resource) {
|
||||
$routeCollection->addResource($resource);
|
||||
}
|
||||
foreach ($this->resources as $resource) {
|
||||
$routeCollection->addResource($resource);
|
||||
}
|
||||
|
||||
return $routeCollection;
|
||||
|
|
@ -365,7 +360,7 @@ class RouteCollectionBuilder
|
|||
if ($this->loader->supports($resource, $type)) {
|
||||
$collections = $this->loader->load($resource, $type);
|
||||
|
||||
return is_array($collections) ? $collections : array($collections);
|
||||
return \is_array($collections) ? $collections : array($collections);
|
||||
}
|
||||
|
||||
if (null === $resolver = $this->loader->getResolver()) {
|
||||
|
|
@ -378,6 +373,6 @@ class RouteCollectionBuilder
|
|||
|
||||
$collections = $loader->load($resource, $type);
|
||||
|
||||
return is_array($collections) ? $collections : array($collections);
|
||||
return \is_array($collections) ? $collections : array($collections);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue