Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Addressing some documentation and code style issues

8.0.x
Katherine Bailey 2012-07-28 21:12:19 -07:00
parent 5d8b06a17f
commit 0b29221849
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/includes/path.inc
View File

@ -218,8 +218,11 @@ function drupal_cache_system_paths() {
// after we have left the scope of the Request, the call to current_path()
// here does not return the system path, and instead calls out to
// _current_path(), which returns the alias. So the alias gets used as the
// key instead. There is a separate issue for fixing up the path alias logic
// here: http://drupal.org/node/1269742
// key instead. At lookup time, whether the alias or the source is used as
// the key depends on when the first call to url() is made for that path.
// If this is within the request scope, it uses the system_path and so will
// be a cache miss. There is a separate issue for fixing up the path alias
// logic here: http://drupal.org/node/1269742
// Generate a cache ID (cid) specifically for this page.
$cid = current_path();
@ -369,6 +372,8 @@ function current_path() {
if (drupal_container()->has('request')) {
return drupal_container()->get('request')->attributes->get('system_path');
}
// If we are outside the request scope, e.g. during $kernel->terminate, fall
// back to using the path stored in _current_path().
return _current_path();
}

3
core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
View File

@ -7,6 +7,7 @@
namespace Drupal\Core\DependencyInjection\Compiler;
use InvalidArgumentException;
use ReflectionClass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@ -29,7 +30,7 @@ class RegisterKernelListenersPass implements CompilerPassInterface
$refClass = new ReflectionClass($class);
$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
if (!$refClass->implementsInterface($interface)) {
throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
}
$definition->addMethodCall('addSubscriberService', array($id, $class));
}