Merge pull request #106 from lcobucci/apply-fixes-on-5.x

Apply fixes on 5.x
doctrine · Jan 31, 2019 · 9017efe · 9017efe
2 parents f7711b2 + 2d7e211
commit 9017efe
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     },
     "require": {
         "php": "^7.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
         "slevomat/coding-standard": "^4.8.0",
         "squizlabs/php_codesniffer": "^3.3.2"
     },

diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
@@ -369,6 +369,7 @@
         <exclude name="Squiz.Arrays.ArrayDeclaration.ValueNotAligned"/>
         <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma.MissingTrailingComma -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
+        <exclude name="Squiz.Arrays.ArrayDeclaration.NoComma"/>
     </rule>
     <!-- Forbid class being in a file with different name -->
     <rule ref="Squiz.Classes.ClassFileName"/>

diff --git a/tests/expected_report.txt b/tests/expected_report.txt
@@ -23,14 +23,15 @@ 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/static-closures.php                       1       0
-tests/input/test-case.php                             6       0
+tests/input/test-case.php                             8       0
+tests/input/trailing_comma_on_array.php               1       0
 tests/input/traits-uses.php                           10      0
 tests/input/UnusedVariables.php                       1       0
 tests/input/useless-semicolon.php                     2       0
 ----------------------------------------------------------------------
-A TOTAL OF 203 ERRORS AND 0 WARNINGS WERE FOUND IN 24 FILES
+A TOTAL OF 206 ERRORS AND 0 WARNINGS WERE FOUND IN 25 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 173 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 176 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/tests/fixed/test-case.php b/tests/fixed/test-case.php
@@ -27,11 +27,10 @@ public function createDependencies() : void
     }
 
     /**
-     * @test
+     * @uses MyClass::__construct
      *
+     * @test
      * @covers MyClass::test
-     *
-     * @uses MyClass::__construct
      */
     public function methodShouldDoStuff() : void
     {

diff --git a/tests/fixed/trailing_comma_on_array.php b/tests/fixed/trailing_comma_on_array.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+$array =  [
+    'key1' => 'value',
+    'key2' => 'value',
+];
diff --git a/tests/input/trailing_comma_on_array.php b/tests/input/trailing_comma_on_array.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+$array =  [
+    'key1' => 'value',
+    'key2' => 'value'
+];