Apply review suggestions

Author: kira0269

tests/Tests/Models/Enums/BookCategory.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
@@ -41,12 +40,4 @@ public function getBooks(): Collection
     {
         return $this->books;
     }
-
-    public function getBooksWithColor(BookColor $bookColor): Collection
-    {
-        $criteria = Criteria::create()
-            ->andWhere(Criteria::expr()->eq('bookColor', $bookColor));
-
-        return $this->books->matching($criteria);
-    }
 }

tests/Tests/Models/Enums/Library.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
@@ -29,14 +28,6 @@ public function __construct()
         $this->books = new ArrayCollection();
     }
 
-    public function getBooksWithColor(BookColor $bookColor): Collection
-    {
-        $criteria = Criteria::create()
-            ->andWhere(Criteria::expr()->eq('bookColor', $bookColor));
-
-        return $this->books->matching($criteria);
-    }
-
     public function getBooks(): Collection
     {
         return $this->books;

tests/Tests/ORM/Functional/EnumTest.php

@@ -4,6 +4,8 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
@@ -78,7 +80,6 @@ public function testEnumHydrationObjectHydrator(): void
         $this->_em->persist($card2);
         $this->_em->flush();
 
-        unset($card1, $card2);
         $this->_em->clear();
 
         /** @var list<Card> $foundCards */
@@ -406,7 +407,6 @@ public function testFindByEnum(): void
         $this->_em->persist($card2);
         $this->_em->flush();
 
-        unset($card1, $card2);
         $this->_em->clear();
 
         /** @var list<Card> $foundCards */
@@ -542,12 +542,15 @@ public function testEnumLazyCollectionMatchingWithOneToMany(): void
         $this->_em->flush();
         $libraryId = $library->id;
 
-        unset($library, $redBook, $blueBook);
-
         $this->_em->clear();
 
         $library = $this->_em->find(Library::class, $libraryId);
-        $this->assertCount(1, $library->getBooksWithColor(BookColor::RED));
+
+        $redBooks = $library->books->matching(
+            Criteria::create()->andWhere(Criteria::expr()->eq('bookColor', BookColor::RED)),
+        );
+
+        $this->assertCount(1, $redBooks);
     }
 
     public function testEnumInitializedCollectionMatchingWithOneToMany(): void
@@ -571,8 +574,6 @@ public function testEnumInitializedCollectionMatchingWithOneToMany(): void
         $this->_em->flush();
         $libraryId = $library->id;
 
-        unset($library, $redBook, $blueBook);
-
         $this->_em->clear();
 
         $library = $this->_em->find(Library::class, $libraryId);
@@ -581,7 +582,11 @@ public function testEnumInitializedCollectionMatchingWithOneToMany(): void
         // Load books collection first
         $this->assertCount(2, $library->getBooks());
 
-        $this->assertCount(1, $library->getBooksWithColor(BookColor::RED));
+        $redBooks = $library->books->matching(
+            Criteria::create()->andWhere(Criteria::expr()->eq('bookColor', BookColor::RED)),
+        );
+
+        $this->assertCount(1, $redBooks);
     }
 
     public function testEnumLazyCollectionMatchingWithManyToMany(): void
@@ -612,10 +617,14 @@ public function testEnumLazyCollectionMatchingWithManyToMany(): void
         $thrillerCategoryId = $thrillerCategory->id;
 
         $this->_em->clear();
-        unset($thrillerCategory, $fantasyCategory, $blueBook, $redBook);
 
         $thrillerCategory = $this->_em->find(BookCategory::class, $thrillerCategoryId);
-        $this->assertCount(1, $thrillerCategory->getBooksWithColor(BookColor::RED));
+
+        $redBooks = $thrillerCategory->books->matching(
+            Criteria::create()->andWhere(Criteria::expr()->eq('bookColor', BookColor::RED)),
+        );
+
+        $this->assertCount(1, $redBooks);
     }
 
     public function testEnumInitializedCollectionMatchingWithManyToMany(): void
@@ -646,14 +655,17 @@ public function testEnumInitializedCollectionMatchingWithManyToMany(): void
         $thrillerCategoryId = $thrillerCategory->id;
 
         $this->_em->clear();
-        unset($thrillerCategory, $fantasyCategory, $blueBook, $redBook);
 
         $thrillerCategory = $this->_em->find(BookCategory::class, $thrillerCategoryId);
         $this->assertInstanceOf(BookCategory::class, $thrillerCategory);
 
         // Load books collection first
         $this->assertCount(2, $thrillerCategory->getBooks());
 
-        $this->assertCount(1, $thrillerCategory->getBooksWithColor(BookColor::RED));
+        $redBooks = $thrillerCategory->books->matching(
+            Criteria::create()->andWhere(Criteria::expr()->eq('bookColor', BookColor::RED)),
+        );
+
+        $this->assertCount(1, $redBooks);
     }
 }