Merge branch 'hotfix/config-usage-updates' of https://github.com/Evan…

…DotPro/zf2 into hotfix/config-usage

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();

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']);