comparison vendor/symfony/dependency-injection/Compiler/ResolveEnvPlaceholdersPass.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:21:36 +0000
parents 1fec387a4317
children
comparison
equal deleted inserted replaced
16:c2387f117808 17:129ea1e6d783
18 */ 18 */
19 class ResolveEnvPlaceholdersPass extends AbstractRecursivePass 19 class ResolveEnvPlaceholdersPass extends AbstractRecursivePass
20 { 20 {
21 protected function processValue($value, $isRoot = false) 21 protected function processValue($value, $isRoot = false)
22 { 22 {
23 if (is_string($value)) { 23 if (\is_string($value)) {
24 return $this->container->resolveEnvPlaceholders($value, true); 24 return $this->container->resolveEnvPlaceholders($value, true);
25 } 25 }
26 if ($value instanceof Definition) { 26 if ($value instanceof Definition) {
27 $changes = $value->getChanges(); 27 $changes = $value->getChanges();
28 if (isset($changes['class'])) { 28 if (isset($changes['class'])) {
33 } 33 }
34 } 34 }
35 35
36 $value = parent::processValue($value, $isRoot); 36 $value = parent::processValue($value, $isRoot);
37 37
38 if ($value && is_array($value) && !$isRoot) { 38 if ($value && \is_array($value) && !$isRoot) {
39 $value = array_combine($this->container->resolveEnvPlaceholders(array_keys($value), true), $value); 39 $value = array_combine($this->container->resolveEnvPlaceholders(array_keys($value), true), $value);
40 } 40 }
41 41
42 return $value; 42 return $value;
43 } 43 }