formatting and tweaks

Author: taylorotwell

src/Illuminate/Http/Concerns/InteractsWithInput.php

@@ -106,6 +106,22 @@ public function hasAny($keys)
         return Arr::hasAny($input, $keys);
     }
 
+    /**
+     * Apply the callback if the request contains the given input item key.
+     *
+     * @param  string  $key
+     * @param  callable  $callback
+     * @return $this|mixed
+     */
+    public function whenHas($key, callable $callback)
+    {
+        if ($this->has($key)) {
+            return $callback(data_get($this->all(), $key)) ?: $this;
+        }
+
+        return $this;
+    }
+
     /**
      * Determine if the request contains a non-empty value for an input item.
      *
@@ -163,6 +179,22 @@ public function anyFilled($keys)
         return false;
     }
 
+    /**
+     * Apply the callback if the request contains a non-empty value for the given input item key.
+     *
+     * @param  string  $key
+     * @param  callable  $callback
+     * @return $this|mixed
+     */
+    public function whenFilled($key, callable $callback)
+    {
+        if ($this->filled($key)) {
+            return $callback(data_get($this->all(), $key)) ?: $this;
+        }
+
+        return $this;
+    }
+
     /**
      * Determine if the request is missing a given input item key.
      *
@@ -430,36 +462,4 @@ protected function retrieveItem($source, $key, $default)
 
         return $this->$source->get($key, $default);
     }
-
-    /**
-     * Apply the callback if the request contains the given input item key.
-     *
-     * @param  string    $key
-     * @param  callable  $callback
-     * @return $this
-     */
-    public function whenHas($key, callable $callback)
-    {
-        if ($this->has($key)) {
-            $callback(data_get($this->all(), $key));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Apply the callback if the request contains a non-empty value for the given input item key.
-     *
-     * @param  string    $key
-     * @param  callable  $callback
-     * @return $this
-     */
-    public function whenFilled($key, callable $callback)
-    {
-        if ($this->filled($key)) {
-            $callback(data_get($this->all(), $key));
-        }
-
-        return $this;
-    }
 }