Skip to content

Commit aebac8a

Browse files
Merge branch '4.4' into 5.1
* 4.4: Update .php_cs.dist Apply "visibility_required" CS rule to constants
2 parents 4582ed1 + 1eb9998 commit aebac8a

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

EventListener/AbstractSessionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939
abstract class AbstractSessionListener implements EventSubscriberInterface
4040
{
41-
const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
41+
public const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
4242

4343
protected $container;
4444
private $sessionUsageStack = [];

HttpKernelInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
interface HttpKernelInterface
2323
{
24-
const MASTER_REQUEST = 1;
25-
const SUB_REQUEST = 2;
24+
public const MASTER_REQUEST = 1;
25+
public const SUB_REQUEST = 2;
2626

2727
/**
2828
* Handles a Request to convert it to a Response.

Kernel.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
7373

7474
private static $freshCache = [];
7575

76-
const VERSION = '5.1.10-DEV';
77-
const VERSION_ID = 50110;
78-
const MAJOR_VERSION = 5;
79-
const MINOR_VERSION = 1;
80-
const RELEASE_VERSION = 10;
81-
const EXTRA_VERSION = 'DEV';
82-
83-
const END_OF_MAINTENANCE = '01/2021';
84-
const END_OF_LIFE = '01/2021';
76+
public const VERSION = '5.1.10-DEV';
77+
public const VERSION_ID = 50110;
78+
public const MAJOR_VERSION = 5;
79+
public const MINOR_VERSION = 1;
80+
public const RELEASE_VERSION = 10;
81+
public const EXTRA_VERSION = 'DEV';
82+
83+
public const END_OF_MAINTENANCE = '01/2021';
84+
public const END_OF_LIFE = '01/2021';
8585

8686
public function __construct(string $environment, bool $debug)
8787
{

KernelEvents.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ final class KernelEvents
2727
*
2828
* @Event("Symfony\Component\HttpKernel\Event\RequestEvent")
2929
*/
30-
const REQUEST = 'kernel.request';
30+
public const REQUEST = 'kernel.request';
3131

3232
/**
3333
* The EXCEPTION event occurs when an uncaught exception appears.
@@ -37,7 +37,7 @@ final class KernelEvents
3737
*
3838
* @Event("Symfony\Component\HttpKernel\Event\ExceptionEvent")
3939
*/
40-
const EXCEPTION = 'kernel.exception';
40+
public const EXCEPTION = 'kernel.exception';
4141

4242
/**
4343
* The CONTROLLER event occurs once a controller was found for
@@ -48,7 +48,7 @@ final class KernelEvents
4848
*
4949
* @Event("Symfony\Component\HttpKernel\Event\ControllerEvent")
5050
*/
51-
const CONTROLLER = 'kernel.controller';
51+
public const CONTROLLER = 'kernel.controller';
5252

5353
/**
5454
* The CONTROLLER_ARGUMENTS event occurs once controller arguments have been resolved.
@@ -58,7 +58,7 @@ final class KernelEvents
5858
*
5959
* @Event("Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent")
6060
*/
61-
const CONTROLLER_ARGUMENTS = 'kernel.controller_arguments';
61+
public const CONTROLLER_ARGUMENTS = 'kernel.controller_arguments';
6262

6363
/**
6464
* The VIEW event occurs when the return value of a controller
@@ -69,7 +69,7 @@ final class KernelEvents
6969
*
7070
* @Event("Symfony\Component\HttpKernel\Event\ViewEvent")
7171
*/
72-
const VIEW = 'kernel.view';
72+
public const VIEW = 'kernel.view';
7373

7474
/**
7575
* The RESPONSE event occurs once a response was created for
@@ -80,7 +80,7 @@ final class KernelEvents
8080
*
8181
* @Event("Symfony\Component\HttpKernel\Event\ResponseEvent")
8282
*/
83-
const RESPONSE = 'kernel.response';
83+
public const RESPONSE = 'kernel.response';
8484

8585
/**
8686
* The FINISH_REQUEST event occurs when a response was generated for a request.
@@ -90,7 +90,7 @@ final class KernelEvents
9090
*
9191
* @Event("Symfony\Component\HttpKernel\Event\FinishRequestEvent")
9292
*/
93-
const FINISH_REQUEST = 'kernel.finish_request';
93+
public const FINISH_REQUEST = 'kernel.finish_request';
9494

9595
/**
9696
* The TERMINATE event occurs once a response was sent.
@@ -99,5 +99,5 @@ final class KernelEvents
9999
*
100100
* @Event("Symfony\Component\HttpKernel\Event\TerminateEvent")
101101
*/
102-
const TERMINATE = 'kernel.terminate';
102+
public const TERMINATE = 'kernel.terminate';
103103
}

0 commit comments

Comments
 (0)