updated packages

This commit is contained in:
2019-05-18 09:06:43 +00:00
parent 901d16349e
commit e9487fa58a
2025 changed files with 30366 additions and 49653 deletions
+15 -9
View File
@@ -184,8 +184,10 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
*/
public function is(...$patterns)
{
$path = $this->decodedPath();
foreach ($patterns as $pattern) {
if (Str::is($pattern, $this->decodedPath())) {
if (Str::is($pattern, $path)) {
return true;
}
}
@@ -267,7 +269,7 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
/**
* Get the client IP address.
*
* @return string
* @return string|null
*/
public function ip()
{
@@ -298,7 +300,7 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
* Merge new input into the current request's input array.
*
* @param array $input
* @return \Illuminate\Http\Request
* @return $this
*/
public function merge(array $input)
{
@@ -311,7 +313,7 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
* Replace the input for the current request.
*
* @param array $input
* @return \Illuminate\Http\Request
* @return $this
*/
public function replace(array $input)
{
@@ -393,6 +395,8 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
$from->getContent()
);
$request->headers->replace($from->headers->all());
$request->setJson($from->json());
if ($session = $from->getSession()) {
@@ -410,7 +414,7 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
* Create an Illuminate request from a Symfony instance.
*
* @param \Symfony\Component\HttpFoundation\Request $request
* @return \Illuminate\Http\Request
* @return static
*/
public static function createFromBase(SymfonyRequest $request)
{
@@ -420,16 +424,18 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
$content = $request->content;
$request = (new static)->duplicate(
$newRequest = (new static)->duplicate(
$request->query->all(), $request->request->all(), $request->attributes->all(),
$request->cookies->all(), $request->files->all(), $request->server->all()
);
$request->content = $content;
$newRequest->headers->replace($request->headers->all());
$request->request = $request->getInputSource();
$newRequest->content = $content;
return $request;
$newRequest->request = $newRequest->getInputSource();
return $newRequest;
}
/**