diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DependencyInjection] Support PHP 8 builtin types in CheckTypeDeclarationsPass

Browse Source
This commit is contained in:
Alexander M. Turek 2021-01-07 03:10:33 +01:00
parent 92ccb0a9df
commit f16230be5d
3 changed files with 92 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
View File

@ -280,15 +280,26 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
return;
}
if ('mixed' === $type) {
return;
}
if (is_a($class, $type, true)) {
return;
}
$checkFunction = sprintf('is_%s', $type);
if (!$reflectionType->isBuiltin() || !$checkFunction($value)) {
throw new InvalidParameterTypeException($this->currentId, \is_object($value) ? $class : \gettype($value), $parameter);
if ('false' === $type) {
if (false === $value) {
return;
}
} elseif ($reflectionType->isBuiltin()) {
$checkFunction = sprintf('is_%s', $type);
if ($checkFunction($value)) {
return;
}
}
throw new InvalidParameterTypeException($this->currentId, \is_object($value) ? $class : \gettype($value), $parameter);
}
private function getExpressionLanguage(): ExpressionLanguage

69
src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
View File

@ -836,6 +836,22 @@ class CheckTypeDeclarationsPassTest extends TestCase
$this->addToAssertionCount(1);
}
/**
* @requires PHP 8
*/
public function testUnionTypePassesWithFalse()
{
$container = new ContainerBuilder();
$container->register('union', UnionConstructor::class)
->setFactory([UnionConstructor::class, 'create'])
->setArguments([false]);
(new CheckTypeDeclarationsPass(true))->process($container);
$this->addToAssertionCount(1);
}
/**
* @requires PHP 8
*/
@ -851,8 +867,6 @@ class CheckTypeDeclarationsPassTest extends TestCase
$this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CheckTypeDeclarationsPass\\UnionConstructor::__construct()" accepts "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo|int", "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Waldo" passed.');
(new CheckTypeDeclarationsPass(true))->process($container);
$this->addToAssertionCount(1);
}
/**
@ -869,6 +883,57 @@ class CheckTypeDeclarationsPassTest extends TestCase
$this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CheckTypeDeclarationsPass\\UnionConstructor::__construct()" accepts "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo|int", "array" passed.');
(new CheckTypeDeclarationsPass(true))->process($container);
}
/**
* @requires PHP 8
*/
public function testUnionTypeWithFalseFailsWithReference()
{
$container = new ContainerBuilder();
$container->register('waldo', Waldo::class);
$container->register('union', UnionConstructor::class)
->setFactory([UnionConstructor::class, 'create'])
->setArguments([new Reference('waldo')]);
$this->expectException(\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array|false", "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Waldo" passed.');
(new CheckTypeDeclarationsPass(true))->process($container);
}
/**
* @requires PHP 8
*/
public function testUnionTypeWithFalseFailsWithTrue()
{
$container = new ContainerBuilder();
$container->register('waldo', Waldo::class);
$container->register('union', UnionConstructor::class)
->setFactory([UnionConstructor::class, 'create'])
->setArguments([true]);
$this->expectException(\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array|false", "boolean" passed.');
(new CheckTypeDeclarationsPass(true))->process($container);
}
/**
* @requires PHP 8
*/
public function testReferencePassesMixed()
{
$container = new ContainerBuilder();
$container->register('waldo', Waldo::class);
$container->register('union', UnionConstructor::class)
->setFactory([UnionConstructor::class, 'make'])
->setArguments([new Reference('waldo')]);
(new CheckTypeDeclarationsPass(true))->process($container);
$this->addToAssertionCount(1);
}

10
src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructor.php
View File

@ -7,4 +7,14 @@ class UnionConstructor
public function __construct(Foo|int $arg)
{
}
public static function create(array|false $arg): static
{
return new static(0);
}
public static function make(mixed $arg): static
{
return new static(0);
}
}