Skip to content

[PropertyInfo] Backport support for typed properties (PHP 7.4) #37971

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 28, 2020
Merged

[PropertyInfo] Backport support for typed properties (PHP 7.4) #37971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,18 @@ public function getProperties($class, array $context = []): ?array
*/
public function getTypes($class, $property, array $context = []): ?array
{
if (\PHP_VERSION_ID >= 70400) {
try {
$reflectionProperty = new \ReflectionProperty($class, $property);
$type = $reflectionProperty->getType();
if (null !== $type) {
return $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass());
}
} catch (\ReflectionException $e) {
// noop
}
}

if ($fromMutator = $this->extractFromMutator($class, $property)) {
return $fromMutator;
}
Expand Down Expand Up @@ -233,7 +245,7 @@ private function extractFromMutator(string $class, string $property): ?array
if (!$reflectionType = $reflectionParameter->getType()) {
return null;
}
$type = $this->extractFromReflectionType($reflectionType, $reflectionMethod);
$type = $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());

if (1 === \count($type) && \in_array($prefix, $this->arrayMutatorPrefixes)) {
$type = [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type[0])];
Expand All @@ -255,7 +267,7 @@ private function extractFromAccessor(string $class, string $property): ?array
}

if ($reflectionType = $reflectionMethod->getReturnType()) {
return $this->extractFromReflectionType($reflectionType, $reflectionMethod);
return $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());
}

if (\in_array($prefix, ['is', 'can', 'has'])) {
Expand Down Expand Up @@ -290,7 +302,7 @@ private function extractFromConstructor(string $class, string $property): ?array
}
$reflectionType = $parameter->getType();

return $reflectionType ? $this->extractFromReflectionType($reflectionType, $constructor) : null;
return $reflectionType ? $this->extractFromReflectionType($reflectionType, $constructor->getDeclaringClass()) : null;
}

if ($parentClass = $reflectionClass->getParentClass()) {
Expand Down Expand Up @@ -319,7 +331,7 @@ private function extractFromDefaultValue(string $class, string $property): ?arra
return [new Type(static::MAP_TYPES[$type] ?? $type)];
}

private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionMethod $reflectionMethod): array
private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array
{
$types = [];
$nullable = $reflectionType->allowsNull();
Expand All @@ -337,19 +349,19 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref
} elseif ($type->isBuiltin()) {
$types[] = new Type($phpTypeOrClass, $nullable);
} else {
$types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));
$types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $declaringClass));
}
}

return $types;
}

private function resolveTypeName(string $name, \ReflectionMethod $reflectionMethod): string
private function resolveTypeName(string $name, \ReflectionClass $declaringClass): string
{
if ('self' === $lcName = strtolower($name)) {
return $reflectionMethod->getDeclaringClass()->name;
return $declaringClass->name;
}
if ('parent' === $lcName && $parent = $reflectionMethod->getDeclaringClass()->getParentClass()) {
if ('parent' === $lcName && $parent = $declaringClass->getParentClass()) {
return $parent->name;
}

Expand Down
10 changes: 10 additions & 0 deletions src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Symfony\Component\PropertyInfo\Tests\Fixtures\NotInstantiable;
use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy;
use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyExtended2;
use Symfony\Component\PropertyInfo\Tests\Fixtures\Php74Dummy;
use Symfony\Component\PropertyInfo\Type;

/**
Expand Down Expand Up @@ -389,4 +390,13 @@ public function constructorTypesProvider(): array
[DefaultValue::class, 'foo', null],
];
}

/**
* @requires PHP 7.4
*/
public function testTypedProperties(): void
{
$this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));
$this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));
}
}
21 changes: 21 additions & 0 deletions src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\PropertyInfo\Tests\Fixtures;

/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class Php74Dummy
{
public Dummy $dummy;
private ?bool $nullableBoolProp;
}