Zend\Di new feature: ability to mark types as not-shared (always new …

…instances)
Hanssillekens · Mar 17, 2012 · 4b2ec0c · 4b2ec0c
1 parent b95fca2
commit 4b2ec0c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/library/Zend/Di/Configuration.php b/library/Zend/Di/Configuration.php
@@ -137,6 +137,10 @@ public function configureInstance(Di $di, $instanceData)
                             case 'injection':
                                 $im->setInjections($target, $v);
                                 break;
+                            case 'shared':
+                            case 'share':
+                                $im->setShared($target, $v);
+                                break;
                         }
                     }
             }

diff --git a/library/Zend/Di/Definition/Builder/PhpClass.php b/library/Zend/Di/Definition/Builder/PhpClass.php
@@ -8,6 +8,7 @@ class PhpClass
     protected $name                 = null;
     protected $instantiator         = '__construct';
     protected $injectionMethods     = array();
+    protected $superTypes           = array();
 
     public function setName($name)
     {

diff --git a/library/Zend/Di/Di.php b/library/Zend/Di/Di.php
@@ -456,7 +456,6 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
             // PRIORITY 1 - consult user provided parameters
             if (isset($callTimeUserParams[$fqParamPos]) || isset($callTimeUserParams[$name])) {
 
-                // @todo FQ Name in call time params
                 if (isset($callTimeUserParams[$fqParamPos])) {
                     $callTimeCurValue =& $callTimeUserParams[$fqParamPos];
                 } elseif (isset($callTimeUserParams[$fqParamName])) {
@@ -501,7 +500,6 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
                     || isset($iConfig[$thisIndex]['parameters'][$fqParamName])
                     || isset($iConfig[$thisIndex]['parameters'][$name])) {
 
-                    // @todo FQ Name in config parameters
                     if (isset($iConfig[$thisIndex]['parameters'][$fqParamPos])) {
                         $iConfigCurValue =& $iConfig[$thisIndex]['parameters'][$fqParamPos];
                     } elseif (isset($iConfig[$thisIndex]['parameters'][$fqParamName])) {
@@ -602,7 +600,13 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
                     );
                 }
                 array_push($this->currentDependencies, $class);
-                $resolvedParams[$index] = $this->get($computedParams['required'][$fqParamPos][0], $callTimeUserParams);
+                $dConfig = $this->instanceManager->getConfiguration($computedParams['required'][$fqParamPos][0]);
+                if ($dConfig['shared'] == false) {
+                    $resolvedParams[$index] = $this->newInstance($computedParams['required'][$fqParamPos][0], $callTimeUserParams, false);
+                } else {
+                    $resolvedParams[$index] = $this->get($computedParams['required'][$fqParamPos][0], $callTimeUserParams);
+                }
+
                 array_pop($this->currentDependencies);
 
             } elseif (!array_key_exists($fqParamPos, $computedParams['optional'])) {

diff --git a/library/Zend/Di/InstanceManager.php b/library/Zend/Di/InstanceManager.php
@@ -37,6 +37,10 @@ class InstanceManager /* implements InstanceCollection */
          * injection type => array of ordered method params
          */
         'injections' => array(),
+        /**
+         * alias|class => bool
+         */
+        'shared' => true
         );
 
     /**
@@ -240,6 +244,7 @@ public function setConfiguration($aliasOrClass, array $configuration, $append =
         $configuration = array(
             'parameters' => isset($configuration['parameters']) ? $configuration['parameters'] : array(),
             'injections' => isset($configuration['injections']) ? $configuration['injections'] : array(),
+            'shared'     => isset($configuration['shared'])     ? $configuration['shared']     : array(),
         );
         $this->configurations[$key] = array_replace_recursive($this->configurations[$key], $configuration);
     }
@@ -287,7 +292,11 @@ public function setInjections($aliasOrClass, array $injections)
     {
         return $this->setConfiguration($aliasOrClass, array('injections' => $injections), true);
     }
-
+
+    public function setShared($aliasOrClass, $isShared)
+    {
+        return $this->setConfiguration($aliasOrClass, array('shared' => $isShared), true);
+    }
 
     public function hasTypePreferences($interfaceOrAbstract)
     {