Skip to content

Commit b097dca

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [HttpKernel] Move @internal from AbstractSessionListener class to its methods and properties [Validator] Add missing translation for Greek (el) Add missing ID translations Add missing translations for Vietnamese (vi) [Validator] Add missing translations for Japanese. [Validator] Add missing translation for Russia (ru) #53041 [Validator] add missing Azerbaijani translation Add missing FR translation Add missing spanish translation [Validator] Update Hungarian translations [Validator] add missing Turkish translation and correct grammar Add missing romanian translation Add missing translation for Ukrainian (uk) #53050 sv_SE translation trans-unit id 110 [Validator] Add missing Croation translation Add missing translation into validators.pl.xlf [Validator] add missing lv translation [Validator] Added missing dutch translation
2 parents 90c21ba + 32d551a commit b097dca

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

EventListener/AbstractSessionListener.php

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@
3535
*
3636
* @author Johannes M. Schmitt <[email protected]>
3737
* @author Tobias Schultze <http://tobion.de>
38-
*
39-
* @internal
4038
*/
4139
abstract class AbstractSessionListener implements EventSubscriberInterface, ResetInterface
4240
{
4341
public const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
4442

43+
/**
44+
* @internal
45+
*/
4546
protected $container;
4647
private bool $debug;
4748

@@ -50,13 +51,19 @@ abstract class AbstractSessionListener implements EventSubscriberInterface, Rese
5051
*/
5152
private $sessionOptions;
5253

54+
/**
55+
* @internal
56+
*/
5357
public function __construct(ContainerInterface $container = null, bool $debug = false, array $sessionOptions = [])
5458
{
5559
$this->container = $container;
5660
$this->debug = $debug;
5761
$this->sessionOptions = $sessionOptions;
5862
}
5963

64+
/**
65+
* @internal
66+
*/
6067
public function onKernelRequest(RequestEvent $event): void
6168
{
6269
if (!$event->isMainRequest()) {
@@ -90,6 +97,9 @@ public function onKernelRequest(RequestEvent $event): void
9097
}
9198
}
9299

100+
/**
101+
* @internal
102+
*/
93103
public function onKernelResponse(ResponseEvent $event): void
94104
{
95105
if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {
@@ -218,6 +228,9 @@ public function onKernelResponse(ResponseEvent $event): void
218228
}
219229
}
220230

231+
/**
232+
* @internal
233+
*/
221234
public function onSessionUsage(): void
222235
{
223236
if (!$this->debug) {
@@ -253,6 +266,9 @@ public function onSessionUsage(): void
253266
throw new UnexpectedSessionUsageException('Session was used while the request was declared stateless.');
254267
}
255268

269+
/**
270+
* @internal
271+
*/
256272
public static function getSubscribedEvents(): array
257273
{
258274
return [
@@ -262,6 +278,9 @@ public static function getSubscribedEvents(): array
262278
];
263279
}
264280

281+
/**
282+
* @internal
283+
*/
265284
public function reset(): void
266285
{
267286
if (\PHP_SESSION_ACTIVE === session_status()) {
@@ -278,6 +297,8 @@ public function reset(): void
278297

279298
/**
280299
* Gets the session object.
300+
*
301+
* @internal
281302
*/
282303
abstract protected function getSession(): ?SessionInterface;
283304

0 commit comments

Comments
 (0)