Merge pull request #44 from UseMuffin/query-count

Query::count() should always return integer.

Author: ADmad

src/Query.php

@@ -416,19 +416,23 @@ public function applyOptions(array $options)
     /**
      * Returns the total amount of results for this query
      *
-     * @return bool|int
+     * @return int
      */
     public function count()
     {
         if ($this->action() !== self::ACTION_READ) {
-            return false;
+            return 0;
         }
 
         if (!$this->__resultSet) {
             $this->_execute();
         }
 
-        return $this->__resultSet->total();
+        if ($this->__resultSet) {
+            return $this->__resultSet->total();
+        }
+
+        return 0;
     }
 
     /**

tests/TestCase/QueryTest.php

@@ -57,7 +57,7 @@ public function testAliasField()
 
     public function testCountNonReadAction()
     {
-        $this->assertEquals(false, $this->query->count());
+        $this->assertEquals(0, $this->query->count());
     }
 
     public function testCount()