Skip to content

Commit 8a2d1b5

Browse files
Merge branch '5.1' into 5.2
* 5.1: Update .php_cs.dist Apply "visibility_required" CS rule to constants
2 parents a91ca99 + aebac8a commit 8a2d1b5

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
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
@@ -74,15 +74,15 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
7474

7575
private static $freshCache = [];
7676

77-
const VERSION = '5.2.1-DEV';
78-
const VERSION_ID = 50201;
79-
const MAJOR_VERSION = 5;
80-
const MINOR_VERSION = 2;
81-
const RELEASE_VERSION = 1;
82-
const EXTRA_VERSION = 'DEV';
83-
84-
const END_OF_MAINTENANCE = '07/2021';
85-
const END_OF_LIFE = '07/2021';
77+
public const VERSION = '5.2.1-DEV';
78+
public const VERSION_ID = 50201;
79+
public const MAJOR_VERSION = 5;
80+
public const MINOR_VERSION = 2;
81+
public const RELEASE_VERSION = 1;
82+
public const EXTRA_VERSION = 'DEV';
83+
84+
public const END_OF_MAINTENANCE = '07/2021';
85+
public const END_OF_LIFE = '07/2021';
8686

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

KernelEvents.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ final class KernelEvents
3636
*
3737
* @Event("Symfony\Component\HttpKernel\Event\RequestEvent")
3838
*/
39-
const REQUEST = 'kernel.request';
39+
public const REQUEST = 'kernel.request';
4040

4141
/**
4242
* The EXCEPTION event occurs when an uncaught exception appears.
@@ -46,7 +46,7 @@ final class KernelEvents
4646
*
4747
* @Event("Symfony\Component\HttpKernel\Event\ExceptionEvent")
4848
*/
49-
const EXCEPTION = 'kernel.exception';
49+
public const EXCEPTION = 'kernel.exception';
5050

5151
/**
5252
* The CONTROLLER event occurs once a controller was found for
@@ -57,7 +57,7 @@ final class KernelEvents
5757
*
5858
* @Event("Symfony\Component\HttpKernel\Event\ControllerEvent")
5959
*/
60-
const CONTROLLER = 'kernel.controller';
60+
public const CONTROLLER = 'kernel.controller';
6161

6262
/**
6363
* The CONTROLLER_ARGUMENTS event occurs once controller arguments have been resolved.
@@ -67,7 +67,7 @@ final class KernelEvents
6767
*
6868
* @Event("Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent")
6969
*/
70-
const CONTROLLER_ARGUMENTS = 'kernel.controller_arguments';
70+
public const CONTROLLER_ARGUMENTS = 'kernel.controller_arguments';
7171

7272
/**
7373
* The VIEW event occurs when the return value of a controller
@@ -78,7 +78,7 @@ final class KernelEvents
7878
*
7979
* @Event("Symfony\Component\HttpKernel\Event\ViewEvent")
8080
*/
81-
const VIEW = 'kernel.view';
81+
public const VIEW = 'kernel.view';
8282

8383
/**
8484
* The RESPONSE event occurs once a response was created for
@@ -89,7 +89,7 @@ final class KernelEvents
8989
*
9090
* @Event("Symfony\Component\HttpKernel\Event\ResponseEvent")
9191
*/
92-
const RESPONSE = 'kernel.response';
92+
public const RESPONSE = 'kernel.response';
9393

9494
/**
9595
* The FINISH_REQUEST event occurs when a response was generated for a request.
@@ -99,7 +99,7 @@ final class KernelEvents
9999
*
100100
* @Event("Symfony\Component\HttpKernel\Event\FinishRequestEvent")
101101
*/
102-
const FINISH_REQUEST = 'kernel.finish_request';
102+
public const FINISH_REQUEST = 'kernel.finish_request';
103103

104104
/**
105105
* The TERMINATE event occurs once a response was sent.
@@ -108,14 +108,14 @@ final class KernelEvents
108108
*
109109
* @Event("Symfony\Component\HttpKernel\Event\TerminateEvent")
110110
*/
111-
const TERMINATE = 'kernel.terminate';
111+
public const TERMINATE = 'kernel.terminate';
112112

113113
/**
114114
* Event aliases.
115115
*
116116
* These aliases can be consumed by RegisterListenersPass.
117117
*/
118-
const ALIASES = [
118+
public const ALIASES = [
119119
ControllerArgumentsEvent::class => self::CONTROLLER_ARGUMENTS,
120120
ControllerEvent::class => self::CONTROLLER,
121121
ResponseEvent::class => self::RESPONSE,

0 commit comments

Comments
 (0)