Skip to content
Snippets Groups Projects
Commit 9067e6f3 authored by catch's avatar catch
Browse files

Issue #2614202 by alexpott, felribeiro, dawehner, catch:...

Issue #2614202 by alexpott, felribeiro, dawehner, catch: CoreServiceProvider::registerUuid() assumes all environments have the same functions available
parent c655b168
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -750,11 +750,20 @@ public function updateModules(array $module_list, array $module_filenames = arra ...@@ -750,11 +750,20 @@ public function updateModules(array $module_list, array $module_filenames = arra
/** /**
* 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);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment