Changeset 19581

Timestamp:

06/26/09 09:14:12 (8 months ago)

Author:

fabien

Message:

[dependency_injection] changed configurator to allow the class to be defined as a parameter

Files:

• components/dependency_injection/trunk/lib/sfServiceContainerBuilder.php (modified) (1 diff)
• components/dependency_injection/trunk/lib/sfServiceContainerDumperPhp.php (modified) (1 diff)

components/dependency_injection/trunk/lib/sfServiceContainerBuilder.php

@@ -220 +220 @@
-        $callable[0] = $this->getService((string) $callable[0]);
-      }
+      elseif (is_array($callable))
+      {
+        $callable[0] = $this->resolveValue($callable[0]);
+      }
-
-      if (!is_callable($callable))

components/dependency_injection/trunk/lib/sfServiceContainerDumperPhp.php

@@ -153 +153 @@
-        else
-        {
-%s::%s(\$instance);\n", $callable[0]
+call_user_func(array(%s, '%s'), \$instance);\n", $this->dumpValue($callable[0])
-        }
-      }