[PropertyInfo] Added support for extracting type from constructor

lyrixx · lyrixx · commit 7ba526bda576 · 2017-12-28T16:01:51.000+01:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -100,12 +100,16 @@ public function getProperties($class, array $context = array())
      */
     public function getTypes($class, $property, array $context = array())
     {
-        if ($fromMutator = $this->extractFromMutator($class, $property)) {
-            return $fromMutator;
+        if ($type = $this->extractFromMutator($class, $property)) {
+            return $type;
         }
 
-        if ($fromAccessor = $this->extractFromAccessor($class, $property)) {
-            return $fromAccessor;
+        if ($type = $this->extractFromAccessor($class, $property)) {
+            return $type;
+        }
+
+        if ($type = $this->extractFromConstructor($class, $property)) {
+            return $type;
         }
     }
 
@@ -185,6 +189,40 @@ private function extractFromAccessor(string $class, string $property): ?array
         return null;
     }
 
+    /**
+     * Tries to extract type information from constructor.
+     *
+     * @return Type[]|null
+     */
+    private function extractFromConstructor(string $class, string $property): ?array
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException $e) {
+            return null;
+        }
+
+        $constructor = $reflectionClass->getConstructor();
+
+        if (!$constructor) {
+            return null;
+        }
+
+        foreach ($constructor->getParameters() as $parameter) {
+            if ($property !== $parameter->name) {
+                continue;
+            }
+
+            return array($this->extractFromReflectionType($parameter->getType()));
+        }
+
+        if ($reflectionClass->getParentClass()) {
+            return $this->extractFromConstructor($reflectionClass->getParentClass()->getName(), $property);
+        }
+
+        return null;
+    }
+
     private function extractFromReflectionType(\ReflectionType $reflectionType): Type
     {
         $phpTypeOrClass = $reflectionType->getName();
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -113,6 +113,24 @@ public function testGetPropertiesWithNoPrefixes()
         );
     }
 
+    public function testGetPropertiesPhp71()
+    {
+        $noPrefixExtractor = new ReflectionExtractor();
+
+        $this->assertSame(
+            array(
+                'string',
+                'stringOrNull',
+                'foo',
+                'buz',
+                'bar',
+                'baz',
+                'intWithAccessor',
+            ),
+            $noPrefixExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy')
+        );
+    }
+
     /**
      * @dataProvider typesProvider
      */
@@ -170,9 +188,22 @@ public function php71TypesProvider()
             array('bar', array(new Type(Type::BUILTIN_TYPE_INT, true))),
             array('baz', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
             array('donotexist', null),
+            array('string', array(new Type(Type::BUILTIN_TYPE_STRING, false))),
+            array('stringOrNull', array(new Type(Type::BUILTIN_TYPE_STRING, true))),
+            array('intPrivate', array(new Type(Type::BUILTIN_TYPE_INT, false))),
+            array('intWithAccessor', array(new Type(Type::BUILTIN_TYPE_INT, false))),
         );
     }
 
+    public function testExtractPhp71TypeWithParentConstructor()
+    {
+        $property = 'string';
+        $type = array(new Type(Type::BUILTIN_TYPE_STRING, false));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyChild', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyChild2', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyChild3', $property, array()));
+    }
+
     /**
      * @dataProvider getReadableProperties
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71Dummy.php
@@ -16,6 +16,22 @@
  */
 class Php71Dummy
 {
+    public $string;
+
+    public $stringOrNull;
+
+    private $intPrivate;
+
+    private $intWithAccessor;
+
+    public function __construct(string $string, ?string $stringOrNull, int $intPrivate, int $intWithAccessor)
+    {
+        $this->string = $string;
+        $this->stringOrNull = $stringOrNull;
+        $this->intPrivate = $intPrivate;
+        $this->intWithAccessor = $intWithAccessor;
+    }
+
     public function getFoo(): ?array
     {
     }
@@ -31,4 +47,9 @@ public function setBar(?int $bar)
     public function addBaz(string $baz)
     {
     }
+
+    public function getIntWithAccessor()
+    {
+        return $this->intWithAccessor;
+    }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71DummyChild.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71DummyChild.php
@@ -0,0 +1,42 @@
+<?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;
+
+class Php71DummyParent
+{
+    public $string;
+
+    public function __construct(string $string)
+    {
+        $this->string = $string;
+    }
+}
+
+class Php71DummyChild extends Php71DummyParent
+{
+    public function __construct(string $string)
+    {
+        parent::__construct($string);
+    }
+}
+
+class Php71DummyChild2 extends Php71DummyParent
+{
+}
+
+class Php71DummyChild3 extends Php71DummyParent
+{
+    public function __construct()
+    {
+        parent::__construct('hello');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,22 @@`
`16`	`16`	`*/`
`17`	`17`	`class Php71Dummy`
`18`	`18`	`{`
	`19`	`+ public $string;`
	`20`	`+`
	`21`	`+ public $stringOrNull;`
	`22`	`+`
	`23`	`+ private $intPrivate;`
	`24`	`+`
	`25`	`+ private $intWithAccessor;`
	`26`	`+`
	`27`	`+ public function __construct(string $string, ?string $stringOrNull, int $intPrivate, int $intWithAccessor)`
	`28`	`+ {`
	`29`	`+ $this->string = $string;`
	`30`	`+ $this->stringOrNull = $stringOrNull;`
	`31`	`+ $this->intPrivate = $intPrivate;`
	`32`	`+ $this->intWithAccessor = $intWithAccessor;`
	`33`	`+ }`
	`34`	`+`
`19`	`35`	`public function getFoo(): ?array`
`20`	`36`	`{`
`21`	`37`	`}`
`@@ -31,4 +47,9 @@ public function setBar(?int $bar)`
`31`	`47`	`public function addBaz(string $baz)`
`32`	`48`	`{`
`33`	`49`	`}`
	`50`	`+`
	`51`	`+ public function getIntWithAccessor()`
	`52`	`+ {`
	`53`	`+ return $this->intWithAccessor;`
	`54`	`+ }`
`34`	`55`	`}`