Skip to content

Commit 9290442

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.1' into 5.2
* 5.1: Update .php_cs.dist Apply "visibility_required" CS rule to constants
2 parents 6528d37 + 7cefd57 commit 9290442

File tree

7 files changed

+97
-97
lines changed

7 files changed

+97
-97
lines changed

‎Cookie.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
class Cookie
2020
{
21-
const SAMESITE_NONE = 'none';
22-
const SAMESITE_LAX = 'lax';
23-
const SAMESITE_STRICT = 'strict';
21+
public const SAMESITE_NONE = 'none';
22+
public const SAMESITE_LAX = 'lax';
23+
public const SAMESITE_STRICT = 'strict';
2424

2525
protected $name;
2626
protected $value;

‎JsonResponse.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class JsonResponse extends Response
2929

3030
// Encode <, >, ', &, and " characters in the JSON, making it also safe to be embedded into HTML.
3131
// 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT
32-
const DEFAULT_ENCODING_OPTIONS = 15;
32+
public const DEFAULT_ENCODING_OPTIONS = 15;
3333

3434
protected $encodingOptions = self::DEFAULT_ENCODING_OPTIONS;
3535

‎Request.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,28 @@ class_exists(ServerBag::class);
4040
*/
4141
class Request
4242
{
43-
const HEADER_FORWARDED = 0b000001; // When using RFC 7239
44-
const HEADER_X_FORWARDED_FOR = 0b000010;
45-
const HEADER_X_FORWARDED_HOST = 0b000100;
46-
const HEADER_X_FORWARDED_PROTO = 0b001000;
47-
const HEADER_X_FORWARDED_PORT = 0b010000;
48-
const HEADER_X_FORWARDED_PREFIX = 0b100000;
43+
public const HEADER_FORWARDED = 0b000001; // When using RFC 7239
44+
public const HEADER_X_FORWARDED_FOR = 0b000010;
45+
public const HEADER_X_FORWARDED_HOST = 0b000100;
46+
public const HEADER_X_FORWARDED_PROTO = 0b001000;
47+
public const HEADER_X_FORWARDED_PORT = 0b010000;
48+
public const HEADER_X_FORWARDED_PREFIX = 0b100000;
4949

5050
/** @deprecated since Symfony 5.2, use either "HEADER_X_FORWARDED_FOR | HEADER_X_FORWARDED_HOST | HEADER_X_FORWARDED_PORT | HEADER_X_FORWARDED_PROTO" or "HEADER_X_FORWARDED_AWS_ELB" or "HEADER_X_FORWARDED_TRAEFIK" constants instead. */
51-
const HEADER_X_FORWARDED_ALL = 0b1011110; // All "X-Forwarded-*" headers sent by "usual" reverse proxy
52-
const HEADER_X_FORWARDED_AWS_ELB = 0b0011010; // AWS ELB doesn't send X-Forwarded-Host
53-
const HEADER_X_FORWARDED_TRAEFIK = 0b0111110; // All "X-Forwarded-*" headers sent by Traefik reverse proxy
54-
55-
const METHOD_HEAD = 'HEAD';
56-
const METHOD_GET = 'GET';
57-
const METHOD_POST = 'POST';
58-
const METHOD_PUT = 'PUT';
59-
const METHOD_PATCH = 'PATCH';
60-
const METHOD_DELETE = 'DELETE';
61-
const METHOD_PURGE = 'PURGE';
62-
const METHOD_OPTIONS = 'OPTIONS';
63-
const METHOD_TRACE = 'TRACE';
64-
const METHOD_CONNECT = 'CONNECT';
51+
public const HEADER_X_FORWARDED_ALL = 0b1011110; // All "X-Forwarded-*" headers sent by "usual" reverse proxy
52+
public const HEADER_X_FORWARDED_AWS_ELB = 0b0011010; // AWS ELB doesn't send X-Forwarded-Host
53+
public const HEADER_X_FORWARDED_TRAEFIK = 0b0111110; // All "X-Forwarded-*" headers sent by Traefik reverse proxy
54+
55+
public const METHOD_HEAD = 'HEAD';
56+
public const METHOD_GET = 'GET';
57+
public const METHOD_POST = 'POST';
58+
public const METHOD_PUT = 'PUT';
59+
public const METHOD_PATCH = 'PATCH';
60+
public const METHOD_DELETE = 'DELETE';
61+
public const METHOD_PURGE = 'PURGE';
62+
public const METHOD_OPTIONS = 'OPTIONS';
63+
public const METHOD_TRACE = 'TRACE';
64+
public const METHOD_CONNECT = 'CONNECT';
6565

6666
/**
6767
* @var string[]

‎Response.php‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -21,69 +21,69 @@ class_exists(ResponseHeaderBag::class);
2121
*/
2222
class Response
2323
{
24-
const HTTP_CONTINUE = 100;
25-
const HTTP_SWITCHING_PROTOCOLS = 101;
26-
const HTTP_PROCESSING = 102; // RFC2518
27-
const HTTP_EARLY_HINTS = 103; // RFC8297
28-
const HTTP_OK = 200;
29-
const HTTP_CREATED = 201;
30-
const HTTP_ACCEPTED = 202;
31-
const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
32-
const HTTP_NO_CONTENT = 204;
33-
const HTTP_RESET_CONTENT = 205;
34-
const HTTP_PARTIAL_CONTENT = 206;
35-
const HTTP_MULTI_STATUS = 207; // RFC4918
36-
const HTTP_ALREADY_REPORTED = 208; // RFC5842
37-
const HTTP_IM_USED = 226; // RFC3229
38-
const HTTP_MULTIPLE_CHOICES = 300;
39-
const HTTP_MOVED_PERMANENTLY = 301;
40-
const HTTP_FOUND = 302;
41-
const HTTP_SEE_OTHER = 303;
42-
const HTTP_NOT_MODIFIED = 304;
43-
const HTTP_USE_PROXY = 305;
44-
const HTTP_RESERVED = 306;
45-
const HTTP_TEMPORARY_REDIRECT = 307;
46-
const HTTP_PERMANENTLY_REDIRECT = 308; // RFC7238
47-
const HTTP_BAD_REQUEST = 400;
48-
const HTTP_UNAUTHORIZED = 401;
49-
const HTTP_PAYMENT_REQUIRED = 402;
50-
const HTTP_FORBIDDEN = 403;
51-
const HTTP_NOT_FOUND = 404;
52-
const HTTP_METHOD_NOT_ALLOWED = 405;
53-
const HTTP_NOT_ACCEPTABLE = 406;
54-
const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
55-
const HTTP_REQUEST_TIMEOUT = 408;
56-
const HTTP_CONFLICT = 409;
57-
const HTTP_GONE = 410;
58-
const HTTP_LENGTH_REQUIRED = 411;
59-
const HTTP_PRECONDITION_FAILED = 412;
60-
const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
61-
const HTTP_REQUEST_URI_TOO_LONG = 414;
62-
const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
63-
const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
64-
const HTTP_EXPECTATION_FAILED = 417;
65-
const HTTP_I_AM_A_TEAPOT = 418; // RFC2324
66-
const HTTP_MISDIRECTED_REQUEST = 421; // RFC7540
67-
const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918
68-
const HTTP_LOCKED = 423; // RFC4918
69-
const HTTP_FAILED_DEPENDENCY = 424; // RFC4918
70-
const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04
71-
const HTTP_UPGRADE_REQUIRED = 426; // RFC2817
72-
const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585
73-
const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585
74-
const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; // RFC6585
75-
const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451;
76-
const HTTP_INTERNAL_SERVER_ERROR = 500;
77-
const HTTP_NOT_IMPLEMENTED = 501;
78-
const HTTP_BAD_GATEWAY = 502;
79-
const HTTP_SERVICE_UNAVAILABLE = 503;
80-
const HTTP_GATEWAY_TIMEOUT = 504;
81-
const HTTP_VERSION_NOT_SUPPORTED = 505;
82-
const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; // RFC2295
83-
const HTTP_INSUFFICIENT_STORAGE = 507; // RFC4918
84-
const HTTP_LOOP_DETECTED = 508; // RFC5842
85-
const HTTP_NOT_EXTENDED = 510; // RFC2774
86-
const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511; // RFC6585
24+
public const HTTP_CONTINUE = 100;
25+
public const HTTP_SWITCHING_PROTOCOLS = 101;
26+
public const HTTP_PROCESSING = 102; // RFC2518
27+
public const HTTP_EARLY_HINTS = 103; // RFC8297
28+
public const HTTP_OK = 200;
29+
public const HTTP_CREATED = 201;
30+
public const HTTP_ACCEPTED = 202;
31+
public const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
32+
public const HTTP_NO_CONTENT = 204;
33+
public const HTTP_RESET_CONTENT = 205;
34+
public const HTTP_PARTIAL_CONTENT = 206;
35+
public const HTTP_MULTI_STATUS = 207; // RFC4918
36+
public const HTTP_ALREADY_REPORTED = 208; // RFC5842
37+
public const HTTP_IM_USED = 226; // RFC3229
38+
public const HTTP_MULTIPLE_CHOICES = 300;
39+
public const HTTP_MOVED_PERMANENTLY = 301;
40+
public const HTTP_FOUND = 302;
41+
public const HTTP_SEE_OTHER = 303;
42+
public const HTTP_NOT_MODIFIED = 304;
43+
public const HTTP_USE_PROXY = 305;
44+
public const HTTP_RESERVED = 306;
45+
public const HTTP_TEMPORARY_REDIRECT = 307;
46+
public const HTTP_PERMANENTLY_REDIRECT = 308; // RFC7238
47+
public const HTTP_BAD_REQUEST = 400;
48+
public const HTTP_UNAUTHORIZED = 401;
49+
public const HTTP_PAYMENT_REQUIRED = 402;
50+
public const HTTP_FORBIDDEN = 403;
51+
public const HTTP_NOT_FOUND = 404;
52+
public const HTTP_METHOD_NOT_ALLOWED = 405;
53+
public const HTTP_NOT_ACCEPTABLE = 406;
54+
public const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
55+
public const HTTP_REQUEST_TIMEOUT = 408;
56+
public const HTTP_CONFLICT = 409;
57+
public const HTTP_GONE = 410;
58+
public const HTTP_LENGTH_REQUIRED = 411;
59+
public const HTTP_PRECONDITION_FAILED = 412;
60+
public const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
61+
public const HTTP_REQUEST_URI_TOO_LONG = 414;
62+
public const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
63+
public const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
64+
public const HTTP_EXPECTATION_FAILED = 417;
65+
public const HTTP_I_AM_A_TEAPOT = 418; // RFC2324
66+
public const HTTP_MISDIRECTED_REQUEST = 421; // RFC7540
67+
public const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918
68+
public const HTTP_LOCKED = 423; // RFC4918
69+
public const HTTP_FAILED_DEPENDENCY = 424; // RFC4918
70+
public const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04
71+
public const HTTP_UPGRADE_REQUIRED = 426; // RFC2817
72+
public const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585
73+
public const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585
74+
public const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; // RFC6585
75+
public const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451;
76+
public const HTTP_INTERNAL_SERVER_ERROR = 500;
77+
public const HTTP_NOT_IMPLEMENTED = 501;
78+
public const HTTP_BAD_GATEWAY = 502;
79+
public const HTTP_SERVICE_UNAVAILABLE = 503;
80+
public const HTTP_GATEWAY_TIMEOUT = 504;
81+
public const HTTP_VERSION_NOT_SUPPORTED = 505;
82+
public const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; // RFC2295
83+
public const HTTP_INSUFFICIENT_STORAGE = 507; // RFC4918
84+
public const HTTP_LOOP_DETECTED = 508; // RFC5842
85+
public const HTTP_NOT_EXTENDED = 510; // RFC2774
86+
public const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511; // RFC6585
8787

8888
/**
8989
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control

‎ResponseHeaderBag.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
*/
1919
class ResponseHeaderBag extends HeaderBag
2020
{
21-
const COOKIES_FLAT = 'flat';
22-
const COOKIES_ARRAY = 'array';
21+
public const COOKIES_FLAT = 'flat';
22+
public const COOKIES_ARRAY = 'array';
2323

24-
const DISPOSITION_ATTACHMENT = 'attachment';
25-
const DISPOSITION_INLINE = 'inline';
24+
public const DISPOSITION_ATTACHMENT = 'attachment';
25+
public const DISPOSITION_INLINE = 'inline';
2626

2727
protected $computedCacheControl = [];
2828
protected $cookies = [];

‎Session/Storage/Handler/PdoSessionHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PdoSessionHandler extends AbstractSessionHandler
4646
* write will win in this case. It might be useful when you implement your own
4747
* logic to deal with this like an optimistic approach.
4848
*/
49-
const LOCK_NONE = 0;
49+
public const LOCK_NONE = 0;
5050

5151
/**
5252
* Creates an application-level lock on a session. The disadvantage is that the
@@ -55,15 +55,15 @@ class PdoSessionHandler extends AbstractSessionHandler
5555
* does not require a transaction.
5656
* This mode is not available for SQLite and not yet implemented for oci and sqlsrv.
5757
*/
58-
const LOCK_ADVISORY = 1;
58+
public const LOCK_ADVISORY = 1;
5959

6060
/**
6161
* Issues a real row lock. Since it uses a transaction between opening and
6262
* closing a session, you have to be careful when you use same database connection
6363
* that you also use for your application logic. This mode is the default because
6464
* it's the only reliable solution across DBMSs.
6565
*/
66-
const LOCK_TRANSACTIONAL = 2;
66+
public const LOCK_TRANSACTIONAL = 2;
6767

6868
private const MAX_LIFETIME = 315576000;
6969

‎Session/Storage/MetadataBag.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
*/
2323
class MetadataBag implements SessionBagInterface
2424
{
25-
const CREATED = 'c';
26-
const UPDATED = 'u';
27-
const LIFETIME = 'l';
25+
public const CREATED = 'c';
26+
public const UPDATED = 'u';
27+
public const LIFETIME = 'l';
2828

2929
/**
3030
* @var string

0 commit comments

Comments
 (0)