Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/console
Browse files Browse the repository at this point in the history 
Conflicts:
	library/Zend/Mvc/Service/ModuleManagerFactory.php
	library/Zend/Mvc/View/Http/ViewManager.php
	tests/Zend/Mvc/ApplicationTest.php
  • Loading branch information
@Thinkscape
Thinkscape committed Jul 22, 2012
8 parents adfe2f9 + be4dae7 + 7465e5d + 1b64e7d + 1f50979 + 92b6722 + 1d54f79 + ab5cea3 commit bd774aa
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 55 deletions.
4 changes: 2 additions & 2 deletions src/Configuration.php → src/Config.php
View file
Expand Up @@ -21,7 +21,7 @@
* @category Zend
* @package Zend_Di
*/
class Configuration
class Config
{
/**
* @var array
Expand All @@ -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;
Expand Down
30 changes: 15 additions & 15 deletions src/Di.php
View file
Expand Up @@ -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();
Expand All @@ -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);
}
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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
Expand All @@ -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);
}
}

Expand Down Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions src/InstanceManager.php
View file
Expand Up @@ -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])) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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])) {
Expand All @@ -342,28 +342,28 @@ 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
* @return void
*/
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
* @return void
*/
public function setInjections($aliasOrClass, array $injections)
{
$this->setConfiguration($aliasOrClass, array('injections' => $injections), true);
$this->setConfig($aliasOrClass, array('injections' => $injections), true);
}

/**
Expand All @@ -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);
}

/**
Expand Down
36 changes: 18 additions & 18 deletions test/ConfigurationTest.php → test/ConfigTest.php
View file
Expand Up @@ -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);

Expand All @@ -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();

Expand All @@ -81,41 +81,41 @@ 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');
$this->assertInstanceOf('Zend\Di\Definition\RuntimeDefinition', $definition);
$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');
Expand Down
8 changes: 4 additions & 4 deletions test/DiTest.php
View file
Expand Up @@ -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;


Expand All @@ -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());
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/InstanceManagerTest.php
View file
Expand Up @@ -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'));
}

}
10 changes: 5 additions & 5 deletions test/ServiceLocator/GeneratorTest.php
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -92,7 +92,7 @@ public function createDefinitions()
)),
),
);
$configuration = new Configuration($data);
$configuration = new Config($data);
$configuration->configure($this->di);
}

Expand Down Expand Up @@ -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'),
),
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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'),
),
Expand Down

0 comments on commit bd774aa

Please sign in to comment.