Skip to content

Commit 21c24ed

Browse files
ostroluckyostrolucky
authored
Merge pull request #302 from doctrine/10.0.x
2 parents f44190b + 91106f7 commit 21c24ed

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"doctrine",
77
"coding",
88
"standard",
9+
"dev",
910
"cs",
1011
"code",
1112
"style",
@@ -23,7 +24,7 @@
2324
"require": {
2425
"php": "^7.2 || ^8.0",
2526
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
26-
"slevomat/coding-standard": "^8.2",
27+
"slevomat/coding-standard": "^8.6.2",
2728
"squizlabs/php_codesniffer": "^3.7"
2829
},
2930
"config": {

‎tests/expected_report.txt‎

Lines changed: 2 additions & 2 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 7 0
13+
tests/input/constants-var.php 6 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
@@ -50,7 +50,7 @@ tests/input/use-ordering.php 1 0
5050
tests/input/useless-semicolon.php 2 0
5151
tests/input/UselessConditions.php 21 0
5252
----------------------------------------------------------------------
53-
A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
53+
A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
5454
----------------------------------------------------------------------
5555
PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5656
----------------------------------------------------------------------

‎tests/php72-compatibility.patch‎

Lines changed: 3 additions & 3 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 5110131..53dada5 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,26 +14,23 @@ tests/input/constants-var.php 7 0
5+
@@ -14,26 +14,23 @@ tests/input/constants-var.php 6 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
@@ -51,8 +51,8 @@ index 5110131..53dada5 100644
5151
-tests/input/UselessConditions.php 21 0
5252
+tests/input/UselessConditions.php 20 0
5353
----------------------------------------------------------------------
54-
-A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
55-
+A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
54+
-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
55+
+A TOTAL OF 381 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
5656
----------------------------------------------------------------------
5757
-PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5858
+PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY

‎tests/php73-compatibility.patch‎

Lines changed: 3 additions & 3 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 5110131..5616fdf 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,26 +14,23 @@ tests/input/constants-var.php 7 0
5+
@@ -14,26 +14,23 @@ tests/input/constants-var.php 6 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
@@ -52,8 +52,8 @@ index 5110131..5616fdf 100644
5252
-tests/input/UselessConditions.php 21 0
5353
+tests/input/UselessConditions.php 20 0
5454
----------------------------------------------------------------------
55-
-A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
56-
+A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
55+
-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
56+
+A TOTAL OF 383 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
5757
----------------------------------------------------------------------
5858
-PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5959
+PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY

‎tests/php74-compatibility.patch‎

Lines changed: 3 additions & 3 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 5110131..dc2cf18 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
5-
@@ -14,26 +14,23 @@ tests/input/constants-var.php 7 0
5+
@@ -14,26 +14,23 @@ tests/input/constants-var.php 6 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,8 +50,8 @@ index 5110131..dc2cf18 100644
5050
-tests/input/UselessConditions.php 21 0
5151
+tests/input/UselessConditions.php 20 0
5252
----------------------------------------------------------------------
53-
-A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
54-
+A TOTAL OF 393 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
53+
-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
54+
+A TOTAL OF 392 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
5555
----------------------------------------------------------------------
5656
-PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5757
+PHPCBF CAN FIX 328 OF THESE SNIFF VIOLATIONS AUTOMATICALLY

‎tests/php80-compatibility.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ index 5110131..f0a3fc9 100644
2323
tests/input/useless-semicolon.php 2 0
2424
tests/input/UselessConditions.php 21 0
2525
----------------------------------------------------------------------
26-
-A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
27-
+A TOTAL OF 423 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
26+
-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
27+
+A TOTAL OF 422 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
2828
----------------------------------------------------------------------
2929
-PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
3030
+PHPCBF CAN FIX 358 OF THESE SNIFF VIOLATIONS AUTOMATICALLY

0 commit comments

Comments
 (0)