Use phpdocumentor/reflection-docblock for filtering constructor params phpdoc instead of regex symfony#30056

karser · karser · commit a54f0bd42cfe · 2019-02-05T20:48:05.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -212,18 +212,30 @@ private function getDocBlockFromConstructor($class, $property)
         if (!$reflectionConstructor) {
             return null;
         }
-        if (!preg_match('/\@param.+?\$'.$property.'/', $reflectionConstructor->getDocComment(), $matches)) {
-            return null;
-        }
-        list($docComment) = $matches;
 
         try {
-            return $this->docBlockFactory->create($docComment, $this->contextFactory->createFromReflector($reflectionConstructor));
+            $docBlock = $this->docBlockFactory->create($reflectionConstructor, $this->contextFactory->createFromReflector($reflectionConstructor));
+            return $this->filterDocBlockParams($docBlock, $property);
         } catch (\InvalidArgumentException $e) {
             return null;
         }
     }
 
+    /**
+     * @param DocBlock $docBlock
+     * @param string $allowedParam
+     * @return DocBlock
+     */
+    private function filterDocBlockParams(DocBlock $docBlock, $allowedParam)
+    {
+        $tags = array_values(array_filter($docBlock->getTagsByName('param'), function($tag) use ($allowedParam) {
+            return $tag instanceof DocBlock\Tags\Param && $allowedParam === $tag->getVariableName();
+        }));
+
+        return new DocBlock($docBlock->getSummary(), $docBlock->getDescription(), $tags, $docBlock->getContext(),
+            $docBlock->getLocation(), $docBlock->isTemplateStart(), $docBlock->isTemplateEnd());
+    }
+
     /**
      * Gets the DocBlock from a property.
      *
