Zend\Di Shared Support hotfix for type checking of shared configurati…

…on status
zendframework · Mar 20, 2012 · 7784cd5 · 7784cd5
1 parent 4ed737c
commit 7784cd5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -601,7 +601,7 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
                 }
                 array_push($this->currentDependencies, $class);
                 $dConfig = $this->instanceManager->getConfiguration($computedParams['required'][$fqParamPos][0]);
-                if ($dConfig['shared'] == false) {
+                if ($dConfig['shared'] === false) {
                     $resolvedParams[$index] = $this->newInstance($computedParams['required'][$fqParamPos][0], $callTimeUserParams, false);
                 } else {
                     $resolvedParams[$index] = $this->get($computedParams['required'][$fqParamPos][0], $callTimeUserParams);

diff --git a/src/InstanceManager.php b/src/InstanceManager.php
@@ -244,7 +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(),
+            'shared'     => isset($configuration['shared'])     ? $configuration['shared']     : true
         );
         $this->configurations[$key] = array_replace_recursive($this->configurations[$key], $configuration);
     }

diff --git a/test/ConfigurationTest.php b/test/ConfigurationTest.php
@@ -34,11 +34,11 @@ public function testConfigurationCanConfigureInstanceManagerWithIniFile()
         $this->assertContains('my-dbAdapter', $im->getTypePreferences('my-mapper'));
 
         $this->assertTrue($im->hasConfiguration('My\DbAdapter'));
-        $expected = array('parameters' => array('username' => 'readonly', 'password' => 'mypassword'), 'injections' => array(), 'shared' => array());
+        $expected = array('parameters' => array('username' => 'readonly', 'password' => 'mypassword'), 'injections' => array(), 'shared' => true);
         $this->assertEquals($expected, $im->getConfiguration('My\DbAdapter'));
 
         $this->assertTrue($im->hasConfiguration('my-dbAdapter'));
-        $expected = array('parameters' => array('username' => 'readwrite'), 'injections' => array(), 'shared' => array());
+        $expected = array('parameters' => array('username' => 'readwrite'), 'injections' => array(), 'shared' => true);
         $this->assertEquals($expected, $im->getConfiguration('my-dbAdapter'));
     }
 

diff --git a/test/InstanceManagerTest.php b/test/InstanceManagerTest.php
@@ -71,7 +71,7 @@ public function testInstanceManagerResolvesRecursiveAliasesForConfiguration()
         $im->setConfiguration('bar-alias', $config);
 
         $config['injections'] = array();
-        $config['shared'] = array();
+        $config['shared'] = true;
 
         $this->assertEquals($config, $im->getConfiguration('foo-alias'));
     }