minor #58103 [HttpKernel][Security] Minor cleanups (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d63504449d41 · 2024-08-30T17:36:06.000+02:00
This PR was merged into the 7.2 branch. Discussion ---------- [HttpKernel][Security] Minor cleanups | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Commits ------- 569bb05 [HttpKernel][Security] Minor cleanups
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -93,7 +93,7 @@ public function onKernelRequest(RequestEvent $event): void
      */
     public function onKernelResponse(ResponseEvent $event): void
     {
-        if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {
+        if (!$event->isMainRequest()) {
             return;
         }
 
diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
@@ -47,7 +47,7 @@ public function __construct(?TokenGeneratorInterface $generator = null, ?TokenSt
         if (null === $namespace) {
             $this->namespace = $superGlobalNamespaceGenerator;
         } elseif ($namespace instanceof RequestStack) {
-            $this->namespace = function () use ($namespace, $superGlobalNamespaceGenerator) {
+            $this->namespace = static function () use ($namespace, $superGlobalNamespaceGenerator) {
                 if ($request = $namespace->getMainRequest()) {
                     return $request->isSecure() ? 'https-' : '';
                 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function onKernelRequest(RequestEvent $event): void`
`93`	`93`	`*/`
`94`	`94`	`public function onKernelResponse(ResponseEvent $event): void`
`95`	`95`	`{`
`96`		`- if (!$event->isMainRequest() \|\| (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {`
	`96`	`+ if (!$event->isMainRequest()) {`
`97`	`97`	`return;`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(?TokenGeneratorInterface $generator = null, ?TokenSt`
`47`	`47`	`if (null === $namespace) {`
`48`	`48`	`$this->namespace = $superGlobalNamespaceGenerator;`
`49`	`49`	`} elseif ($namespace instanceof RequestStack) {`
`50`		`- $this->namespace = function () use ($namespace, $superGlobalNamespaceGenerator) {`
	`50`	`+ $this->namespace = static function () use ($namespace, $superGlobalNamespaceGenerator) {`
`51`	`51`	`if ($request = $namespace->getMainRequest()) {`
`52`	`52`	`return $request->isSecure() ? 'https-' : '';`
`53`	`53`	`}`