Merge pull request #352 from doctrine/3.3.x-merge-up-into-3.4.x_Lxo4D0l7

Merge release 3.3.2 into 3.4.x
doctrine · Mar 12, 2024 · e32de47 · e32de47
2 parents 1878aac + 477da35
commit e32de47
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Persistence/Reflection/EnumReflectionProperty.php b/src/Persistence/Reflection/EnumReflectionProperty.php
@@ -148,4 +148,24 @@ private function toEnum($value)
 
         return $this->enumType::from($value);
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @psalm-external-mutation-free
+     */
+    public function getModifiers(): int
+    {
+        return $this->originalReflectionProperty->getModifiers();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @psalm-external-mutation-free
+     */
+    public function getDocComment(): string|false
+    {
+        return $this->originalReflectionProperty->getDocComment();
+    }
 }
diff --git a/tests_php81/Persistence/Reflection/EnumReflectionPropertyTest.php b/tests_php81/Persistence/Reflection/EnumReflectionPropertyTest.php
@@ -113,6 +113,18 @@ public function testSetEnumArray(): void
 
         self::assertSame([Suit::Hearts, Suit::Diamonds], $object->suits);
     }
+
+    public function testGetModifiers(): void
+    {
+        $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
+        self::assertSame(ReflectionProperty::IS_PUBLIC, $reflProperty->getModifiers());
+    }
+
+    public function testGetDocComment(): void
+    {
+        $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
+        self::assertStringContainsString('@MyDoc', $reflProperty->getDocComment());
+    }
 }
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
@@ -122,6 +134,7 @@ class MyAttribute
 
 class TypedEnumClass
 {
+    /** @MyDoc */
     #[MyAttribute]
     public ?Suit $suit = null;