Working on cleaning HTTP code.

laravel · Dec 19, 2016 · e689b2a · e689b2a
1 parent 3385fdc
commit e689b2a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 62 deletions.
diff --git a/src/Illuminate/Http/JsonResponse.php b/src/Illuminate/Http/JsonResponse.php
@@ -42,7 +42,7 @@ public function withCallback($callback = null)
      * Get the json_decoded data from the response.
      *
      * @param  bool  $assoc
-     * @param  int   $depth
+     * @param  int  $depth
      * @return mixed
      */
     public function getData($assoc = false, $depth = 512)
@@ -72,31 +72,10 @@ public function setData($data = [])
         return $this->update();
     }
 
-    /**
-     * Get the JSON encoding options.
-     *
-     * @return int
-     */
-    public function getJsonOptions()
-    {
-        return $this->getEncodingOptions();
-    }
-
     /**
      * {@inheritdoc}
      */
-    public function setEncodingOptions($encodingOptions)
-    {
-        return $this->setJsonOptions($encodingOptions);
-    }
-
-    /**
-     * Set the JSON encoding options.
-     *
-     * @param  int  $options
-     * @return mixed
-     */
-    public function setJsonOptions($options)
+    public function setEncodingOptions($options)
     {
         $this->encodingOptions = (int) $options;
 

diff --git a/src/Illuminate/Http/RedirectResponse.php b/src/Illuminate/Http/RedirectResponse.php
@@ -70,9 +70,9 @@ public function withCookies(array $cookies)
      */
     public function withInput(array $input = null)
     {
-        $input = $input ?: $this->request->input();
-
-        $this->session->flashInput($this->removeFilesFromInput($input));
+        $this->session->flashInput($this->removeFilesFromInput(
+            $input ?: $this->request->input()
+        ));
 
         return $this;
     }

diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -308,9 +308,7 @@ protected function isEmptyString($key)
     {
         $value = $this->input($key);
 
-        $boolOrArray = is_bool($value) || is_array($value);
-
-        return ! $boolOrArray && trim((string) $value) === '';
+        return ! is_bool($value) && ! is_array($value) && trim((string) $value) === '';
     }
 
     /**
@@ -454,18 +452,6 @@ protected function convertUploadedFiles(array $files)
         }, $files);
     }
 
-    /**
-     * Retrieve a file from the request.
-     *
-     * @param  string  $key
-     * @param  mixed  $default
-     * @return \Illuminate\Http\UploadedFile|array|null
-     */
-    public function file($key = null, $default = null)
-    {
-        return data_get($this->allFiles(), $key, $default);
-    }
-
     /**
      * Determine if the uploaded data contains a file.
      *
@@ -487,6 +473,18 @@ public function hasFile($key)
         return false;
     }
 
+    /**
+     * Retrieve a file from the request.
+     *
+     * @param  string  $key
+     * @param  mixed  $default
+     * @return \Illuminate\Http\UploadedFile|array|null
+     */
+    public function file($key = null, $default = null)
+    {
+        return data_get($this->allFiles(), $key, $default);
+    }
+
     /**
      * Check that the given file is a valid file instance.
      *
@@ -548,15 +546,11 @@ public function old($key = null, $default = null)
     /**
      * Flash the input for the current request to the session.
      *
-     * @param  string  $filter
-     * @param  array   $keys
      * @return void
      */
-    public function flash($filter = null, $keys = [])
+    public function flash()
     {
-        $flash = (! is_null($filter)) ? $this->$filter($keys) : $this->input();
-
-        $this->session()->flashInput($flash);
+        $this->session()->flashInput($this->input());
     }
 
     /**
@@ -567,9 +561,9 @@ public function flash($filter = null, $keys = [])
      */
     public function flashOnly($keys)
     {
-        $keys = is_array($keys) ? $keys : func_get_args();
-
-        return $this->flash('only', $keys);
+        $this->session()->flashInput(
+            $this->only(is_array($keys) ? $keys : func_get_args())
+        );
     }
 
     /**
@@ -580,9 +574,9 @@ public function flashOnly($keys)
      */
     public function flashExcept($keys)
     {
-        $keys = is_array($keys) ? $keys : func_get_args();
-
-        return $this->flash('except', $keys);
+        $this->session()->flashInput(
+            $this->except(is_array($keys) ? $keys : func_get_args())
+        );
     }
 
     /**

diff --git a/tests/Http/HttpJsonResponseTest.php b/tests/Http/HttpJsonResponseTest.php
@@ -40,14 +40,14 @@ public function testSetAndRetrieveData()
     public function testSetAndRetrieveOptions()
     {
         $response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);
-        $response->setJsonOptions(JSON_PRETTY_PRINT);
-        $this->assertSame(JSON_PRETTY_PRINT, $response->getJsonOptions());
+        $response->setEncodingOptions(JSON_PRETTY_PRINT);
+        $this->assertSame(JSON_PRETTY_PRINT, $response->getEncodingOptions());
     }
 
     public function testSetAndRetrieveDefaultOptions()
     {
         $response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);
-        $this->assertSame(0, $response->getJsonOptions());
+        $this->assertSame(0, $response->getEncodingOptions());
     }
 
     public function testSetAndRetrieveStatusCode()

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -745,15 +745,19 @@ public function testHttpRequestFlashCallsSessionFlashInputWithInputData()
 
     public function testHttpRequestFlashOnlyCallsFlashWithProperParameters()
     {
-        $request = m::mock('Illuminate\Http\Request[flash]');
-        $request->shouldReceive('flash')->once()->with('only', ['key1', 'key2']);
-        $request->flashOnly(['key1', 'key2']);
+        $session = m::mock('Illuminate\Session\Store');
+        $session->shouldReceive('flashInput')->once()->with(['name' => 'Taylor']);
+        $request = Request::create('/', 'GET', ['name' => 'Taylor', 'email' => 'foo']);
+        $request->setSession($session);
+        $request->flashOnly(['name']);
     }
 
     public function testHttpRequestFlashExceptCallsFlashWithProperParameters()
     {
-        $request = m::mock('Illuminate\Http\Request[flash]');
-        $request->shouldReceive('flash')->once()->with('except', ['key1', 'key2']);
-        $request->flashExcept(['key1', 'key2']);
+        $session = m::mock('Illuminate\Session\Store');
+        $session->shouldReceive('flashInput')->once()->with(['name' => 'Taylor']);
+        $request = Request::create('/', 'GET', ['name' => 'Taylor', 'email' => 'foo']);
+        $request->setSession($session);
+        $request->flashExcept(['email']);
     }
 }