From f04f36d458c391d45189555fd68327024823cd86 Mon Sep 17 00:00:00 2001 From: Propaganistas Date: Mon, 16 May 2016 10:25:19 +0200 Subject: [PATCH] Support JSON input in $request->get() --- src/Illuminate/Http/Request.php | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php index 98a33fe9c6e8..eef6b645b4fe 100644 --- a/src/Illuminate/Http/Request.php +++ b/src/Illuminate/Http/Request.php @@ -337,6 +337,19 @@ public function input($key = null, $default = null) return data_get($input, $key, $default); } + /** + * Retrieve an input item from the request. + * Overridden to support all of Illuminate's input sources. + * + * @param string $key + * @param string|array|null $default + * @return string|array + */ + public function get($key, $default = null) + { + return $this->input($key, $default); + } + /** * Get a subset of the items from the input data. * @@ -824,25 +837,25 @@ public function bearerToken() /** * Create an Illuminate request from a Symfony instance. * - * @param \Symfony\Component\HttpFoundation\Request $request + * @param \Symfony\Component\HttpFoundation\Request $baseRequest * @return \Illuminate\Http\Request */ - public static function createFromBase(SymfonyRequest $request) + public static function createFromBase(SymfonyRequest $baseRequest) { - if ($request instanceof static) { - return $request; + if ($baseRequest instanceof static) { + return $baseRequest; } - $content = $request->content; + $request = (new static); - $request = (new static)->duplicate( + $request->content = $baseRequest->content; - $request->query->all(), $request->request->all(), $request->attributes->all(), + $request = $request->duplicate( - $request->cookies->all(), $request->files->all(), $request->server->all() - ); + $baseRequest->query->all(), $baseRequest->request->all(), $baseRequest->attributes->all(), - $request->content = $content; + $baseRequest->cookies->all(), $baseRequest->files->all(), $baseRequest->server->all() + ); $request->request = $request->getInputSource();