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

Issue #2614202 by alexpott, felribeiro, dawehner, catch: CoreServiceProvider::registerUuid() assumes all environments have the same functions available

8.2.x
Nathaniel Catchpole 2016-04-28 12:03:21 +01:00
parent c655b16803
commit 9067e6f345
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Drupal/Core/DrupalKernel.php
View File

@ -750,11 +750,20 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/** /**
* Returns the container cache key based on the environment. * Returns the container cache key based on the environment.
* *
* The 'environment' consists of:
* - The kernel environment string.
* - The Drupal version constant.
* - The deployment identifier from settings.php. This allows custom
* deployments to force a container rebuild.
* - The operating system running PHP. This allows compiler passes to optimize
* services for different operating systems.
* - The paths to any additional container YAMLs from settings.php.
*
* @return string * @return string
* The cache key used for the service container. * The cache key used for the service container.
*/ */
protected function getContainerCacheKey() { protected function getContainerCacheKey() {
$parts = array('service_container', $this->environment, \Drupal::VERSION, Settings::get('deployment_identifier'), serialize(Settings::get('container_yamls'))); $parts = array('service_container', $this->environment, \Drupal::VERSION, Settings::get('deployment_identifier'), PHP_OS, serialize(Settings::get('container_yamls')));
return implode(':', $parts); return implode(':', $parts);
} }