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

2
core/lib/Drupal/Component/DependencyInjection/Container.php
View file

@ -373,7 +373,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
* {@inheritdoc}
*/
public function has($id) {
return isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
return isset($this->aliases[$id]) || isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
}
/**

4
core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
View file

@ -60,6 +60,7 @@ class OptimizedPhpArrayDumper extends Dumper {
*/
public function getArray() {
$definition = array();
$this->aliases = $this->getAliases();
$definition['aliases'] = $this->getAliases();
$definition['parameters'] = $this->getParameters();
$definition['services'] = $this->getServiceDefinitions();
@ -454,6 +455,9 @@ class OptimizedPhpArrayDumper extends Dumper {
}
// Private shared service.
if (isset($this->aliases[$id])) {
$id = $this->aliases[$id];
}
$definition = $this->container->getDefinition($id);
if (!$definition->isPublic()) {
// The ContainerBuilder does not share a private service, but this means a

4
core/lib/Drupal/Component/DependencyInjection/composer.json
View file

@ -12,8 +12,8 @@
},
"require": {
"php": ">=5.5.9",
"symfony/dependency-injection": "2.7.*",
"symfony/expression-language": "2.7.*"
"symfony/dependency-injection": "~2.8",
"symfony/expression-language": "~2.7"
},
"autoload": {
"psr-4": {