Merge remote-tracking branch 'zf2/master'

zendframework · Mar 6, 2012 · f82d7c5 · f82d7c5
commit f82d7c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -189,7 +189,11 @@ public function newInstance($name, array $params = array(), $isShared = true)
                     isset($instantiator[1]) ? $instantiator[1] : 'NoMethodGiven'
                 );
             } else {
-                $msg = 'Invalid instantiator';
+                $msg = sprintf(
+                    'Invalid instantiator of type "%s" for "%s".',
+                    gettype($instantiator),
+                    $name
+                );
             }
             throw new \RuntimeException($msg);
         }

diff --git a/test/ConfigurationTest.php b/test/ConfigurationTest.php
@@ -4,13 +4,14 @@
 
 use Zend\Di\Configuration,
     Zend\Di\Di,
+    Zend\Config\Factory as ConfigFactory,
     PHPUnit_Framework_TestCase as TestCase;
 
 class ConfigurationTest extends TestCase
 {
     public function testConfigurationCanConfigureInstanceManagerWithIniFile()
     {
-        $ini = new \Zend\Config\Ini(__DIR__ . '/_files/sample.ini', 'section-a');
+        $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-a');
         $config = new Configuration($ini->di);
         $di = new Di();
         $di->configure($config);
@@ -44,7 +45,7 @@ public function testConfigurationCanConfigureInstanceManagerWithIniFile()
     public function testConfigurationCanConfigureBuilderDefinitionFromIni()
     {
         $this->markTestIncomplete('Builder not updated to new DI yet');
-        $ini = new \Zend\Config\Ini(__DIR__ . '/_files/sample.ini', 'section-b');
+        $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-b');
         $config = new Configuration($ini->di);
         $di = new Di($config);
         $definition = $di->getDefinition();

diff --git a/test/Definition/BuilderDefinitionTest.php b/test/Definition/BuilderDefinitionTest.php
@@ -4,6 +4,7 @@
 
 use Zend\Di\Definition\BuilderDefinition,
     Zend\Di\Definition\Builder,
+    Zend\Config\Factory as ConfigFactory,
     PHPUnit_Framework_TestCase as TestCase;
 
 class BuilderDefinitionTest extends TestCase
@@ -44,8 +45,8 @@ public function testBuilderCanBuildClassWithMethods()
 
     public function testBuilderCanBuildFromArray()
     {
-        $ini = new \Zend\Config\Ini(__DIR__ . '/../_files/sample.ini', 'section-b');
-        $iniAsArray = $ini->toArray();
+        $ini = ConfigFactory::fromFile(__DIR__ . '/../_files/sample.ini');
+        $iniAsArray = $ini['section-b'];
         $definitionArray = $iniAsArray['di']['definitions'][1];
         unset($definitionArray['class']);