Replace tags by phpDocumentor\Reflection\Type

GuilhemN · GuilhemN · commit 598643683ef2 · 2016-08-25T19:20:49.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -128,7 +128,7 @@ public function getTypes($class, $property, array $context = array())
         $types = array();
         /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
         foreach ($docBlock->getTagsByName($tag) as $tag) {
-            $types = array_merge($types, $this->phpDocTypeHelper->getTypesFromTag($tag));
+            $types = array_merge($types, $this->phpDocTypeHelper->getTypes($tag->getType()));
         }
 
         if (!isset($types[0])) {
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -11,9 +11,7 @@
 
 namespace Symfony\Component\PropertyInfo\Util;
 
-use phpDocumentor\Reflection\DocBlock\Tags\Param;
-use phpDocumentor\Reflection\DocBlock\Tags\Return_;
-use phpDocumentor\Reflection\DocBlock\Tags\Var_;
+use phpDocumentor\Reflection\Type as DocType;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Null_;
 use Symfony\Component\PropertyInfo\Type;
@@ -27,16 +25,13 @@
 final class PhpDocTypeHelper
 {
     /**
-     * Creates a {@see Type} from a PHPDoc tag.
-     *
-     * @param Var_|Return_|Param $tag
+     * Creates a {@see Type} from a PHPDoc type.
      *
      * @return Type
      */
-    public function getTypesFromTag($tag)
+    public function getTypes(DocType $varType)
     {
         $types = array();
-        $varType = $tag->getType();
         $nullable = false;
 
         if (!$varType instanceof Compound) {

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function getTypes($class, $property, array $context = array())`
`128`	`128`	`$types = array();`
`129`	`129`	`/** @var DocBlock\Tags\Var_\|DocBlock\Tags\Return_\|DocBlock\Tags\Param $tag */`
`130`	`130`	`foreach ($docBlock->getTagsByName($tag) as $tag) {`
`131`		`- $types = array_merge($types, $this->phpDocTypeHelper->getTypesFromTag($tag));`
	`131`	`+ $types = array_merge($types, $this->phpDocTypeHelper->getTypes($tag->getType()));`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`if (!isset($types[0])) {`