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

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

Browse source
This commit is contained in:
Pantheon Automation 2016-07-07 09:44:38 -07:00 • committed by Greg Anderson
parent 13b6ca7cc2
commit 38ba7c357d
342 changed files with 7814 additions and 1534 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
View file

@ -2,10 +2,27 @@
namespace Drupal\Core\Routing;
/**
* Rebuilds the route information and dumps it.
*
* Rebuilding the route information is the process of gathering all routing data
* from .routing.yml files, creating a
* \Symfony\Component\Routing\RouteCollection object out of it, and dispatching
* that object as a \Drupal\Core\Routing\RouteBuildEvent to all registered
* listeners. After that, the \Symfony\Component\Routing\RouteCollection object
* is used to dump the data. Examples of a dump include filling up the routing
* table, auto-generating Apache mod_rewrite rules, or auto-generating a PHP
* matcher class.
*
* @see \Drupal\Core\Routing\MatcherDumperInterface
* @see \Drupal\Core\Routing\RouteProviderInterface
*
* @ingroup routing
*/
interface RouteBuilderInterface {
/**
* Rebuilds the route info and dumps to dumper.
* Rebuilds the route information and dumps it.
*
* @return bool
* Returns TRUE if the rebuild succeeds, FALSE otherwise.
@ -13,7 +30,7 @@ interface RouteBuilderInterface {
public function rebuild();
/**
* Rebuilds the route info and dumps to dumper if necessary.
* Rebuilds the route information if necessary, and dumps it.
*
* @return bool
* Returns TRUE if the rebuild occurs, FALSE otherwise.

8
core/lib/Drupal/Core/Routing/UrlGenerator.php
View file

@ -229,10 +229,8 @@ class UrlGenerator implements UrlGeneratorInterface {
// Add a query string if needed, including extra parameters.
$query_params += array_diff_key($parameters, $variables, $defaults);
if ($query_params && $query = http_build_query($query_params, '', '&')) {
// "/" and "?" can be left decoded for better user experience, see
// http://tools.ietf.org/html/rfc3986#section-3.4
$url .= '?' . strtr($query, array('%2F' => '/'));
if ($query_params && $query = UrlHelper::buildQuery($query_params)) {
$url .= '?' . $query;
}
return $url;
@ -253,7 +251,7 @@ class UrlGenerator implements UrlGeneratorInterface {
* $parameters merged in.
*
* @return string
* The url path corresponding to the route, without the base path.
* The url path corresponding to the route, without the base path.
*/
protected function getInternalPathFromRoute($name, SymfonyRoute $route, $parameters = array(), $query_params = array()) {
// The Route has a cache of its own and is not recompiled as long as it does

2
core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
View file

@ -21,7 +21,7 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
* \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
*
* @return string
* The internal Drupal path corresponding to the route.
* The internal Drupal path corresponding to the route.
*/
public function getPathFromRoute($name, $parameters = array());