Skip to content

Commit 94ec677

Browse files
simPodsimPod
committed
feat: enforce spaces between constants
1 parent 51e2045 commit 94ec677

File tree

8 files changed

+51
-21
lines changed

8 files changed

+51
-21
lines changed

‎lib/Doctrine/ruleset.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@
122122
<property name="fixable" value="true"/>
123123
</properties>
124124
</rule>
125+
<!-- Enforce consistent constant spacing -->
126+
<rule ref="SlevomatCodingStandard.Classes.ConstantSpacing"/>
125127
<!-- Forbid LSB for constants (static::FOO) -->
126128
<rule ref="SlevomatCodingStandard.Classes.DisallowLateStaticBindingForConstants"/>
127129
<!-- Forbid more than one constant declared per statement -->

‎tests/expected_report.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tests/input/binary_operators.php 9 0
1010
tests/input/class-references.php 10 0
1111
tests/input/concatenation_spacing.php 49 0
1212
tests/input/constants-no-lsb.php 2 0
13-
tests/input/constants-var.php 6 0
13+
tests/input/constants-var.php 7 0
1414
tests/input/ControlStructures.php 28 0
1515
tests/input/doc-comment-spacing.php 11 0
1616
tests/input/duplicate-assignment-variable.php 1 0
@@ -46,9 +46,9 @@ tests/input/use-ordering.php 1 0
4646
tests/input/useless-semicolon.php 2 0
4747
tests/input/UselessConditions.php 20 0
4848
----------------------------------------------------------------------
49-
A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
49+
A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
5050
----------------------------------------------------------------------
51-
PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
51+
PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5252
----------------------------------------------------------------------
5353

5454

‎tests/fixed/constants-var.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace ConstantsVar;
66

7+
// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses, Squiz.Classes.ClassFileName.NoMatch
8+
79
const FOO = 123;
810

911
const BAR_1 = 1;
@@ -16,3 +18,14 @@ class Bar
1618
protected const PROPERTY_1 = '1';
1719
protected const PROPERTY_2 = '2';
1820
}
21+
22+
class Spacing
23+
{
24+
public const FOO = 'bar';
25+
public const BAR = 'bar';
26+
27+
public const BAZ = 'baz';
28+
29+
/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
30+
private const BAM = 1234;
31+
}

‎tests/input/constants-var.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace ConstantsVar;
66

7+
// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses, Squiz.Classes.ClassFileName.NoMatch
8+
79
/** @var int */
810
const FOO = 123;
911

@@ -16,3 +18,16 @@ class Bar
1618

1719
protected const PROPERTY_1 = '1', PROPERTY_2 = '2';
1820
}
21+
22+
class Spacing
23+
{
24+
public const FOO = 'bar';
25+
public const BAR = 'bar';
26+
27+
28+
public const BAZ = 'baz';
29+
30+
31+
/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
32+
private const BAM = 1234;
33+
}

‎tests/php73-compatibility.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ index 1d5a7d3..fae9e70 100644
1414
tests/input/useless-semicolon.php 2 0
1515
tests/input/UselessConditions.php 20 0
1616
----------------------------------------------------------------------
17-
-A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
18-
+A TOTAL OF 383 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
17+
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
18+
+A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
1919
----------------------------------------------------------------------
20-
-PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
21-
+PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
20+
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
21+
+PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
2222
----------------------------------------------------------------------
2323

2424

‎tests/php74-compatibility.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ index 1d5a7d3..91e97e7 100644
3636
tests/input/useless-semicolon.php 2 0
3737
tests/input/UselessConditions.php 20 0
3838
----------------------------------------------------------------------
39-
-A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
40-
+A TOTAL OF 392 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
39+
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
40+
+A TOTAL OF 393 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
4141
----------------------------------------------------------------------
42-
-PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
43-
+PHPCBF CAN FIX 326 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
42+
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
43+
+PHPCBF CAN FIX 328 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
4444
----------------------------------------------------------------------
4545

4646

‎tests/php80-compatibility.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/tests/expected_report.txt b/tests/expected_report.txt
22
index 1d5a7d3..03460f2 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,23 +14,24 @@ tests/input/constants-var.php 6 0
5+
@@ -14,23 +14,24 @@ tests/input/constants-var.php 7 0
66
tests/input/ControlStructures.php 28 0
77
tests/input/doc-comment-spacing.php 11 0
88
tests/input/duplicate-assignment-variable.php 1 0
@@ -49,11 +49,11 @@ index 1d5a7d3..03460f2 100644
4949
-tests/input/UselessConditions.php 20 0
5050
+tests/input/UselessConditions.php 21 0
5151
----------------------------------------------------------------------
52-
-A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
53-
+A TOTAL OF 420 ERRORS AND 0 WARNINGS WERE FOUND IN 44 FILES
52+
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
53+
+A TOTAL OF 421 ERRORS AND 0 WARNINGS WERE FOUND IN 44 FILES
5454
----------------------------------------------------------------------
55-
-PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56-
+PHPCBF CAN FIX 354 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
55+
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56+
+PHPCBF CAN FIX 356 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5757
----------------------------------------------------------------------
5858

5959

‎tests/php81-compatibility.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/tests/expected_report.txt b/tests/expected_report.txt
22
index 1d5a7d3..e9394b1 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,23 +14,25 @@ tests/input/constants-var.php 6 0
5+
@@ -14,23 +14,25 @@ tests/input/constants-var.php 7 0
66
tests/input/ControlStructures.php 28 0
77
tests/input/doc-comment-spacing.php 11 0
88
tests/input/duplicate-assignment-variable.php 1 0
@@ -50,11 +50,11 @@ index 1d5a7d3..e9394b1 100644
5050
-tests/input/UselessConditions.php 20 0
5151
+tests/input/UselessConditions.php 21 0
5252
----------------------------------------------------------------------
53-
-A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
54-
+A TOTAL OF 426 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
53+
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
54+
+A TOTAL OF 427 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
5555
----------------------------------------------------------------------
56-
-PHPCBF CAN FIX 315 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57-
+PHPCBF CAN FIX 360 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
56+
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57+
+PHPCBF CAN FIX 362 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5858
----------------------------------------------------------------------
5959

6060

0 commit comments

Comments
 (0)