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

Commit

Permalink
Merge branch 'develop' of git://github.com/zendframework/zf2 into hot…
Browse files Browse the repository at this point in the history 
…fix/cache-empty-namespace
  • Loading branch information
@marc-mabe
marc-mabe committed Dec 13, 2012
120 parents e9dd8c9 + 5b5a91a + db9fc36 + f8b7f2b + 09edbcb + 6a99da4 + 4a9dd4d + cc4af6e + 8a07675 + c30b083 + 0c6e411 + be4dae7 + 7465e5d + 1b64e7d + 1f50979 + 92b6722 + 1d54f79 + ab5cea3 + 4f0b000 + c18caa3 + 98036b5 + 3b5c10e + a248769 + 560d3a2 + ddfdb8f + fd4ce84 + 9e4c786 + 0c0695c + 500c51d + 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 + e7fb236 + 5b19875 + ed60259 + ae0af2f + 761379e + 118bbd6 + 9ce360b + 4d4425a + cc47b49 + c4aa2e1 + c152f67 + bd774aa + a95f940 + fb3126d + f420aa3 + 288aa3f + 9fa9257 + 82606a6 + cbe2b1f + 46ed6e3 + 085bc16 + c62bcc9 + 24a5c98 commit 6de8d76
Show file tree
Hide file tree
Showing 17 changed files with 270 additions and 33 deletions.
6 changes: 4 additions & 2 deletions src/Definition/Builder/InjectionMethod.php
View file
Expand Up @@ -51,14 +51,16 @@ public function getName()
* @param string $name
* @param string|null $class
* @param mixed|null $isRequired
* @param mixed|null $default
* @return InjectionMethod
*/
public function addParameter($name, $class = null, $isRequired = null)
public function addParameter($name, $class = null, $isRequired = null, $default = null)
{
$this->parameters[] = array(
$name,
$class,
($isRequired == null) ? true : false
($isRequired == null) ? true : false,
$default,
);

return $this;
Expand Down
6 changes: 6 additions & 0 deletions src/Definition/BuilderDefinition.php
View file
Expand Up @@ -295,20 +295,26 @@ public function hasMethodParameters($class, $method)
public function getMethodParameters($class, $method)
{
$class = $this->getClass($class);

if ($class === false) {
throw new Exception\RuntimeException('Cannot find class object in this builder definition.');
}

$methods = $class->getInjectionMethods();

/* @var $methodObj Builder\InjectionMethod */
foreach ($methods as $methodObj) {
if ($methodObj->getName() === $method) {
$method = $methodObj;
}
}

if (!$method instanceof Builder\InjectionMethod) {
throw new Exception\RuntimeException('Cannot find method object for method ' . $method . ' in this builder definition.');
}

$methodParameters = array();

/* @var $method Builder\InjectionMethod */
foreach ($method->getParameters() as $name => $info) {
$methodParameters[$class->getName() . '::' . $method->getName() . ':' . $name] = $info;
Expand Down
8 changes: 6 additions & 2 deletions src/Definition/ClassDefinition.php
View file
Expand Up @@ -104,12 +104,16 @@ public function addMethodParameter($method, $parameterName, array $parameterInfo
$this->methodParameters[$method] = array();
}

$type = (isset($parameterInfo['type'])) ? $parameterInfo['type'] : null;
$type = (isset($parameterInfo['type'])) ? $parameterInfo['type'] : null;
$required = (isset($parameterInfo['required'])) ? (bool) $parameterInfo['required'] : false;
$default = (isset($parameterInfo['default'])) ? $parameterInfo['default'] : null;

$fqName = $this->class . '::' . $method . ':' . $parameterName;
$this->methodParameters[$method][$fqName] = array(
$parameterName, $type, $required
$parameterName,
$type,
$required,
$default
);

return $this;
Expand Down
7 changes: 3 additions & 4 deletions src/Definition/CompilerDefinition.php
View file
Expand Up @@ -213,7 +213,7 @@ protected function processClass($class)

$methodName = $rMethod->getName();

if ($rMethod->getName() === '__construct') {
if ($rMethod->getName() === '__construct' || $rMethod->isStatic()) {
continue;
}

Expand Down Expand Up @@ -292,15 +292,14 @@ protected function processParams(&$def, Reflection\ClassReflection $rClass, Refl

/** @var $p \ReflectionParameter */
$actualParamName = $p->getName();

$fqName = $rClass->getName() . '::' . $rMethod->getName() . ':' . $p->getPosition();

$def['parameters'][$methodName][$fqName] = array();

// set the class name, if it exists
$def['parameters'][$methodName][$fqName][] = $actualParamName;
$def['parameters'][$methodName][$fqName][] = ($p->getClass() !== null) ? $p->getClass()->getName() : null;
$def['parameters'][$methodName][$fqName][] = !$p->isOptional();
$def['parameters'][$methodName][$fqName][] = !($optional =$p->isOptional());
$def['parameters'][$methodName][$fqName][] = $optional && $p->isDefaultValueAvailable() ? $p->getDefaultValue() : null;
}

}
Expand Down
1 change: 1 addition & 0 deletions src/Definition/DefinitionInterface.php
View file
Expand Up @@ -93,6 +93,7 @@ public function hasMethodParameters($class, $method);
* 0, // string|null: Type Name (if it exists)
* 1, // bool: whether this param is required
* 2, // string: fully qualified path to this parameter
* 3, // mixed: default value
* );
*
*
Expand Down
5 changes: 3 additions & 2 deletions src/Definition/RuntimeDefinition.php
View file
Expand Up @@ -260,7 +260,7 @@ protected function processClass($class)

$methodName = $rMethod->getName();

if ($rMethod->getName() === '__construct') {
if ($rMethod->getName() === '__construct' || $rMethod->isStatic()) {
continue;
}

Expand Down Expand Up @@ -346,7 +346,8 @@ protected function processParams(&$def, Reflection\ClassReflection $rClass, Refl
// set the class name, if it exists
$def['parameters'][$methodName][$fqName][] = $actualParamName;
$def['parameters'][$methodName][$fqName][] = ($p->getClass() !== null) ? $p->getClass()->getName() : null;
$def['parameters'][$methodName][$fqName][] = !$p->isOptional();
$def['parameters'][$methodName][$fqName][] = !($optional = $p->isOptional() && $p->isDefaultValueAvailable());
$def['parameters'][$methodName][$fqName][] = $optional ? $p->getDefaultValue() : null;
}

}
Expand Down
10 changes: 3 additions & 7 deletions src/Di.php
View file
Expand Up @@ -652,30 +652,27 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
$name = $value[0];

if (isset($computedParams['value'][$fqParamPos])) {

// if there is a value supplied, use it
$resolvedParams[$index] = $computedParams['value'][$fqParamPos];

} elseif (isset($computedParams['required'][$fqParamPos])) {

// detect circular dependencies! (they can only happen in instantiators)
if ($isInstantiator && in_array($computedParams['required'][$fqParamPos][1], $this->currentDependencies)) {
throw new Exception\CircularDependencyException(
"Circular dependency detected: $class depends on {$value[1]} and viceversa"
);
}

array_push($this->currentDependencies, $class);
$dConfig = $this->instanceManager->getConfig($computedParams['required'][$fqParamPos][0]);

if ($dConfig['shared'] === false) {
$resolvedParams[$index] = $this->newInstance($computedParams['required'][$fqParamPos][0], $callTimeUserParams, false);
} else {
$resolvedParams[$index] = $this->get($computedParams['required'][$fqParamPos][0], $callTimeUserParams);
}

array_pop($this->currentDependencies);

} elseif (!array_key_exists($fqParamPos, $computedParams['optional'])) {

if ($methodIsRequired) {
// if this item was not marked as optional,
// plus it cannot be resolve, and no value exist, bail out
Expand All @@ -686,9 +683,8 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
} else {
return false;
}

} else {
$resolvedParams[$index] = null;
$resolvedParams[$index] = $value[3];
}

$index++;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceLocator/Generator.php
View file
Expand Up @@ -77,7 +77,7 @@ public function setNamespace($namespace)
/**
* Construct, configure, and return a PHP class file code generation object
*
* Creates a Zend\CodeGenerator\Php\PhpFile object that has
* Creates a Zend\Code\Generator\FileGenerator object that has
* created the specified class and service locator methods.
*
* @param null|string $filename
Expand Down
14 changes: 7 additions & 7 deletions test/Definition/BuilderDefinitionTest.php
View file
Expand Up @@ -45,7 +45,7 @@ public function testBuilderCanBuildClassWithMethods()
$this->assertTrue($definition->hasMethod('Foo', 'injectBar'));
$this->assertContains('injectBar', $definition->getMethods('Foo'));
$this->assertEquals(
array('Foo::injectBar:0' => array('bar', 'Bar', true)),
array('Foo::injectBar:0' => array('bar', 'Bar', true, null)),
$definition->getMethodParameters('Foo', 'injectBar')
);
}
Expand Down Expand Up @@ -86,23 +86,23 @@ public function testBuilderCanBuildFromArray()
$this->assertEquals('__construct', $definition->getInstantiator('My\DbAdapter'));
$this->assertEquals(
array(
'My\DbAdapter::__construct:0' => array('username', null, true),
'My\DbAdapter::__construct:1' => array('password', null, true)
'My\DbAdapter::__construct:0' => array('username', null, true, null),
'My\DbAdapter::__construct:1' => array('password', null, true, null),
),
$definition->getMethodParameters('My\DbAdapter', '__construct')
);

$this->assertTrue($definition->hasClass('My\Mapper'));
$this->assertEquals('__construct', $definition->getInstantiator('My\Mapper'));
$this->assertEquals(
array('My\Mapper::__construct:0' => array('dbAdapter', 'My\DbAdapter', true)),
array('My\Mapper::__construct:0' => array('dbAdapter', 'My\DbAdapter', true, null)),
$definition->getMethodParameters('My\Mapper', '__construct')
);

$this->assertTrue($definition->hasClass('My\Repository'));
$this->assertEquals('__construct', $definition->getInstantiator('My\Repository'));
$this->assertEquals(
array('My\Repository::__construct:0' => array('mapper', 'My\Mapper', true)),
array('My\Repository::__construct:0' => array('mapper', 'My\Mapper', true, null)),
$definition->getMethodParameters('My\Repository', '__construct')
);

Expand Down Expand Up @@ -131,11 +131,11 @@ public function testCanCreateInjectionMethodsAndPopulateFromFluentInterface()
$this->assertTrue($builder->hasMethod('Foo', 'setConfig'));

$this->assertEquals(
array('Foo::setBar:0' => array('bar', 'Bar', true)),
array('Foo::setBar:0' => array('bar', 'Bar', true, null)),
$builder->getMethodParameters('Foo', 'setBar')
);
$this->assertEquals(
array('Foo::setConfig:0' => array('config', null, true)),
array('Foo::setConfig:0' => array('config', null, true, null)),
$builder->getMethodParameters('Foo', 'setConfig')
);
}
Expand Down
7 changes: 5 additions & 2 deletions test/Definition/ClassDefinitionTest.php
View file
Expand Up @@ -71,8 +71,11 @@ public function testHasMethodParameters()
public function testGetMethodParameters()
{
$definition = new ClassDefinition('Foo');
$definition->addMethodParameter("setVar", "var", array('type' => null, 'required' => true));
$definition->addMethodParameter("setVar", "var", array('type' => null, 'required' => true, 'default' => 'test'));
$this->assertNull($definition->getMethodParameters("Bar", "setVar"));
$this->assertEquals(array('Foo::setVar:var' => array("var", null, true)), $definition->getMethodParameters("Foo", "setVar"));
$this->assertEquals(
array('Foo::setVar:var' => array("var", null, true, 'test')),
$definition->getMethodParameters("Foo", "setVar")
);
}
}
14 changes: 13 additions & 1 deletion test/Definition/CompilerDefinitionTest.php
View file
Expand Up @@ -47,7 +47,7 @@ public function testCompilerCompilesAgainstConstructorInjectionAssets()
$this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\CompilerClasses\C', 'setB'));

$this->assertEquals(
array('ZendTest\Di\TestAsset\CompilerClasses\C::setB:0' => array('b', 'ZendTest\Di\TestAsset\CompilerClasses\B', true)),
array('ZendTest\Di\TestAsset\CompilerClasses\C::setB:0' => array('b', 'ZendTest\Di\TestAsset\CompilerClasses\B', true, null)),
$definition->getMethodParameters('ZendTest\Di\TestAsset\CompilerClasses\C', 'setB')
);
}
Expand Down Expand Up @@ -107,4 +107,16 @@ public function testCompilerAllowReflectionException()
// The exception gets caught before the parameter's class is set
$this->assertCount(1, current($parameters));
}

/**
* @group ZF2-308
*/
public function testStaticMethodsNotIncludedInDefinitions()
{
$definition = new CompilerDefinition;
$definition->addDirectory(__DIR__ . '/../TestAsset/SetterInjection');
$definition->compile();
$this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setFoo'));
$this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setName'));
}
}
79 changes: 77 additions & 2 deletions test/Definition/RuntimeDefinitionTest.php
View file
Expand Up @@ -12,10 +12,85 @@

use PHPUnit_Framework_TestCase as TestCase;

use Zend\Di\Definition\RuntimeDefinition;

class RuntimeDefinitionTest extends TestCase
{
public function testStub()
/**
* @group ZF2-308
*/
public function testStaticMethodsNotIncludedInDefinitions()
{
$definition = new RuntimeDefinition;
$this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setFoo'));
$this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setName'));
}

public function testIncludesDefaultMethodParameters()
{
$this->markTestIncomplete();
$definition = new RuntimeDefinition();

$definition->forceLoadClass('ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters');

$this->assertSame(
array(
'ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters::__construct:0' => array(
'a',
null,
false,
null,
),
'ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters::__construct:1' => array(
'b',
null,
false,
'defaultConstruct',
),
'ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters::__construct:2' => array(
'c',
null,
false,
array(),
),
),
$definition->getMethodParameters(
'ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters',
'__construct'
)
);
}

public function testExceptionDefaultValue()
{
$definition = new RuntimeDefinition();

$definition->forceLoadClass('RecursiveIteratorIterator');

$this->assertSame(
array(
'RecursiveIteratorIterator::__construct:0' => array(
'iterator',
'Traversable',
true,
null,
),
'RecursiveIteratorIterator::__construct:1' => Array (
'mode',
null,
true,
null,
),
'RecursiveIteratorIterator::__construct:2' => Array (
'flags',
null,
true,
null,
),
),
$definition->getMethodParameters(
'RecursiveIteratorIterator',
'__construct'
)
);
}
}

0 comments on commit 6de8d76

Please sign in to comment.