Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0
This commit is contained in:
parent
2f563ab520
commit
f1c8716f57
1732 changed files with 52334 additions and 11780 deletions
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* This file is part of the Symfony CMF package.
|
||||
*
|
||||
* (c) 2011-2014 Symfony CMF
|
||||
* (c) 2011-2015 Symfony CMF
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
@ -24,15 +24,15 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
|
|||
interface FinalMatcherInterface
|
||||
{
|
||||
/**
|
||||
* Matches a request against a route collection and returns exactly one result.
|
||||
*
|
||||
* @param RouteCollection $collection The collection against which to match.
|
||||
* @param Request $request The request to match.
|
||||
*
|
||||
* @return array An array of parameters
|
||||
*
|
||||
* @throws ResourceNotFoundException if none of the routes in $collection
|
||||
* matches $request
|
||||
*/
|
||||
* Matches a request against a route collection and returns exactly one result.
|
||||
*
|
||||
* @param RouteCollection $collection The collection against which to match.
|
||||
* @param Request $request The request to match.
|
||||
*
|
||||
* @return array An array of parameters
|
||||
*
|
||||
* @throws ResourceNotFoundException if none of the routes in $collection
|
||||
* matches $request
|
||||
*/
|
||||
public function finalMatch(RouteCollection $collection, Request $request);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* This file is part of the Symfony CMF package.
|
||||
*
|
||||
* (c) 2011-2014 Symfony CMF
|
||||
* (c) 2011-2015 Symfony CMF
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
@ -61,7 +61,7 @@ class NestedMatcher implements RequestMatcherInterface
|
|||
protected $sortedFilters = array();
|
||||
|
||||
/**
|
||||
* Constructs a new NestedMatcher
|
||||
* Constructs a new NestedMatcher.
|
||||
*
|
||||
* @param RouteProviderInterface $provider The route provider this matcher
|
||||
* should use
|
||||
|
@ -162,7 +162,7 @@ class NestedMatcher implements RequestMatcherInterface
|
|||
public function getRouteFilters()
|
||||
{
|
||||
if (empty($this->sortedFilters)) {
|
||||
$this->sortedFilters = $this->sortFilters();
|
||||
$this->sortedFilters = $this->sortFilters();
|
||||
}
|
||||
|
||||
return $this->sortedFilters;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* This file is part of the Symfony CMF package.
|
||||
*
|
||||
* (c) 2011-2014 Symfony CMF
|
||||
* (c) 2011-2015 Symfony CMF
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
@ -13,7 +13,6 @@ namespace Symfony\Cmf\Component\Routing\NestedMatcher;
|
|||
|
||||
use Symfony\Component\Routing\RouteCollection;
|
||||
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
|
||||
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* This file is part of the Symfony CMF package.
|
||||
*
|
||||
* (c) 2011-2014 Symfony CMF
|
||||
* (c) 2011-2015 Symfony CMF
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
@ -16,7 +16,6 @@ use Symfony\Component\Routing\RouteCollection;
|
|||
use Symfony\Component\Routing\Matcher\UrlMatcher as SymfonyUrlMatcher;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\RequestContext;
|
||||
|
||||
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
|
||||
|
||||
/**
|
||||
|
|
Reference in a new issue