symfony
diff --git a/‎src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+11-1Lines changed: 11 additions & 1 deletion b/‎src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+11-1Lines changed: 11 additions & 1 deletion
diff --git a/‎src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions b/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions
diff --git a/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
@@ -201,7 +201,17 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB
         }
 
         try {
-            return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflectionProperty->getDeclaringClass()));
+            $reflector = $reflectionProperty->getDeclaringClass();
+
+            foreach ($reflector->getTraits() as $trait) {
+                if ($trait->hasProperty($property)) {
+                    $reflector = $trait;
+
+                    break;
+                }
+            }
+
+            return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflector));
         } catch (\InvalidArgumentException $e) {
             return null;
         } catch (\RuntimeException $e) {
 
@@ -16,6 +16,9 @@
 use phpDocumentor\Reflection\Types\Collection;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
@@ -273,6 +276,23 @@ public function testDocBlockFallback($property, $types)
         $this->assertEquals($types, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DockBlockFallback', $property));
     }
 
+    /**
+     * @dataProvider propertiesDefinedByTraitsProvider
+     */
+    public function testPropertiesDefinedByTraits(string $property, Type $type)
+    {
+        $this->assertEquals([$type], $this->extractor->getTypes(DummyUsingTrait::class, $property));
+    }
+
+    public function propertiesDefinedByTraitsProvider(): array
+    {
+        return [
+            ['propertyInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
+            ['propertyInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
+            ['propertyInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+        ];
+    }
+
     protected function isPhpDocumentorV5()
     {
         if (class_exists(InvalidTag::class)) {
 
@@ -0,0 +1,32 @@
+<?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\TraitUsage;
+
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+
+trait DummyTrait
+{
+    /**
+     * @var string
+     */
+    private $propertyInTraitPrimitiveType;
+
+    /**
+     * @var DummyUsedInTrait
+     */
+    private $propertyInTraitObjectSameNamespace;
+
+    /**
+     * @var Dummy
+     */
+    private $propertyInTraitObjectDifferentNamespace;
+}
@@ -0,0 +1,16 @@
+<?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\TraitUsage;
+
+class DummyUsedInTrait
+{
+}
@@ -0,0 +1,17 @@
+<?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\TraitUsage;
+
+class DummyUsingTrait
+{
+    use DummyTrait;
+}