linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-12-02 21:19:58 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update to laravel 5.7 and try getting autologin saved

Browse Source
This commit is contained in:
Kode
2018-10-14 20:50:32 +01:00
parent c3da17befc
commit 6501aacb1b
2402 changed files with 79064 additions and 28971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/symfony/routing/RouteCollectionBuilder.php vendored
View File

@@ -46,7 +46,7 @@ class RouteCollectionBuilder
/**
* Import an external routing resource and returns the RouteCollectionBuilder.
*
* $routes->import('blog.yml', '/blog');
* $routes->import('blog.yml', '/blog');
*
* @param mixed $resource
* @param string|null $prefix
@@ -58,7 +58,7 @@ class RouteCollectionBuilder
*/
public function import($resource, $prefix = '/', $type = null)
{
/** @var RouteCollection[] $collection */
/** @var RouteCollection[] $collections */
$collections = $this->load($resource, $type);
// create a builder from the RouteCollection
@@ -253,7 +253,7 @@ class RouteCollectionBuilder
*
* @return $this
*/
private function addResource(ResourceInterface $resource)
private function addResource(ResourceInterface $resource): self
{
$this->resources[] = $resource;
@@ -324,10 +324,8 @@ class RouteCollectionBuilder
/**
* Generates a route name based on details of this route.
*
* @return string
*/
private function generateRouteName(Route $route)
private function generateRouteName(Route $route): string
{
$methods = implode('_', $route->getMethods()).'_';
@@ -351,7 +349,7 @@ class RouteCollectionBuilder
*
* @throws FileLoaderLoadException If no loader is found
*/
private function load($resource, $type = null)
private function load($resource, string $type = null): array
{
if (null === $this->loader) {
throw new \BadMethodCallException('Cannot import other routing resources: you must pass a LoaderInterface when constructing RouteCollectionBuilder.');
@@ -360,7 +358,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()) {
@@ -373,6 +371,6 @@ class RouteCollectionBuilder
$collections = $loader->load($resource, $type);
return is_array($collections) ? $collections : array($collections);
return \is_array($collections) ? $collections : array($collections);
}
}