Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/Illuminate/Http/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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();

Expand Down