Merge pull request #30 from aequasi/master

Fixing reference replacement

Author: cryptiklemur

src/DependencyInjection/CacheAdapterExtension.php

@@ -48,11 +48,7 @@ public function load(array $configs, ContainerBuilder $container)
             $factoryClass::validate($arguments['options'], $name);
 
             // See if any option has a service reference
-            foreach ($arguments['options'] as $key => $value) {
-                if (substr($key, -8) === '_service' || strpos($value, '@') === 0) {
-                    $arguments['options'][$key] = new Reference($value);
-                }
-            }
+            $arguments['options'] = $this->findReferences($arguments['options']);
 
             $def = $container->register('cache.provider.'.$name, DummyAdapter::class);
             $def->setFactory([new Reference($arguments['factory']), 'createAdapter'])
@@ -63,4 +59,22 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setAlias('cache', 'cache.provider.'.$first);
     }
+
+    /**
+     * @param array $options
+     *
+     * @return array
+     */
+    private function findReferences(array $options)
+    {
+        foreach ($options as $key => $value) {
+            if (is_array($value)) {
+                $options[$key] = $this->findReferences($value);
+            } elseif (substr($key, -8) === '_service' || strpos($value, '@') === 0) {
+                $options[$key] = new Reference(ltrim($value, '@'));
+            }
+        }
+
+        return $options;
+    }
 }