diff --git a/src/Configuration.php b/src/Config.php similarity index 98% rename from src/Configuration.php rename to src/Config.php index a7457b3b..aa093914 100644 --- a/src/Configuration.php +++ b/src/Config.php @@ -21,7 +21,7 @@ * @category Zend * @package Zend_Di */ -class Configuration +class Config { /** * @var array @@ -42,7 +42,7 @@ public function __construct($options) if (!is_array($options)) { throw new Exception\InvalidArgumentException( - 'Configuration data must be of type Traversable or an array' + 'Config data must be of type Traversable or an array' ); } $this->data = $options; diff --git a/src/Di.php b/src/Di.php index 7509338f..f43d0037 100644 --- a/src/Di.php +++ b/src/Di.php @@ -55,9 +55,9 @@ class Di implements DependencyInjectionInterface * * @param null|DefinitionList $definitions * @param null|InstanceManager $instanceManager - * @param null|Configuration $config + * @param null|Config $config */ - public function __construct(DefinitionList $definitions = null, InstanceManager $instanceManager = null, Configuration $config = null) + public function __construct(DefinitionList $definitions = null, InstanceManager $instanceManager = null, Config $config = null) { $this->definitions = ($definitions) ?: new DefinitionList(new Definition\RuntimeDefinition()); $this->instanceManager = ($instanceManager) ?: new InstanceManager(); @@ -70,10 +70,10 @@ public function __construct(DefinitionList $definitions = null, InstanceManager /** * Provide a configuration object to configure this instance * - * @param Configuration $config + * @param Config $config * @return void */ - public function configure(Configuration $config) + public function configure(Config $config) { $config->configure($this); } @@ -296,11 +296,11 @@ protected function handleInjectDependencies($instance, $injectionMethods, $param } if ($requestedName) { - $instanceConfiguration = $instanceManager->getConfiguration($requestedName); + $instanceConfig = $instanceManager->getConfig($requestedName); - if ($instanceConfiguration['injections']) { + if ($instanceConfig['injections']) { $objectsToInject = $methodsToCall = array(); - foreach ($instanceConfiguration['injections'] as $injectName => $injectValue) { + foreach ($instanceConfig['injections'] as $injectName => $injectValue) { if (is_int($injectName) && is_string($injectValue)) { $objectsToInject[] = $this->get($injectValue, $params); } elseif (is_string($injectName) && is_array($injectValue)) { @@ -483,13 +483,13 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP $aliases = $this->instanceManager->getAliases(); // for the alias in the dependency tree - if ($alias && $this->instanceManager->hasConfiguration($alias)) { - $iConfig['thisAlias'] = $this->instanceManager->getConfiguration($alias); + if ($alias && $this->instanceManager->hasConfig($alias)) { + $iConfig['thisAlias'] = $this->instanceManager->getConfig($alias); } // for the current class in the dependency tree - if ($this->instanceManager->hasConfiguration($class)) { - $iConfig['thisClass'] = $this->instanceManager->getConfiguration($class); + if ($this->instanceManager->hasConfig($class)) { + $iConfig['thisClass'] = $this->instanceManager->getConfig($class); } // for the parent class, provided we are deeper than one node @@ -501,10 +501,10 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP $requestedClass = $requestedAlias = null; } - if ($requestedClass != $class && $this->instanceManager->hasConfiguration($requestedClass)) { - $iConfig['requestedClass'] = $this->instanceManager->getConfiguration($requestedClass); + if ($requestedClass != $class && $this->instanceManager->hasConfig($requestedClass)) { + $iConfig['requestedClass'] = $this->instanceManager->getConfig($requestedClass); if ($requestedAlias) { - $iConfig['requestedAlias'] = $this->instanceManager->getConfiguration($requestedAlias); + $iConfig['requestedAlias'] = $this->instanceManager->getConfig($requestedAlias); } } @@ -664,7 +664,7 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP ); } array_push($this->currentDependencies, $class); - $dConfig = $this->instanceManager->getConfiguration($computedParams['required'][$fqParamPos][0]); + $dConfig = $this->instanceManager->getConfig($computedParams['required'][$fqParamPos][0]); if ($dConfig['shared'] === false) { $resolvedParams[$index] = $this->newInstance($computedParams['required'][$fqParamPos][0], $callTimeUserParams, false); } else { diff --git a/src/InstanceManager.php b/src/InstanceManager.php index a94b7831..ede27888 100644 --- a/src/InstanceManager.php +++ b/src/InstanceManager.php @@ -275,7 +275,7 @@ public function addAlias($alias, $class, array $parameters = array()) * @param string $aliasOrClass * @return bool */ - public function hasConfiguration($aliasOrClass) + public function hasConfig($aliasOrClass) { $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass; if (!isset($this->configurations[$key])) { @@ -295,7 +295,7 @@ public function hasConfiguration($aliasOrClass) * @param array $configuration * @param bool $append */ - public function setConfiguration($aliasOrClass, array $configuration, $append = false) + public function setConfig($aliasOrClass, array $configuration, $append = false) { $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass; if (!isset($this->configurations[$key]) || !$append) { @@ -330,7 +330,7 @@ public function getClasses() * @param string $aliasOrClass * @return array */ - public function getConfiguration($aliasOrClass) + public function getConfig($aliasOrClass) { $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass; if (isset($this->configurations[$key])) { @@ -342,7 +342,7 @@ public function getConfiguration($aliasOrClass) /** * setParameters() is a convenience method for: - * setConfiguration($type, array('parameters' => array(...)), true); + * setConfig($type, array('parameters' => array(...)), true); * * @param string $aliasOrClass Alias or Class * @param array $parameters Multi-dim array of parameters and their values @@ -350,12 +350,12 @@ public function getConfiguration($aliasOrClass) */ public function setParameters($aliasOrClass, array $parameters) { - $this->setConfiguration($aliasOrClass, array('parameters' => $parameters), true); + $this->setConfig($aliasOrClass, array('parameters' => $parameters), true); } /** * setInjections() is a convenience method for: - * setConfiguration($type, array('injections' => array(...)), true); + * setConfig($type, array('injections' => array(...)), true); * * @param string $aliasOrClass Alias or Class * @param array $injections Multi-dim array of methods and their parameters @@ -363,7 +363,7 @@ public function setParameters($aliasOrClass, array $parameters) */ public function setInjections($aliasOrClass, array $injections) { - $this->setConfiguration($aliasOrClass, array('injections' => $injections), true); + $this->setConfig($aliasOrClass, array('injections' => $injections), true); } /** @@ -375,7 +375,7 @@ public function setInjections($aliasOrClass, array $injections) */ public function setShared($aliasOrClass, $isShared) { - $this->setConfiguration($aliasOrClass, array('shared' => (bool) $isShared), true); + $this->setConfig($aliasOrClass, array('shared' => (bool) $isShared), true); } /** diff --git a/test/ConfigurationTest.php b/test/ConfigTest.php similarity index 81% rename from test/ConfigurationTest.php rename to test/ConfigTest.php index b0f136fe..93a8418d 100644 --- a/test/ConfigurationTest.php +++ b/test/ConfigTest.php @@ -10,17 +10,17 @@ namespace ZendTest\Di; -use Zend\Di\Configuration; +use Zend\Di\Config; use Zend\Di\Di; use Zend\Config\Factory as ConfigFactory; use PHPUnit_Framework_TestCase as TestCase; -class ConfigurationTest extends TestCase +class ConfigTest extends TestCase { - public function testConfigurationCanConfigureInstanceManagerWithIniFile() + public function testConfigCanConfigureInstanceManagerWithIniFile() { $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-a'); - $config = new Configuration($ini->di); + $config = new Config($ini->di); $di = new Di(); $di->configure($config); @@ -41,20 +41,20 @@ public function testConfigurationCanConfigureInstanceManagerWithIniFile() $this->assertTrue($im->hasTypePreferences('my-mapper')); $this->assertContains('my-dbAdapter', $im->getTypePreferences('my-mapper')); - $this->assertTrue($im->hasConfiguration('My\DbAdapter')); + $this->assertTrue($im->hasConfig('My\DbAdapter')); $expected = array('parameters' => array('username' => 'readonly', 'password' => 'mypassword'), 'injections' => array(), 'shared' => true); - $this->assertEquals($expected, $im->getConfiguration('My\DbAdapter')); + $this->assertEquals($expected, $im->getConfig('My\DbAdapter')); - $this->assertTrue($im->hasConfiguration('my-dbAdapter')); + $this->assertTrue($im->hasConfig('my-dbAdapter')); $expected = array('parameters' => array('username' => 'readwrite'), 'injections' => array(), 'shared' => true); - $this->assertEquals($expected, $im->getConfiguration('my-dbAdapter')); + $this->assertEquals($expected, $im->getConfig('my-dbAdapter')); } - public function testConfigurationCanConfigureBuilderDefinitionFromIni() + public function testConfigCanConfigureBuilderDefinitionFromIni() { $this->markTestIncomplete('Builder not updated to new DI yet'); $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-b'); - $config = new Configuration($ini->di); + $config = new Config($ini->di); $di = new Di($config); $definition = $di->getDefinition(); @@ -81,10 +81,10 @@ public function testConfigurationCanConfigureBuilderDefinitionFromIni() } - public function testConfigurationCanConfigureRuntimeDefinitionDefaultFromIni() + public function testConfigCanConfigureRuntimeDefinitionDefaultFromIni() { $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-c'); - $config = new Configuration($ini->di); + $config = new Config($ini->di); $di = new Di(); $di->configure($config); $definition = $di->definitions()->getDefinitionByType('Zend\Di\Definition\RuntimeDefinition'); @@ -92,30 +92,30 @@ public function testConfigurationCanConfigureRuntimeDefinitionDefaultFromIni() $this->assertFalse($definition->getIntrospectionStrategy()->getUseAnnotations()); } - public function testConfigurationCanConfigureRuntimeDefinitionDisabledFromIni() + public function testConfigCanConfigureRuntimeDefinitionDisabledFromIni() { $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-d'); - $config = new Configuration($ini->di); + $config = new Config($ini->di); $di = new Di(); $di->configure($config); $definition = $di->definitions()->getDefinitionByType('Zend\Di\Definition\RuntimeDefinition'); $this->assertFalse($definition); } - public function testConfigurationCanConfigureRuntimeDefinitionUseAnnotationFromIni() + public function testConfigCanConfigureRuntimeDefinitionUseAnnotationFromIni() { $ini = ConfigFactory::fromFile(__DIR__ . '/_files/sample.ini', true)->get('section-e'); - $config = new Configuration($ini->di); + $config = new Config($ini->di); $di = new Di(); $di->configure($config); $definition = $di->definitions()->getDefinitionByType('Zend\Di\Definition\RuntimeDefinition'); $this->assertTrue($definition->getIntrospectionStrategy()->getUseAnnotations()); } - public function testConfigurationCanConfigureCompiledDefinition() + public function testConfigCanConfigureCompiledDefinition() { $config = ConfigFactory::fromFile(__DIR__ . '/_files/sample.php', true); - $config = new Configuration($config->di); + $config = new Config($config->di); $di = new Di(); $di->configure($config); $definition = $di->definitions()->getDefinitionByType('Zend\Di\Definition\ArrayDefinition'); diff --git a/test/DiTest.php b/test/DiTest.php index cb09e8b1..f718f01d 100644 --- a/test/DiTest.php +++ b/test/DiTest.php @@ -13,7 +13,7 @@ use Zend\Di\Di; use Zend\Di\DefinitionList; use Zend\Di\InstanceManager; -use Zend\Di\Configuration; +use Zend\Di\Config; use Zend\Di\Definition; @@ -35,7 +35,7 @@ public function testDiConstructorCanTakeDependencies() { $dl = new DefinitionList(array()); $im = new InstanceManager(); - $cg = new Configuration(array()); + $cg = new Config(array()); $di = new Di($dl, $im, $cg); $this->assertSame($dl, $di->definitions()); @@ -155,7 +155,7 @@ public function testNewInstanceCanHandleComplexCallback() // public function testCanSetInstantiatorToStaticFactory() // { -// $config = new Configuration(array( +// $config = new Config(array( // 'definition' => array( // 'class' => array( // 'ZendTest\Di\TestAsset\DummyParams' => array( @@ -605,7 +605,7 @@ public function testInjectionForSetterInjectionWillConsultSupertypeDefinitionInC public function testMarkingClassAsNotSharedInjectsNewInstanceIntoAllRequestersButDependentsAreShared() { $di = new Di(); - $di->configure(new Configuration(array( + $di->configure(new Config(array( 'instance' => array( 'ZendTest\Di\TestAsset\SharedInstance\Lister' => array( 'shared' => false diff --git a/test/InstanceManagerTest.php b/test/InstanceManagerTest.php index 970732b3..82b22ebc 100644 --- a/test/InstanceManagerTest.php +++ b/test/InstanceManagerTest.php @@ -69,19 +69,19 @@ public function testInstanceManagerThrowsExceptionForRecursiveAliases() /** * @group AliasAlias */ - public function testInstanceManagerResolvesRecursiveAliasesForConfiguration() + public function testInstanceManagerResolvesRecursiveAliasesForConfig() { $config = array('parameters' => array('username' => 'my-username')); $im = new InstanceManager; $im->addAlias('bar-alias', 'Some\Class'); $im->addAlias('foo-alias', 'bar-alias'); - $im->setConfiguration('bar-alias', $config); + $im->setConfig('bar-alias', $config); $config['injections'] = array(); $config['shared'] = true; - $this->assertEquals($config, $im->getConfiguration('foo-alias')); + $this->assertEquals($config, $im->getConfig('foo-alias')); } } diff --git a/test/ServiceLocator/GeneratorTest.php b/test/ServiceLocator/GeneratorTest.php index cbb95d26..173964a3 100644 --- a/test/ServiceLocator/GeneratorTest.php +++ b/test/ServiceLocator/GeneratorTest.php @@ -11,7 +11,7 @@ namespace ZendTest\Di\ServiceLocator; use Zend\Di\Di; -use Zend\Di\Configuration; +use Zend\Di\Config; use Zend\Di\ServiceLocator\Generator as ContainerGenerator; use Zend\Di\Definition\BuilderDefinition as Definition; use Zend\Di\Definition\Builder; @@ -92,7 +92,7 @@ public function createDefinitions() )), ), ); - $configuration = new Configuration($data); + $configuration = new Config($data); $configuration->configure($this->di); } @@ -261,7 +261,7 @@ public function testNullAsOnlyArgumentResultsInEmptyParameterList() $def->addClass($opt); $this->di->setDefinition($def); - $cfg = new Configuration(array( + $cfg = new Config(array( 'instance' => array( 'alias' => array('optional' => 'ZendTest\Di\TestAsset\OptionalArg'), ), @@ -311,7 +311,7 @@ public function testNullAsLastArgumentsResultsInTruncatedParameterList() $this->di->setDefinition($def); - $cfg = new Configuration(array( + $cfg = new Config(array( 'instance' => array( 'alias' => array( 'struct' => 'ZendTest\Di\TestAsset\Struct', @@ -360,7 +360,7 @@ public function testNullArgumentsResultInEmptyMethodParameterList() $def->addClass($opt); $this->di->setDefinition($def); - $cfg = new Configuration(array( + $cfg = new Config(array( 'instance' => array( 'alias' => array('optional' => 'ZendTest\Di\TestAsset\OptionalArg'), ),