Resolve merge conflicts

aginev · May 9, 2016 · 1fb31d3 · 1fb31d3
2 parents 27fe119 + 81f1dd2
commit 1fb31d3
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Filter.php b/src/Filter.php
@@ -164,7 +164,7 @@ public function hasCustomFilters()
      *
      * @param $key
      * @param Closure $callback
-     * @param Closure $order_callback
+     * @param Closure|null $order_callback
      * @return $this
      */
     public function custom($key, Closure $callback, Closure $order_callback = null)
@@ -430,15 +430,11 @@ private function setDateBetween($key, $value)
      * Get specific key value from the search criteria
      *
      * @param $key
-     * @return bool|mixed
+     * @return null|mixed
      */
     private function value($key)
     {
-        if ($this->request->has($key)) {
-            return $this->request->get($key);
-        }
-
-        return false;
+        return $this->request->get($key, null);
     }
 
     /**
@@ -455,4 +451,4 @@ private function setConstraint($key, Closure $order = null)
         return $this;
     }
 
-}
+}