Skip to content

Commit 9d8eb64

Browse files
Merge branch '4.4' into 5.1
* 4.4: Update .php_cs.dist Apply "visibility_required" CS rule to constants
2 parents 948d759 + cd7b89e commit 9d8eb64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+143
-143
lines changed

Constraint.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ abstract class Constraint
3434
/**
3535
* The name of the group given to all constraints with no explicit group.
3636
*/
37-
const DEFAULT_GROUP = 'Default';
37+
public const DEFAULT_GROUP = 'Default';
3838

3939
/**
4040
* Marks a constraint that can be put onto classes.
4141
*/
42-
const CLASS_CONSTRAINT = 'class';
42+
public const CLASS_CONSTRAINT = 'class';
4343

4444
/**
4545
* Marks a constraint that can be put onto properties.
4646
*/
47-
const PROPERTY_CONSTRAINT = 'property';
47+
public const PROPERTY_CONSTRAINT = 'property';
4848

4949
/**
5050
* Maps error codes to the names of their constants.

ConstraintValidator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
2424
* Whether to format {@link \DateTime} objects, either with the {@link \IntlDateFormatter}
2525
* (if it is available) or as RFC-3339 dates ("Y-m-d H:i:s").
2626
*/
27-
const PRETTY_DATE = 1;
27+
public const PRETTY_DATE = 1;
2828

2929
/**
3030
* Whether to cast objects with a "__toString()" method to strings.
3131
*/
32-
const OBJECT_TO_STRING = 2;
32+
public const OBJECT_TO_STRING = 2;
3333

3434
/**
3535
* @var ExecutionContextInterface

Constraints/Bic.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
*/
2626
class Bic extends Constraint
2727
{
28-
const INVALID_LENGTH_ERROR = '66dad313-af0b-4214-8566-6c799be9789c';
29-
const INVALID_CHARACTERS_ERROR = 'f424c529-7add-4417-8f2d-4b656e4833e2';
30-
const INVALID_BANK_CODE_ERROR = '00559357-6170-4f29-aebd-d19330aa19cf';
31-
const INVALID_COUNTRY_CODE_ERROR = '1ce76f8d-3c1f-451c-9e62-fe9c3ed486ae';
32-
const INVALID_CASE_ERROR = '11884038-3312-4ae5-9d04-699f782130c7';
33-
const INVALID_IBAN_COUNTRY_CODE_ERROR = '29a2c3bb-587b-4996-b6f5-53081364cea5';
28+
public const INVALID_LENGTH_ERROR = '66dad313-af0b-4214-8566-6c799be9789c';
29+
public const INVALID_CHARACTERS_ERROR = 'f424c529-7add-4417-8f2d-4b656e4833e2';
30+
public const INVALID_BANK_CODE_ERROR = '00559357-6170-4f29-aebd-d19330aa19cf';
31+
public const INVALID_COUNTRY_CODE_ERROR = '1ce76f8d-3c1f-451c-9e62-fe9c3ed486ae';
32+
public const INVALID_CASE_ERROR = '11884038-3312-4ae5-9d04-699f782130c7';
33+
public const INVALID_IBAN_COUNTRY_CODE_ERROR = '29a2c3bb-587b-4996-b6f5-53081364cea5';
3434

3535
protected static $errorNames = [
3636
self::INVALID_LENGTH_ERROR => 'INVALID_LENGTH_ERROR',

Constraints/Blank.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class Blank extends Constraint
2323
{
24-
const NOT_BLANK_ERROR = '183ad2de-533d-4796-a439-6d3c3852b549';
24+
public const NOT_BLANK_ERROR = '183ad2de-533d-4796-a439-6d3c3852b549';
2525

2626
protected static $errorNames = [
2727
self::NOT_BLANK_ERROR => 'NOT_BLANK_ERROR',

Constraints/CardScheme.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
class CardScheme extends Constraint
2626
{
27-
const NOT_NUMERIC_ERROR = 'a2ad9231-e827-485f-8a1e-ef4d9a6d5c2e';
28-
const INVALID_FORMAT_ERROR = 'a8faedbf-1c2f-4695-8d22-55783be8efed';
27+
public const NOT_NUMERIC_ERROR = 'a2ad9231-e827-485f-8a1e-ef4d9a6d5c2e';
28+
public const INVALID_FORMAT_ERROR = 'a8faedbf-1c2f-4695-8d22-55783be8efed';
2929

3030
protected static $errorNames = [
3131
self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR',

Constraints/Choice.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
*/
2222
class Choice extends Constraint
2323
{
24-
const NO_SUCH_CHOICE_ERROR = '8e179f1b-97aa-4560-a02f-2a8b42e49df7';
25-
const TOO_FEW_ERROR = '11edd7eb-5872-4b6e-9f12-89923999fd0e';
26-
const TOO_MANY_ERROR = '9bd98e49-211c-433f-8630-fd1c2d0f08c3';
24+
public const NO_SUCH_CHOICE_ERROR = '8e179f1b-97aa-4560-a02f-2a8b42e49df7';
25+
public const TOO_FEW_ERROR = '11edd7eb-5872-4b6e-9f12-89923999fd0e';
26+
public const TOO_MANY_ERROR = '9bd98e49-211c-433f-8630-fd1c2d0f08c3';
2727

2828
protected static $errorNames = [
2929
self::NO_SUCH_CHOICE_ERROR => 'NO_SUCH_CHOICE_ERROR',

Constraints/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
class Collection extends Composite
2323
{
24-
const MISSING_FIELD_ERROR = '2fa2158c-2a7f-484b-98aa-975522539ff8';
25-
const NO_SUCH_FIELD_ERROR = '7703c766-b5d5-4cef-ace7-ae0dd82304e9';
24+
public const MISSING_FIELD_ERROR = '2fa2158c-2a7f-484b-98aa-975522539ff8';
25+
public const NO_SUCH_FIELD_ERROR = '7703c766-b5d5-4cef-ace7-ae0dd82304e9';
2626

2727
protected static $errorNames = [
2828
self::MISSING_FIELD_ERROR => 'MISSING_FIELD_ERROR',

Constraints/Count.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
*/
2323
class Count extends Constraint
2424
{
25-
const TOO_FEW_ERROR = 'bef8e338-6ae5-4caf-b8e2-50e7b0579e69';
26-
const TOO_MANY_ERROR = '756b1212-697c-468d-a9ad-50dd783bb169';
27-
const NOT_DIVISIBLE_BY_ERROR = DivisibleBy::NOT_DIVISIBLE_BY;
25+
public const TOO_FEW_ERROR = 'bef8e338-6ae5-4caf-b8e2-50e7b0579e69';
26+
public const TOO_MANY_ERROR = '756b1212-697c-468d-a9ad-50dd783bb169';
27+
public const NOT_DIVISIBLE_BY_ERROR = DivisibleBy::NOT_DIVISIBLE_BY;
2828

2929
protected static $errorNames = [
3030
self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',

Constraints/Country.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class Country extends Constraint
2525
{
26-
const NO_SUCH_COUNTRY_ERROR = '8f900c12-61bd-455d-9398-996cd040f7f0';
26+
public const NO_SUCH_COUNTRY_ERROR = '8f900c12-61bd-455d-9398-996cd040f7f0';
2727

2828
protected static $errorNames = [
2929
self::NO_SUCH_COUNTRY_ERROR => 'NO_SUCH_COUNTRY_ERROR',

Constraints/Currency.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class Currency extends Constraint
2626
{
27-
const NO_SUCH_CURRENCY_ERROR = '69945ac1-2db4-405f-bec7-d2772f73df52';
27+
public const NO_SUCH_CURRENCY_ERROR = '69945ac1-2db4-405f-bec7-d2772f73df52';
2828

2929
protected static $errorNames = [
3030
self::NO_SUCH_CURRENCY_ERROR => 'NO_SUCH_CURRENCY_ERROR',

0 commit comments

Comments
 (0)