Fix using enums with the QueryBuilder

doctrine · Sep 22, 2022 · 3fa2250 · 3fa2250
1 parent a8b02fd
commit 3fa2250
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
@@ -63,12 +63,12 @@ public function getValue($object = null)
  }
 
  /**
- * @param object $object
- * @param int|string|int[]|string[]|null $value
+ * @param object  $object
+ * @param int|string|int[]|string[]|BackedEnum|null $value
  */
  public function setValue($object, $value = null): void
  {
- if ($value !== null) {
+ if ($value !== null && ! $value instanceof BackedEnum) {
  if (is_array($value)) {
  $value = array_map(function ($item) use ($object): BackedEnum {
  return $this->initializeEnumValue($object, $item);

diff --git a/tests/Doctrine/Tests/ORM/Functional/EnumTest.php b/tests/Doctrine/Tests/ORM/Functional/EnumTest.php
@@ -232,6 +232,37 @@ public function testFindByEnum(): void
  }
  }
 
+ public function testQueryBuilderWithEnum(): void
+ {
+ $this->setUpEntitySchema([Card::class]);
+
+ $card1 = new Card();
+ $card1->suit = Suit::Clubs;
+ $card2 = new Card();
+ $card2->suit = Suit::Hearts;
+
+ $this->_em->persist($card1);
+ $this->_em->persist($card2);
+ $this->_em->flush();
+
+ unset($card1, $card2);
+ $this->_em->clear();
+
+ /** @var list<Card> $foundCards */
+ $foundCards = $this->_em->createQueryBuilder()
+ ->select('c')
+ ->from(Card::class, 'c')
+ ->where('c.suit = :suit')
+ ->setParameter('suit', Suit::Clubs)
+ ->getQuery()
+ ->getResult();
+
+ $this->assertNotEmpty($foundCards);
+ foreach ($foundCards as $card) {
+ $this->assertSame(Suit::Clubs, $card->suit);
+ }
+ }
+
  /**
  * @param class-string $cardClass
  *