Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit aa964e1c52f8 · 2018-02-04T15:17:57.000+01:00
* 3.4:
  [PropertyInfo] Fix compat with recent phpdocumentor/type-resolver
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -188,7 +188,7 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB
             return null;
         }
 
-        return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty));
+        return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty->getDeclaringClass()));
     }
 
     private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB`
`188`	`188`	`return null;`
`189`	`189`	`}`
`190`	`190`
`191`		`- return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty));`
	`191`	`+ return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty->getDeclaringClass()));`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array`