minor #40760 Simplified condition and removed unused code from AbstractSessionListener::onKernelRequest (StefanoCappellini)

nicolas-grekas · nicolas-grekas · commit 03ef11649670 · 2021-04-11T14:47:43.000+02:00
This PR was submitted for the 5.x branch but it was merged into the 4.4 branch instead. Discussion ---------- Simplified condition and removed unused code from AbstractSessionListener::onKernelRequest | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | None | License | MIT This PR simplifies a condition and removes unused code (AFAIK coming from #38894)). Commits ------- d344b8d Simplified condition and removed unused code from AbstractSessionListener::onKernelRequest
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -53,14 +53,13 @@ public function onKernelRequest(GetResponseEvent $event)
             return;
         }
 
-        $session = null;
         $request = $event->getRequest();
         if (!$request->hasSession()) {
             $sess = null;
             $request->setSessionFactory(function () use (&$sess) { return $sess ?? $sess = $this->getSession(); });
         }
 
-        $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
+        $session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null;
         $this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,13 @@ public function onKernelRequest(GetResponseEvent $event)`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`	`55`
`56`		`- $session = null;`
`57`	`56`	`$request = $event->getRequest();`
`58`	`57`	`if (!$request->hasSession()) {`
`59`	`58`	`$sess = null;`
`60`	`59`	`$request->setSessionFactory(function () use (&$sess) { return $sess ?? $sess = $this->getSession(); });`
`61`	`60`	`}`
`62`	`61`
`63`		`- $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);`
	`62`	`+ $session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null;`
`64`	`63`	`$this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;`
`65`	`64`	`}`
`66`	`65`