Merge pull request #60 from krzysztof-gzocha/result-collection-fixes

ResultCollection fix
krzysztof-gzocha · May 23, 2016 · f408b75 · f408b75
2 parents 969a459 + 62821d1
commit f408b75
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,8 +1,9 @@
 {
     "name": "krzysztof-gzocha/searcher",
-    "description": "Library which allows to construct complex queries basing on models",
+    "description": "Searcher is a framework-agnostic search query builder. Search queries are written using Criterias and can be run against MySQL, MongoDB or even files.",
     "license": "MIT",
     "type": "library",
+    "homepage": "http://searcher.rtfd.io",
     "authors": [
         {
             "name": "Krzysztof Gzocha"
@@ -11,7 +12,8 @@
     "suggest": {
         "doctrine/orm": "to use with Doctrine's ORM",
         "doctrine/mongodb-odm": "to use with Doctrine's ODM",
-        "ruflin/elastica": "to use with ruflin/elastica"
+        "ruflin/elastica": "to use with ruflin/elastica",
+        "symfony/finder": "to use with Symfony Finder component"
     },
     "config": {
         "bin-dir": "bin",

diff --git a/src/KGzocha/Searcher/Context/FinderSearchingContext.php b/src/KGzocha/Searcher/Context/FinderSearchingContext.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Finder\Finder;
 
 /**
- * Use this searching context to search for files with Symfony Finder component
+ * Use this searching context to search for files with Symfony Finder component.
  *
  * @author Krzysztof Gzocha <krzysztof@propertyfinder.ae>
  */
@@ -40,6 +40,6 @@ public function getResults()
      */
     public static function buildDefault()
     {
-        return new FinderSearchingContext(new Finder());
+        return new self(new Finder());
     }
 }
diff --git a/src/KGzocha/Searcher/Criteria/Adapter/MappedOrderByAdapter.php b/src/KGzocha/Searcher/Criteria/Adapter/MappedOrderByAdapter.php
@@ -28,8 +28,8 @@ class MappedOrderByAdapter implements OrderByCriteriaInterface
 
     /**
      * @param OrderByCriteriaInterface $orderBy
-     * @param array|\ArrayAccess            $fieldsMap keys will be visible to user,
-     *                                                 values to CriteriaBuilder
+     * @param array|\ArrayAccess       $fieldsMap keys will be visible to user,
+     *                                            values to CriteriaBuilder
      */
     public function __construct(
         OrderByCriteriaInterface $orderBy,
@@ -49,7 +49,7 @@ public function getMappedOrderBy()
             return $this->fieldsMap[$this->getOrderBy()];
         }
 
-        return null;
+        return;
     }
 
     /**

diff --git a/src/KGzocha/Searcher/Criteria/Collection/NamedCriteriaCollection.php b/src/KGzocha/Searcher/Criteria/Collection/NamedCriteriaCollection.php
@@ -21,7 +21,7 @@ public function __get($name)
     }
 
     /**
-     * @param string                 $name
+     * @param string            $name
      * @param CriteriaInterface $value
      */
     public function __set($name, CriteriaInterface $value)
@@ -30,7 +30,7 @@ public function __set($name, CriteriaInterface $value)
     }
 
     /**
-     * @param string                 $name
+     * @param string            $name
      * @param CriteriaInterface $filterModel
      *
      * @return $this

diff --git a/src/KGzocha/Searcher/Criteria/Collection/NamedCriteriaCollectionInterface.php b/src/KGzocha/Searcher/Criteria/Collection/NamedCriteriaCollectionInterface.php
@@ -15,7 +15,7 @@ interface NamedCriteriaCollectionInterface extends
     CriteriaCollectionInterface
 {
     /**
-     * @param string                 $name
+     * @param string            $name
      * @param CriteriaInterface $filterModel
      *
      * @return $this

diff --git a/src/KGzocha/Searcher/CriteriaBuilder/CriteriaBuilderInterface.php b/src/KGzocha/Searcher/CriteriaBuilder/CriteriaBuilderInterface.php
@@ -19,7 +19,7 @@ interface CriteriaBuilderInterface
     /**
      * Will impose conditions with values taken from the criteria.
      *
-     * @param CriteriaInterface    $criteria
+     * @param CriteriaInterface         $criteria
      * @param SearchingContextInterface $searchingContext
      */
     public function buildCriteria(

diff --git a/src/KGzocha/Searcher/Result/ResultCollection.php b/src/KGzocha/Searcher/Result/ResultCollection.php
@@ -71,6 +71,7 @@ public function getIterator()
      */
     private function canUseResults($results = [])
     {
-        return is_array($results) || $results instanceof \Traversable;
+        return is_array($results)
+            || (is_object($results) && $results instanceof \Traversable);
     }
 }
diff --git a/tests/Result/ResultCollectionTest.php b/tests/Result/ResultCollectionTest.php
@@ -21,6 +21,7 @@ public function testNumberOfElements($inputArray, $expectedCount)
         $result = new ResultCollection($inputArray);
 
         $this->assertCount($expectedCount, $result);
+        $this->assertCount($expectedCount, $result->getResults());
     }
 
     /**
@@ -38,6 +39,30 @@ public function numberOfElementsDataProvider()
         ];
     }
 
+    /**
+     * @param mixed $inputArray
+     * @dataProvider numberOfWrongElementsProvider
+     */
+    public function testNumberOfWrongElements($inputArray)
+    {
+        $result = new ResultCollection($inputArray);
+
+        $this->assertCount(0, $result);
+        $this->assertCount(0, $result->getResults());
+    }
+
+    public function numberOfWrongElementsProvider()
+    {
+        return [
+            [new \stdClass()],
+            [null],
+            [1],
+            [-0.34],
+            ['asd'],
+            [false],
+        ];
+    }
+
     /**
      * @param array $inputArray
      * @param string $expectedOutput