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

Commit

Permalink
Merge branch 'hotfix/di-alias-injections' of https://github.com/Ocram…
Browse files Browse the repository at this point in the history 
…ius/zf2 into hotfix/di-alias-injections
  • Loading branch information
@weierophinney
weierophinney committed May 18, 2012
71 parents bbd3ccc + 2f2ebee + 145abe5 + bf5d8d7 + fe0fb99 + 5f7322a + c3af80d + cf95a03 + 6a80fae + 10ed584 + 053ab77 + 495f1ba + d688369 + 56b2490 + 47a689e + f52f94e + fec9c74 + 28a9d88 + ac66d19 + 041ae5a + 63454d4 + da02d07 + 698a4d6 + 35967e7 + 427640f + 64a533c + e408635 + c004297 + b38b581 + 9a9f950 + 47a731a + 0967316 + 37f548b + 0df2db0 + e43587e + 5784352 + 93b4f40 + 3208a48 + f5dfded + 8301af5 + d4a4329 + eaf7585 + 12feb56 + 387d3ed + eb7fedd + a9a0285 + 44fa883 + 08a171a + a4b0e54 + 730ce14 + c24c880 + 80e40b3 + 20961e5 + 8cb611e + c958861 + b8b41bc + f82d7c5 + 7784cd5 + 4ed737c + 785b23e + b537b08 + 34ecc47 + 45265ad + df6c341 + efa67eb + 736f9f8 + d3b33d9 + be06520 + be3997d + ddb2e93 + 068f448 commit 500c51d
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 46 deletions.
14 changes: 7 additions & 7 deletions src/Di.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public function newInstance($name, array $params = array(), $isShared = true)
}
}

$this->handleInjectDependencies($instance, $class, $injectionMethods, $supertypeInjectionMethods, $params, $alias);
$this->handleInjectDependencies($instance, $name, $injectionMethods, $supertypeInjectionMethods, $params);

array_pop($this->instanceContext);
return $instance;
Expand Down Expand Up @@ -236,11 +236,11 @@ public function injectDependencies($instance, array $params = array())
$superTypeInjectionMethods[$interface] = $definitions->getMethods($interface);
}
}
$this->handleInjectDependencies($instance, null, $injectionMethods, $superTypeInjectionMethods, $params, null);
$this->handleInjectDependencies($instance, null, $injectionMethods, $superTypeInjectionMethods, $params);
}


protected function handleInjectDependencies($instance, $name, $injectionMethods, $supertypeInjectionMethods, $params, $alias)
protected function handleInjectDependencies($instance, $name, $injectionMethods, $supertypeInjectionMethods, $params)
{
$class = get_class($instance);

Expand All @@ -251,13 +251,13 @@ protected function handleInjectDependencies($instance, $name, $injectionMethods,
if ($injectionMethods || $supertypeInjectionMethods) {
foreach ($injectionMethods as $injectionMethod => $methodIsRequired) {
if ($injectionMethod !== '__construct'){
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, $params, $alias, $methodIsRequired, $class);
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, $params, $name, $methodIsRequired, $class);
}
}
foreach ($supertypeInjectionMethods as $supertype => $supertypeInjectionMethod) {
foreach ($supertypeInjectionMethod as $injectionMethod => $methodIsRequired) {
if ($injectionMethod !== '__construct') {
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, $params, $alias, $methodIsRequired, $supertype);
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, $params, $name, $methodIsRequired, $supertype);
}
}
}
Expand Down Expand Up @@ -294,7 +294,7 @@ protected function handleInjectDependencies($instance, $name, $injectionMethods,
if ($methodParams) {
foreach ($methodParams as $methodParam) {
if (get_class($objectToInject) == $methodParam[1] || $this->isSubclassOf(get_class($objectToInject), $methodParam[1])) {
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, array($methodParam[0] => $objectToInject), $alias, true, get_class($instance));
$this->resolveAndCallInjectionMethodForInstance($instance, $injectionMethod, array($methodParam[0] => $objectToInject), $name, true, get_class($instance));
continue 3;
}
}
Expand All @@ -304,7 +304,7 @@ protected function handleInjectDependencies($instance, $name, $injectionMethods,
}
if ($methodsToCall) {
foreach ($methodsToCall as $methodInfo) {
$this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $alias, true, get_class($instance));
$this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $name, true, get_class($instance));
}
}
}
Expand Down
94 changes: 55 additions & 39 deletions test/DiTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ public function testDiConstructorCanTakeDependencies()
public function testPassingInvalidDefinitionRaisesException()
{
$di = new Di();

$this->setExpectedException('PHPUnit_Framework_Error');
$di->setDefinitionList(array('foo'));
}

public function testGetRetrievesObjectWithMatchingClassDefinition()
{
$di = new Di();
$obj = $di->get('ZendTest\Di\TestAsset\BasicClass');
$this->assertInstanceOf('ZendTest\Di\TestAsset\BasicClass', $obj);
}

public function testGetRetrievesSameInstanceOnSubsequentCalls()
{
$di = new Di();
Expand All @@ -64,23 +64,23 @@ public function testGetRetrievesSameInstanceOnSubsequentCalls()
$this->assertInstanceOf('ZendTest\Di\TestAsset\BasicClass', $obj2);
$this->assertSame($obj1, $obj2);
}

public function testGetThrowsExceptionWhenUnknownClassIsUsed()
{
$di = new Di();

$this->setExpectedException('Zend\Di\Exception\ClassNotFoundException', 'could not be located in');
$obj1 = $di->get('ZendTest\Di\TestAsset\NonExistentClass');
}

public function testGetThrowsExceptionWhenMissingParametersAreEncountered()
{
$di = new Di();

$this->setExpectedException('Zend\Di\Exception\MissingPropertyException', 'Missing instance/object for ');
$obj1 = $di->get('ZendTest\Di\TestAsset\BasicClassWithParam');
}

public function testNewInstanceReturnsDifferentInstances()
{
$di = new Di();
Expand All @@ -90,7 +90,7 @@ public function testNewInstanceReturnsDifferentInstances()
$this->assertInstanceOf('ZendTest\Di\TestAsset\BasicClass', $obj2);
$this->assertNotSame($obj1, $obj2);
}

public function testNewInstanceReturnsInstanceThatIsSharedWithGet()
{
$di = new Di();
Expand All @@ -100,7 +100,7 @@ public function testNewInstanceReturnsInstanceThatIsSharedWithGet()
$this->assertInstanceOf('ZendTest\Di\TestAsset\BasicClass', $obj2);
$this->assertSame($obj1, $obj2);
}

public function testNewInstanceReturnsInstanceThatIsNotSharedWithGet()
{
$di = new Di();
Expand Down Expand Up @@ -204,7 +204,7 @@ public function testGetWillResolveConstructorInjectionDependencies()
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\A', $b->a);
}

/**
* @group ConstructorInjection
*/
Expand All @@ -214,15 +214,15 @@ public function testGetWillResolveConstructorInjectionDependenciesAndInstanceAre
$b = $di->get('ZendTest\Di\TestAsset\ConstructorInjection\B');
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\A', $b->a);

$b2 = $di->get('ZendTest\Di\TestAsset\ConstructorInjection\B');
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\B', $b2);
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\A', $b2->a);

$this->assertSame($b, $b2);
$this->assertSame($b->a, $b2->a);
}

/**
* @group ConstructorInjection
*/
Expand All @@ -233,48 +233,48 @@ public function testNewInstanceWillResolveConstructorInjectionDependencies()
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\A', $b->a);
}

/**
* @group ConstructorInjection
*/
public function testNewInstanceWillResolveConstructorInjectionDependenciesWithProperties()
{
$di = new Di();

$im = $di->instanceManager();
$im->setParameters('ZendTest\Di\TestAsset\ConstructorInjection\X', array('one' => 1, 'two' => 2));

$y = $di->newInstance('ZendTest\Di\TestAsset\ConstructorInjection\Y');
$this->assertEquals(1, $y->x->one);
$this->assertEquals(2, $y->x->two);
}

/**
* @group ConstructorInjection
*/
public function testNewInstanceWillThrowExceptionOnConstructorInjectionDependencyWithMissingParameter()
{
$di = new Di();

$this->setExpectedException('Zend\Di\Exception\MissingPropertyException', 'Missing instance/object for parameter');
$b = $di->newInstance('ZendTest\Di\TestAsset\ConstructorInjection\X');
}

/**
* @group ConstructorInjection
*/
public function testNewInstanceWillResolveConstructorInjectionDependenciesWithMoreThan2Dependencies()
{
$di = new Di();

$im = $di->instanceManager();
$im->setParameters('ZendTest\Di\TestAsset\ConstructorInjection\X', array('one' => 1, 'two' => 2));

$z = $di->newInstance('ZendTest\Di\TestAsset\ConstructorInjection\Z');
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\Y', $z->y);
$this->assertInstanceOf('ZendTest\Di\TestAsset\ConstructorInjection\X', $z->y->x);
}

/**
* @group SetterInjection
*/
Expand All @@ -290,7 +290,7 @@ public function testGetWillResolveSetterInjectionDependencies()
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b->a);
}

/**
* @group SetterInjection
*/
Expand All @@ -306,16 +306,16 @@ public function testGetWillResolveSetterInjectionDependenciesAndInstanceAreTheSa
$b = $di->get('ZendTest\Di\TestAsset\SetterInjection\B');
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b->a);

$b2 = $di->get('ZendTest\Di\TestAsset\SetterInjection\B');
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\B', $b2);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b2->a);

$this->assertSame($b, $b2);
$this->assertSame($b->a, $a);
$this->assertSame($b2->a, $a);
}

/**
* @group SetterInjection
*/
Expand All @@ -332,7 +332,7 @@ public function testNewInstanceWillResolveSetterInjectionDependencies()
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\B', $b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b->a);
}

/**
* @todo Setter Injections is not automatic, find a way to test this logically
*
Expand All @@ -341,7 +341,7 @@ public function testNewInstanceWillResolveSetterInjectionDependencies()
public function testNewInstanceWillResolveSetterInjectionDependenciesWithProperties()
{
$di = new Di();

$im = $di->instanceManager();
$im->setParameters('ZendTest\Di\TestAsset\SetterInjection\X', array('one' => 1, 'two' => 2));

Expand All @@ -351,10 +351,10 @@ public function testNewInstanceWillResolveSetterInjectionDependenciesWithPropert
$this->assertEquals(1, $y->x->one);
$this->assertEquals(2, $y->x->two);
}

/**
* Test for Circular Dependencies (case 1)
*
*
* A->B, B->A
* @group CircularDependencyCheck
*/
Expand All @@ -365,10 +365,10 @@ public function testNewInstanceThrowsExceptionOnBasicCircularDependency()
$this->setExpectedException('Zend\Di\Exception\CircularDependencyException');
$di->newInstance('ZendTest\Di\TestAsset\CircularClasses\A');
}

/**
* Test for Circular Dependencies (case 2)
*
*
* C->D, D->E, E->C
* @group CircularDependencyCheck
*/
Expand All @@ -382,10 +382,10 @@ public function testNewInstanceThrowsExceptionOnThreeLevelCircularDependency()
);
$di->newInstance('ZendTest\Di\TestAsset\CircularClasses\C');
}

/**
* Test for Circular Dependencies (case 2)
*
*
* C->D, D->E, E->C
* @group CircularDependencyCheck
*/
Expand All @@ -399,10 +399,10 @@ public function testNewInstanceThrowsExceptionWhenEnteringInMiddleOfCircularDepe
);
$di->newInstance('ZendTest\Di\TestAsset\CircularClasses\D');
}

/**
* Fix for PHP bug in is_subclass_of
*
*
* @see https://bugs.php.net/bug.php?id=53727
*/
public function testNewInstanceWillUsePreferredClassForInterfaceHints()
Expand All @@ -412,7 +412,7 @@ public function testNewInstanceWillUsePreferredClassForInterfaceHints()
'ZendTest\Di\TestAsset\PreferredImplClasses\A',
'ZendTest\Di\TestAsset\PreferredImplClasses\BofA'
);

$c = $di->get('ZendTest\Di\TestAsset\PreferredImplClasses\C');
$a = $c->a;
$this->assertInstanceOf('ZendTest\Di\TestAsset\PreferredImplClasses\BofA', $a);
Expand Down Expand Up @@ -590,7 +590,7 @@ public function testInjectionForSetterInjectionWillConsultSupertypeDefinitionInC
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\C', $c);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $c->a);
}

/**
* @group SharedInstance
*/
Expand Down Expand Up @@ -624,4 +624,20 @@ public function testDiWillInjectDependenciesForInstance()
$di->injectDependencies($b);
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b->a);
}

public function testDiWillInjectDependenciesForAlias()
{
$di = new Di;

// for setter injection, the dependency is not required, thus it must be forced
$classDef = new Definition\ClassDefinition('ZendTest\Di\TestAsset\SetterInjection\B');
$classDef->addMethod('setA', false);
$classDef->addMethodParameter('setA', 'a', array('type' => 'ZendTest\Di\TestAsset\SetterInjection\A', 'required' => false));
$di->definitions()->addDefinition($classDef, false);
$di->instanceManager()->addAlias('b_alias', 'ZendTest\Di\TestAsset\SetterInjection\B');
$di->instanceManager()->setInjections('b_alias', array('ZendTest\Di\TestAsset\SetterInjection\A'));

$b = $di->get('b_alias');
$this->assertInstanceOf('ZendTest\Di\TestAsset\SetterInjection\A', $b->a);
}
}

0 comments on commit 500c51d

Please sign in to comment.