Page directive limit can be null|integer >= 1

phramework · Feb 12, 2016 · 08b5841 · 08b5841
1 parent 30b6ee0
commit 08b5841
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Filter.php b/src/Filter.php
@@ -234,12 +234,12 @@ public function validate($modelClass)
             }
 
             //Check if operator is allowed
-            if (!in_array(
+            if (!$isJSONFilter && !in_array(
                 $filterAttribute->operator,
                 Operator::getByClassFlags($operatorClass)
             )) {
                 throw new RequestException(sprintf(
-                    'Filter operator "%" is not allowed for attribute "%s"',
+                    'Filter operator "%s" is not allowed for attribute "%s"',
                     $filterAttribute->operator,
                     $filterAttribute->attribute
                 ));

diff --git a/src/Page.php b/src/Page.php
@@ -26,6 +26,7 @@
  * @author Xenofon Spafaridis <nohponex@gmail.com>
  * @property-read int|null $limit
  * @property-read int      $offset
+ * @todo add validate method
  */
 class Page implements \JsonSerializable
 {
@@ -58,7 +59,7 @@ public function __construct($limit = null, $offset = 0)
      * $page = Page::parseFromParameters(
      *     (object) [
      *         'page' => [
-     *             'limit' => 0,
+     *             'limit' => 1,
      *             'offset' => 0
      *         ]
      *     ], //Request parameters object
@@ -83,7 +84,7 @@ public static function parseFromParameters($parameters, $modelClass)
 
         if (isset($parameters->page['limit'])) {
             $limit =
-                (new UnsignedIntegerValidator())
+                (new UnsignedIntegerValidator(1))
                     ->parse($parameters->page['limit']);
         }