8000 [9.x] Fix Symfony v6 breaking changes by driesvints · Pull Request #38376 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

[9.x] Fix Symfony v6 breaking changes #38376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 16, 2021
Merged

[9.x] Fix Symfony v6 breaking changes #38376

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19eb381
Fix type errors
driesvints Aug 13, 2021
86bcb6f
Fix session handling
driesvints Aug 16, 2021
d9b7b25
Update getSession usages
driesvints Aug 16, 2021
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
Prev Previous commit
Update getSession usages
  • Loading branch information
@driesvints
driesvints committed Aug 16, 2021
commit d9b7b25472126f43469282ae1ef8b933d9adc8ad
15 changes: 2 additions & 13 deletions src/Illuminate/Http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use RuntimeException;
use Symfony\Component\HttpFoundation\ParameterBag;
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
use Symfony\Component\HttpFoundation\Session\SessionInterface;

/**
* @method array validate(array $rules, ...$params)
Expand Down Expand Up @@ -405,8 +404,8 @@ public static function createFrom(self $from, $to = null)

$request->setJson($from->json());

if ($from->hasSession()) {
$request->setLaravelSession($from->getSession());
if ($from->hasSession() && $session = $from->getSession()) {
$request->setLaravelSession($session);
}

$request->setUserResolver($from->getUserResolver());
Expand Down Expand Up @@ -489,16 +488,6 @@ public function session()
return $this->session;
}

/**
* Get the session associated with the request.
*
* @return \Illuminate\Session\Store
*/
public function getSession(): SessionInterface
{
return $this->session;
}

/**
* Set the session instance on the request.
*
Expand Down
0