Tidy up client

petercoles · May 12, 2016 · 9cf7370 · 9cf7370
1 parent cfafd25
commit 9cf7370
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -242,7 +242,7 @@ public function setFlag($name, $flag)
      */
     public function setDateRange($name, $range)
     {
-        if ($range) {
+        if (!empty($range)) {
             $this->options[ 'json' ][ $name ] = $range;
         }
         return $this;
@@ -260,7 +260,7 @@ public function setOrder($by, $direction = null)
         if ($by) {
             $this->options[ 'json' ][ 'orderBy' ] = $by;
 
-            if ($direction) {
+            if (!empty($direction)) {
                 $this->options[ 'json' ][ 'sortDir' ] = $direction;
             }
         }
@@ -270,20 +270,14 @@ public function setOrder($by, $direction = null)
     /**
      * Setter for record range.
      *
-     * @param string $from
-     * @param string $count
+     * @param int $from
+     * @param int $count
      * @return Client
      */
-    public function setRecordRange($from = null, $count = null)
+    public function setRecordRange($from = 0, $count = 1000)
     {
-        if ($from) {
-            $this->options[ 'json' ][ 'fromRecord' ] = $from;
-        }
-
-        if ($count) {
-            $this->options[ 'json' ][ 'recordCount' ] = $count;
-        }
-
+        $this->options[ 'json' ][ 'fromRecord' ] = $from;
+        $this->options[ 'json' ][ 'recordCount' ] = $count;
         return $this;
     }