opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

16
vendor/symfony-cmf/routing/Candidates/Candidates.php vendored
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.
@ -60,7 +60,7 @@ class Candidates implements CandidatesInterface
}
/**
* {@inheritDoc}
* {@inheritdoc}
*
* Always returns true.
*/
@ -70,7 +70,7 @@ class Candidates implements CandidatesInterface
}
/**
* {@inheritDoc}
* {@inheritdoc}
*
* Does nothing.
*/
@ -79,7 +79,7 @@ class Candidates implements CandidatesInterface
}
/**
* {@inheritDoc}
* {@inheritdoc}
*/
public function getCandidates(Request $request)
{
@ -99,7 +99,7 @@ class Candidates implements CandidatesInterface
*
* @param string $url The url to determine the locale from.
*
* @return string|boolean The locale if $url starts with one of the allowed locales.
* @return string|bool The locale if $url starts with one of the allowed locales.
*/
protected function determineLocale($url)
{
@ -108,7 +108,7 @@ class Candidates implements CandidatesInterface
}
$matches = array();
if (preg_match('#(' . implode('|', $this->locales) . ')(/|$)#', $url, $matches)) {
if (preg_match('#('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
return $matches[1];
}
@ -132,7 +132,7 @@ class Candidates implements CandidatesInterface
if ('/' !== $url) {
// handle format extension, like .html or .json
if (preg_match('/(.+)\.[a-z]+$/i', $url, $matches)) {
$candidates[] = $prefix . $url;
$candidates[] = $prefix.$url;
$url = $matches[1];
}
@ -142,7 +142,7 @@ class Candidates implements CandidatesInterface
if (++$count > $this->limit) {
return $candidates;
}
$candidates[] = $prefix . $part;
$candidates[] = $prefix.$part;
$part = substr($url, 0, $pos);
}
}

4
vendor/symfony-cmf/routing/Candidates/CandidatesInterface.php vendored
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.
@ -33,7 +33,7 @@ interface CandidatesInterface
*
* @param string $name
*
* @return boolean
* @return bool
*/
public function isCandidate($name);