Merge branch 'release/1.1.3'

devsdmf · Mar 18, 2016 · ed08804 · ed08804
2 parents b5ae248 + b8452ec
commit ed08804
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 # CHANGELOG
+- `1.1.3`
+    * Fixed a bug when a limit and/or offset parameters in fetch method is not a literal integer
 - `1.1.2`
     * Fixed entity mapping bug that causes to mapper index properties without @db_ref annotation
 - `1.1.1`

diff --git a/src/DataMonkey/Entity/Exception/InvalidEntityException.php b/src/DataMonkey/Entity/Exception/InvalidEntityException.php
@@ -11,4 +11,4 @@
  */
 class InvalidEntityException extends \RuntimeException
 {
-}
+}
diff --git a/src/DataMonkey/Entity/Exception/InvalidStrategyException.php b/src/DataMonkey/Entity/Exception/InvalidStrategyException.php
@@ -11,4 +11,4 @@
  */
 class InvalidStrategyException extends \RuntimeException
 {
-}
+}
diff --git a/src/DataMonkey/Repository/Exception/InvalidPrimaryKeyException.php b/src/DataMonkey/Repository/Exception/InvalidPrimaryKeyException.php
@@ -11,4 +11,4 @@
  */
 class InvalidPrimaryKeyException extends \RuntimeException
 {
-}
+}
diff --git a/src/DataMonkey/Repository/Repository.php b/src/DataMonkey/Repository/Repository.php
@@ -75,12 +75,12 @@ public function fetch($criteria = null, array $orderBy = null, $limit = null, $o
         }
 
         // Preparing limit statement
-        if (!is_null($limit)) {
+        if (!is_null($limit) && (int) $limit > 0) {
             $limit_statement = ' LIMIT ';
-            if (is_null($offset)) {
-                $limit_statement .= $limit;
+            if (!is_null($offset) && (int) $offset > 0) {
+                $limit_statement .= (int) $offset . ',' . $limit;
             } else {
-                $limit_statement .= $offset . ',' . $limit;
+                $limit_statement .= (int) $limit;
             }
         }
 

diff --git a/src/DataMonkey/Repository/RepositoryInterface.php b/src/DataMonkey/Repository/RepositoryInterface.php
@@ -16,10 +16,10 @@ interface RepositoryInterface
     /**
      * Fetch objects from database
      *
-     * @param array|ExportableEntity $criteria
-     * @param array                  $orderBy
-     * @param integer                $limit
-     * @param integer                $offset
+     * @param  array|ExportableEntity             $criteria
+     * @param  array                              $orderBy
+     * @param  integer                            $limit
+     * @param  integer                            $offset
      * @return \DataMonkey\Repository\ResultStack
      */
     public function fetch($criteria = null, array $orderBy = null, $limit = null, $offset = null);
@@ -34,10 +34,10 @@ public function fetchAll();
     /**
      * Fetch objects by a set of criteria
      *
-     * @param  array   $criteria
-     * @param  array   $orderBy
-     * @param  integer $limit
-     * @param  integer $offset
+     * @param  array                              $criteria
+     * @param  array                              $orderBy
+     * @param  integer                            $limit
+     * @param  integer                            $offset
      * @return \DataMonkey\Repository\ResultStack
      */
     public function fetchBy(array $criteria, array $orderBy = null, $limit = null, $offset = null);