diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml index abc6fb9b..9a49702c 100644 --- a/lib/Doctrine/ruleset.xml +++ b/lib/Doctrine/ruleset.xml @@ -122,6 +122,8 @@ + + diff --git a/tests/expected_report.txt b/tests/expected_report.txt index 1d5a7d3a..53dada55 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt @@ -10,7 +10,7 @@ tests/input/binary_operators.php 9 0 tests/input/class-references.php 10 0 tests/input/concatenation_spacing.php 49 0 tests/input/constants-no-lsb.php 2 0 -tests/input/constants-var.php 6 0 +tests/input/constants-var.php 7 0 tests/input/ControlStructures.php 28 0 tests/input/doc-comment-spacing.php 11 0 tests/input/duplicate-assignment-variable.php 1 0 @@ -46,9 +46,9 @@ tests/input/use-ordering.php 1 0 tests/input/useless-semicolon.php 2 0 tests/input/UselessConditions.php 20 0 ---------------------------------------------------------------------- -A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES +A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES ---------------------------------------------------------------------- -PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/fixed/constants-var.php b/tests/fixed/constants-var.php index 8959c563..d4268cb4 100644 --- a/tests/fixed/constants-var.php +++ b/tests/fixed/constants-var.php @@ -4,6 +4,8 @@ namespace ConstantsVar; +// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses, Squiz.Classes.ClassFileName.NoMatch + const FOO = 123; const BAR_1 = 1; @@ -16,3 +18,14 @@ class Bar protected const PROPERTY_1 = '1'; protected const PROPERTY_2 = '2'; } + +class Spacing +{ + public const FOO = 'bar'; + public const BAR = 'bar'; + + public const BAZ = 'baz'; + + /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */ + private const BAM = 1234; +} diff --git a/tests/input/constants-var.php b/tests/input/constants-var.php index 037e9bd7..cc76ad61 100644 --- a/tests/input/constants-var.php +++ b/tests/input/constants-var.php @@ -4,6 +4,8 @@ namespace ConstantsVar; +// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses, Squiz.Classes.ClassFileName.NoMatch + /** @var int */ const FOO = 123; @@ -16,3 +18,16 @@ class Bar protected const PROPERTY_1 = '1', PROPERTY_2 = '2'; } + +class Spacing +{ + public const FOO = 'bar'; + public const BAR = 'bar'; + + + public const BAZ = 'baz'; + + + /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */ + private const BAM = 1234; +} diff --git a/tests/php73-compatibility.patch b/tests/php73-compatibility.patch index 8e056058..c7537181 100644 --- a/tests/php73-compatibility.patch +++ b/tests/php73-compatibility.patch @@ -14,11 +14,11 @@ index 1d5a7d3..fae9e70 100644 tests/input/useless-semicolon.php 2 0 tests/input/UselessConditions.php 20 0 ---------------------------------------------------------------------- --A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES -+A TOTAL OF 383 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES +-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES ++A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES ---------------------------------------------------------------------- --PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY -+PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ++PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/php74-compatibility.patch b/tests/php74-compatibility.patch index 55366f8b..3a379bc1 100644 --- a/tests/php74-compatibility.patch +++ b/tests/php74-compatibility.patch @@ -36,11 +36,11 @@ index 1d5a7d3..91e97e7 100644 tests/input/useless-semicolon.php 2 0 tests/input/UselessConditions.php 20 0 ---------------------------------------------------------------------- --A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES -+A TOTAL OF 392 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES +-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES ++A TOTAL OF 393 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES ---------------------------------------------------------------------- --PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY -+PHPCBF CAN FIX 326 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ++PHPCBF CAN FIX 328 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/php80-compatibility.patch b/tests/php80-compatibility.patch index c6923131..cfd6f857 100644 --- a/tests/php80-compatibility.patch +++ b/tests/php80-compatibility.patch @@ -2,7 +2,7 @@ diff --git a/tests/expected_report.txt b/tests/expected_report.txt index 1d5a7d3..03460f2 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt -@@ -14,23 +14,24 @@ tests/input/constants-var.php 6 0 +@@ -14,23 +14,24 @@ tests/input/constants-var.php 7 0 tests/input/ControlStructures.php 28 0 tests/input/doc-comment-spacing.php 11 0 tests/input/duplicate-assignment-variable.php 1 0 @@ -49,11 +49,11 @@ index 1d5a7d3..03460f2 100644 -tests/input/UselessConditions.php 20 0 +tests/input/UselessConditions.php 21 0 ---------------------------------------------------------------------- --A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES -+A TOTAL OF 420 ERRORS AND 0 WARNINGS WERE FOUND IN 44 FILES +-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES ++A TOTAL OF 421 ERRORS AND 0 WARNINGS WERE FOUND IN 44 FILES ---------------------------------------------------------------------- --PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY -+PHPCBF CAN FIX 354 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ++PHPCBF CAN FIX 356 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ---------------------------------------------------------------------- diff --git a/tests/php81-compatibility.patch b/tests/php81-compatibility.patch index 776b7858..c79c5853 100644 --- a/tests/php81-compatibility.patch +++ b/tests/php81-compatibility.patch @@ -2,7 +2,7 @@ diff --git a/tests/expected_report.txt b/tests/expected_report.txt index 1d5a7d3..e9394b1 100644 --- a/tests/expected_report.txt +++ b/tests/expected_report.txt -@@ -14,23 +14,25 @@ tests/input/constants-var.php 6 0 +@@ -14,23 +14,25 @@ tests/input/constants-var.php 7 0 tests/input/ControlStructures.php 28 0 tests/input/doc-comment-spacing.php 11 0 tests/input/duplicate-assignment-variable.php 1 0 @@ -50,11 +50,11 @@ index 1d5a7d3..e9394b1 100644 -tests/input/UselessConditions.php 20 0 +tests/input/UselessConditions.php 21 0 ---------------------------------------------------------------------- --A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES -+A TOTAL OF 426 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES +-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES ++A TOTAL OF 427 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES ---------------------------------------------------------------------- --PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY -+PHPCBF CAN FIX 360 OF THESE SNIFF VIOLATIONS AUTOMATICALLY +-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ++PHPCBF CAN FIX 362 OF THESE SNIFF VIOLATIONS AUTOMATICALLY ----------------------------------------------------------------------