Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DI] Fix CheckTypeDeclarationPass #36108

Merged
merged 1 commit into from Mar 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -17,7 +17,6 @@
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Exception\InvalidParameterTypeException;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
Expand Down Expand Up @@ -207,7 +206,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
if ('' === preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U', '', $value, -1, $c) && 1 === $c) {
try {
$value = $this->container->resolveEnvPlaceholders($value, true);
} catch (EnvNotFoundException | RuntimeException $e) {
} catch (\Exception $e) {
// If an env placeholder cannot be resolved, we skip the validation.
return;
}
Expand Down Expand Up @@ -250,7 +249,11 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
return;
}

if ('iterable' === $type && (\is_array($value) || is_subclass_of($class, \Traversable::class))) {
if ('iterable' === $type && (\is_array($value) || 'array' === $class || is_subclass_of($class, \Traversable::class))) {
return;
}

if ($type === $class) {
return;
}

Expand Down
Expand Up @@ -536,6 +536,42 @@ public function testProcessFactoryDoesNotLoadCodeByDefault()
$this->addToAssertionCount(1);
}

public function testProcessFactoryForTypeSameAsClass()
{
$container = new ContainerBuilder();

$container->register('foo', Foo::class);
$container->register('bar', 'callable')
->setFactory([
new Reference('foo'),
'createCallable',
]);
$container->register('bar_call', BarMethodCall::class)
->addMethodCall('setCallable', [new Reference('bar')]);

(new CheckTypeDeclarationsPass(true))->process($container);

$this->addToAssertionCount(1);
}

public function testProcessFactoryForIterableTypeAndArrayClass()
{
$container = new ContainerBuilder();

$container->register('foo', Foo::class);
$container->register('bar', 'array')
->setFactory([
new Reference('foo'),
'createArray',
]);
$container->register('bar_call', BarMethodCall::class)
->addMethodCall('setIterable', [new Reference('bar')]);

(new CheckTypeDeclarationsPass(true))->process($container);

$this->addToAssertionCount(1);
}

public function testProcessPassingBuiltinTypeDoesNotLoadCodeByDefault()
{
$container = new ContainerBuilder();
Expand Down
Expand Up @@ -13,4 +13,14 @@ public static function createBarArguments(\stdClass $stdClass, \stdClass $stdCla
{
return new Bar($stdClass);
}

public static function createCallable(): callable
{
return function() {};
}

public static function createArray(): array
{
return [];
}
}