refactor: remove criteria from __construct

rekalogika · Feb 15, 2024 · 68c663a · 68c663a
1 parent daef51e
commit 68c663a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2.1.3
 
 * Improve lazy-matching test.
+* refactor: remove criteria from __construct
 
 ## 2.1.2
 

diff --git a/src/LazyMatching/LazyMatchingCollection.php b/src/LazyMatching/LazyMatchingCollection.php
@@ -27,6 +27,7 @@ class LazyMatchingCollection extends SelectableCollectionDecorator
 {
     public function matching(Criteria $criteria): ReadableCollection&Selectable
     {
-        return new LazyMatchingReadableCollection($this->getWrapped(), $criteria);
+        return (new LazyMatchingReadableCollection($this->getWrapped()))
+            ->matching($criteria);
     }
 }
diff --git a/src/LazyMatching/LazyMatchingReadableCollection.php b/src/LazyMatching/LazyMatchingReadableCollection.php
@@ -31,13 +31,13 @@ class LazyMatchingReadableCollection extends SelectableReadableCollectionDecorat
      * @var null|(ReadableCollection<TKey,T>&Selectable<TKey,T>)
      */
     private $resultCache = null;
+    private ?Criteria $criteria = null;
 
     /**
      * @param ReadableCollection<TKey,T> $collection
      */
     public function __construct(
-        ReadableCollection $collection,
-        private ?Criteria $criteria = null
+        ReadableCollection $collection
     ) {
         if (!$collection instanceof Selectable) {
             throw new \InvalidArgumentException('Collection must be selectable');