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:
Pantheon Automation 2016-10-06 15:16:20 -07:00 committed by Greg Anderson
parent 2f563ab520
commit f1c8716f57
1732 changed files with 52334 additions and 11780 deletions

View file

@ -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.
@ -12,7 +12,6 @@
namespace Symfony\Cmf\Component\Routing\Enhancer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
/**
@ -49,7 +48,7 @@ class RouteContentEnhancer implements RouteEnhancerInterface
* If the route has a non-null content and if that content class is in the
* injected map, returns that controller.
*
* {@inheritDoc}
* {@inheritdoc}
*/
public function enhance(array $defaults, Request $request)
{
@ -58,8 +57,8 @@ class RouteContentEnhancer implements RouteEnhancerInterface
return $defaults;
}
if (! isset($defaults[$this->routefield])
|| ! $defaults[$this->routefield] instanceof RouteObjectInterface
if (!isset($defaults[$this->routefield])
|| !$defaults[$this->routefield] instanceof RouteObjectInterface
) {
// we can't determine the content
return $defaults;
@ -68,7 +67,7 @@ class RouteContentEnhancer implements RouteEnhancerInterface
$route = $defaults[$this->routefield];
$content = $route->getContent();
if (! $content) {
if (!$content) {
// we have no content
return $defaults;
}