Bug #18245: Make resolving DI references inside of arrays in dependen…

…cies optional

Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
Co-authored-by: Andrii Vasyliev <sol@hiqdev.com>

CHANGELOG.md

@@ -18,7 +18,7 @@ Yii Framework 2 Change Log
 - Bug #15265: PostgreSQL > 10.0 is not pass tests with default value of timestamp CURRENT_TIMESTAMP (terabytesoftw)
 - Bug #18232: Fail tests pgsql v-10.14, v-11.9, v-12-latest (terabytesoftw)
 - Bug #16892: Validation error class was not applied to checkbox and radio when validationStateOn = self::VALIDATION_STATE_ON_INPUT (dan-szabo, samdark)
-
+- Bug #18245: Make resolving DI references inside of arrays in dependencies optional (SamMousa, samdark, hiqsol)
 
 2.0.37 August 07, 2020
 ----------------------

UPGRADE.md

@@ -51,6 +51,12 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to follow the instructions
 for both A and B.
 
+Upgrade from Yii 2.0.37
+-----------------------
+
+* Resolving DI references inside of arrays in dependencies was made optional and turned off by default. In order
+  to turn it on, set `resolveArrays` of container instance to `true`.
+
 Upgrade from Yii 2.0.36
 -----------------------
 

di/Container.php

@@ -94,6 +94,8 @@
  * @property array $definitions The list of the object definitions or the loaded shared objects (type or ID =>
  * definition or instance). This property is read-only.
  *
+ * @property bool $resolveArrays whether to attempt to resolve elements in array dependencies
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
@@ -121,6 +123,10 @@ class Container extends Component
      */
     private $_dependencies = [];
 
+    /**
+     * @var bool whether to attempt to resolve elements in array dependencies
+     */
+    private $_resolveArrays = false;
 
     /**
      * Returns an instance of the requested class.
@@ -491,7 +497,7 @@ protected function resolveDependencies($dependencies, $reflection = null)
                     $class = $reflection->getName();
                     throw new InvalidConfigException("Missing required parameter \"$name\" when instantiating \"$class\".");
                 }
-            } elseif (is_array($dependency)) {
+            } elseif ($this->_resolveArrays && is_array($dependency)) {
                 $dependencies[$index] = $this->resolveDependencies($dependency, $reflection);
             }
         }
@@ -682,4 +688,13 @@ public function setSingletons(array $singletons)
             $this->setSingleton($class, $definition);
         }
     }
+
+    /**
+     * @param bool $value whether to attempt to resolve elements in array dependencies
+     * @since 2.0.37
+     */
+    public function setResolveArrays($value)
+    {
+        $this->_resolveArrays = (bool) $value;
+    }
 }