Optimize Searcher::searchForModel and collections (#86)

* Optimize Searcher::searchForModel and collections * Fixed PHPDoc
krzysztof-gzocha · Aug 9, 2016 · 4309e0e · 4309e0e
1 parent 58c5209
commit 4309e0e
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 16 deletions.
diff --git a/src/KGzocha/Searcher/Criteria/Collection/CriteriaCollection.php b/src/KGzocha/Searcher/Criteria/Collection/CriteriaCollection.php
@@ -34,12 +34,12 @@ public function __construct($providedCriteria = [])
      */
     public function getApplicableCriteria()
     {
-        return array_filter(
+        return new self(array_filter(
             $this->getCriteria(),
             function(CriteriaInterface $criteria) {
                 return $criteria->shouldBeApplied();
             }
-        );
+        ));
     }
 
     /**
@@ -60,6 +60,22 @@ public function addCriteria(CriteriaInterface $criteria)
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->criteria);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function count()
+    {
+        return count($this->criteria);
+    }
+
     /**
      * Will ensure that provided criteria are array or traversable object.
      *

diff --git a/src/KGzocha/Searcher/Criteria/Collection/CriteriaCollectionInterface.php b/src/KGzocha/Searcher/Criteria/Collection/CriteriaCollectionInterface.php
@@ -10,13 +10,13 @@
  * @author Krzysztof Gzocha <[email protected]>
  * @author Daniel Ribeiro <[email protected]>
  */
-interface CriteriaCollectionInterface
+interface CriteriaCollectionInterface extends \Countable, \IteratorAggregate
 {
     /**
      * Will return array of CriteriaInterface
      * that returns true in shouldBeApplied().
      *
-     * @return CriteriaInterface[]
+     * @return CriteriaCollectionInterface
      */
     public function getApplicableCriteria();
 

diff --git a/src/KGzocha/Searcher/CriteriaBuilder/Collection/CriteriaBuilderCollection.php b/src/KGzocha/Searcher/CriteriaBuilder/Collection/CriteriaBuilderCollection.php
@@ -53,12 +53,28 @@ public function getCriteriaBuilders()
     public function getCriteriaBuildersForContext(
         SearchingContextInterface $searchingContext
     ) {
-        return array_filter(
+        return new self(array_filter(
             $this->getCriteriaBuilders(),
             function(CriteriaBuilderInterface $criteriaBuilder) use ($searchingContext) {
                 return $criteriaBuilder->supportsSearchingContext($searchingContext);
             }
-        );
+        ));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->criteriaBuilders);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function count()
+    {
+        return count($this->criteriaBuilders);
     }
 
     /**

diff --git a/src/KGzocha/Searcher/CriteriaBuilder/Collection/CriteriaBuilderCollectionInterface.php b/src/KGzocha/Searcher/CriteriaBuilder/Collection/CriteriaBuilderCollectionInterface.php
@@ -11,7 +11,7 @@
  *
  * @author Krzysztof Gzocha <[email protected]>
  */
-interface CriteriaBuilderCollectionInterface
+interface CriteriaBuilderCollectionInterface extends \Countable, \IteratorAggregate
 {
     /**
      * @param CriteriaBuilderInterface $criteriaBuilder
@@ -30,7 +30,7 @@ public function getCriteriaBuilders();
     /**
      * @param SearchingContextInterface $searchingContext
      * 
-     * @return CriteriaBuilderInterface[]
+     * @return CriteriaBuilderCollectionInterface
      */
     public function getCriteriaBuildersForContext(
         SearchingContextInterface $searchingContext

diff --git a/src/KGzocha/Searcher/Searcher.php b/src/KGzocha/Searcher/Searcher.php
@@ -42,25 +42,27 @@ public function __construct(
     public function search(
         CriteriaCollectionInterface $criteriaCollection
     ) {
+        $builders = $this
+            ->builders
+            ->getCriteriaBuildersForContext($this->searchingContext);
+
         foreach ($criteriaCollection->getApplicableCriteria() as $criteria) {
-            $this->searchForModel($criteria, $this->searchingContext);
+            $this->searchForModel($criteria, $this->searchingContext, $builders);
         }
 
         return $this->searchingContext->getResults();
     }
 
     /**
-     * @param CriteriaInterface         $criteria
-     * @param SearchingContextInterface $searchingContext
+     * @param CriteriaInterface                  $criteria
+     * @param SearchingContextInterface          $searchingContext
+     * @param CriteriaBuilderCollectionInterface $builders
      */
     private function searchForModel(
         CriteriaInterface $criteria,
-        SearchingContextInterface $searchingContext
+        SearchingContextInterface $searchingContext,
+        CriteriaBuilderCollectionInterface $builders
     ) {
-        $builders = $this
-            ->builders
-            ->getCriteriaBuildersForContext($searchingContext);
-
         foreach ($builders as $builder) {
             if ($builder->allowsCriteria($criteria)) {
                 $builder->buildCriteria($criteria, $searchingContext);