Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | 1fec387a4317 |
children |
line wrap: on
line diff
--- a/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php Tue Jul 10 15:07:59 2018 +0100 +++ b/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php Thu Feb 28 13:21:36 2019 +0000 @@ -59,7 +59,7 @@ * * @see Symfony\Component\HttpKernel\HttpCache\SurrogateInterface */ - public function render($uri, Request $request, array $options = array()) + public function render($uri, Request $request, array $options = []) { if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) { if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) { @@ -92,13 +92,13 @@ // we need to sign the absolute URI, but want to return the path only. $fragmentUri = $this->signer->sign($this->generateFragmentUri($uri, $request, true)); - return substr($fragmentUri, strlen($request->getSchemeAndHttpHost())); + return substr($fragmentUri, \strlen($request->getSchemeAndHttpHost())); } private function containsNonScalars(array $values) { foreach ($values as $value) { - if (is_array($value)) { + if (\is_array($value)) { return $this->containsNonScalars($value); } elseif (!is_scalar($value) && null !== $value) { return true;