Merge branch '3.4' into 4.0

* 3.4:
  [PropertyInfo] Fix compat with recent phpdocumentor/type-resolver
This commit is contained in:
Nicolas Grekas 2018-02-04 15:17:57 +01:00
commit aa964e1c52

View File

@ -188,7 +188,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
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