diff vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.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
line wrap: on
line diff
--- a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php	Thu Feb 28 13:21:36 2019 +0000
@@ -42,7 +42,7 @@
         try {
             parent::process($container);
 
-            $aliases = array();
+            $aliases = [];
             foreach ($container->getAliases() as $name => $target) {
                 $this->currentId = $name;
                 $aliases[$this->bag->resolveValue($name)] = $target;
@@ -60,10 +60,10 @@
 
     protected function processValue($value, $isRoot = false)
     {
-        if (is_string($value)) {
+        if (\is_string($value)) {
             $v = $this->bag->resolveValue($value);
 
-            return $this->resolveArrays || !$v || !is_array($v) ? $v : $value;
+            return $this->resolveArrays || !$v || !\is_array($v) ? $v : $value;
         }
         if ($value instanceof Definition) {
             $value->setBindings($this->processValue($value->getBindings()));
@@ -78,7 +78,7 @@
 
         $value = parent::processValue($value, $isRoot);
 
-        if ($value && is_array($value)) {
+        if ($value && \is_array($value)) {
             $value = array_combine($this->bag->resolveValue(array_keys($value)), $value);
         }