Merge pull request #49 from VincentLanglet/improveArrayRule

✨ Better checks for array rule

Author: VincentLanglet

SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -28,7 +28,7 @@ class DocCommentForbiddenTagsSniff implements Sniff
     public function register()
     {
         return [
-            T_DOC_COMMENT_TAG
+            T_DOC_COMMENT_TAG,
         ];
     }
 

SymfonyCustom/Sniffs/Commenting/DocCommentForbiddenTagsSniff.php

@@ -56,7 +56,7 @@ class DocCommentGroupSameTypeSniff implements Sniff
     public function register()
     {
         return [
-            T_DOC_COMMENT_OPEN_TAG
+            T_DOC_COMMENT_OPEN_TAG,
         ];
     }
 

SymfonyCustom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php

@@ -21,7 +21,7 @@ class BlankLineBeforeReturnSniff implements Sniff
     public function register()
     {
         return [
-            T_RETURN
+            T_RETURN,
         ];
     }
 

SymfonyCustom/Sniffs/Formatting/BlankLineBeforeReturnSniff.php

@@ -56,7 +56,7 @@ class DocCommentTagSpacingSniff implements Sniff
     public function register()
     {
         return [
-            T_DOC_COMMENT_TAG
+            T_DOC_COMMENT_TAG,
         ];
     }
 

SymfonyCustom/Sniffs/WhiteSpace/DocCommentTagSpacingSniff.php

@@ -18,7 +18,7 @@ class EmptyLinesSniff implements Sniff
     public function register()
     {
         return [
-            T_WHITESPACE
+            T_WHITESPACE,
         ];
     }
 

SymfonyCustom/Sniffs/WhiteSpace/EmptyLinesSniff.php

@@ -70,9 +70,41 @@ class TestClass
             'short_name' => 'big'
         );
 
+        $array1 = [
+            [
+                '<span>',
+            ]
+            ,
+            [
+                '<span>',
+            ],
+        ];
+
+        $array2 = array(
+            [
+                '<span>',
+            ],[
+                '<span>',
+            ],
+        );
+
+        $array3 = array(
+            'a' => ['<span>']
+            ,['<span>'],
+            'b' => ['<span>']
+            ,['<span>'],
+        );
+
+        $array4 = array(
+            ['<span>']
+            ,'a' => ['<span>'],
+            ['<span>']
+            ,'b' => ['<span>']
+        );
+
         $utf8 = array(
-            '/[áàâãªäå]/u' => 'a',
-            '/[ÁÀÂÃÄÅ]/u'  => 'A',
+            '/[áàâãªäå]/u' => 'a'
+            ,'/[ÁÀÂÃÄÅ]/u'  => 'A',
             '/[ÍÌÎÏ]/u'    => 'I',
             '/[íìîï]/u'    => 'i',
             '/[éèêë]/u'    => 'e',

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc

@@ -70,6 +70,38 @@ class TestClass
             'short_name' => 'big',
         );
 
+        $array1 = [
+            [
+                '<span>',
+            ],
+            [
+                '<span>',
+            ],
+        ];
+
+        $array2 = array(
+            [
+                '<span>',
+            ],
+            [
+                '<span>',
+            ],
+        );
+
+        $array3 = array(
+            'a' => ['<span>'],
+            ['<span>'],
+            'b' => ['<span>'],
+            ['<span>'],
+        );
+
+        $array4 = array(
+            ['<span>'],
+            'a' => ['<span>'],
+            ['<span>'],
+            'b' => ['<span>'],
+        );
+
         $utf8 = array(
             '/[áàâãªäå]/u' => 'a',
             '/[ÁÀÂÃÄÅ]/u'  => 'A',

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -22,31 +22,38 @@ class ArrayDeclarationUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            7  => 2,
-            9  => 1,
-            22 => 1,
-            23 => 1,
-            24 => 1,
-            25 => 1,
-            31 => 1,
-            35 => 1,
-            36 => 1,
-            41 => 1,
-            46 => 1,
-            47 => 1,
-            50 => 1,
-            51 => 1,
-            53 => 1,
-            58 => 1,
-            61 => 1,
-            62 => 1,
-            63 => 1,
-            64 => 1,
-            65 => 1,
-            66 => 2,
-            67 => 1,
-            68 => 1,
-            70 => 1,
+            7   => 2,
+            9   => 1,
+            22  => 1,
+            23  => 1,
+            24  => 2,
+            25  => 1,
+            31  => 1,
+            35  => 1,
+            36  => 1,
+            41  => 1,
+            46  => 1,
+            47  => 1,
+            50  => 1,
+            51  => 1,
+            53  => 1,
+            58  => 1,
+            61  => 1,
+            62  => 1,
+            63  => 1,
+            64  => 1,
+            65  => 1,
+            66  => 2,
+            67  => 1,
+            68  => 1,
+            70  => 1,
+            77  => 1,
+            86  => 1,
+            93  => 3,
+            95  => 3,
+            100 => 3,
+            102 => 4,
+            107 => 2,
         ];
     }