Merge pull request #230 from beberlei/Composer2Support

Cherry pick constraint relaxation to dealerdirect/phpcodersniffer-composer-installer plugin
doctrine · Oct 25, 2020 · 0639b38 · 0639b38
2 parents d33f69e + 6b65736
commit 0639b38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     },
     "require": {
         "php": "^7.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0 | ^0.6.2 | ^0.7",
         "slevomat/coding-standard": "^5.0",
         "squizlabs/php_codesniffer": "^3.4.0"
     },

diff --git a/tests/expected_report.txt b/tests/expected_report.txt
@@ -24,7 +24,7 @@ tests/input/optimized-functions.php                   1       0
 tests/input/return_type_on_closures.php               21      0
 tests/input/return_type_on_methods.php                17      0
 tests/input/semicolon_spacing.php                     3       0
-tests/input/spread-operator.php                       6       0
+tests/input/spread-operator.php                       10      0
 tests/input/static-closures.php                       1       0
 tests/input/superfluous-naming.php                    11      0
 tests/input/test-case.php                             8       0
@@ -34,9 +34,9 @@ tests/input/UnusedVariables.php                       1       0
 tests/input/useless-semicolon.php                     2       0
 tests/input/UselessConditions.php                     20      0
 ----------------------------------------------------------------------
-A TOTAL OF 258 ERRORS AND 0 WARNINGS WERE FOUND IN 30 FILES
+A TOTAL OF 262 ERRORS AND 0 WARNINGS WERE FOUND IN 30 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 210 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 214 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------