Add none option or array declaration.

Author: dereuromark

PhpCollective/Sniffs/Formatting/ArrayDeclarationSniff.php

@@ -30,6 +30,7 @@ class ArrayDeclarationSniff implements Sniff
      * Options:
      * - 'assoc' (default): Only enforce one item per line for associative arrays
      * - 'all': Enforce one item per line for all arrays (both associative and indexed)
+     * - 'none': Disable multi-line indentation checks
      *
      * @var string
      */
@@ -344,8 +345,16 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
 
     protected function processMultiLineIndentation(File $phpcsFile, int $arrayStart, int $arrayEnd): void
     {
+        // Early return if mode is 'none'
+        if ($this->multiLineIndentationMode === 'none') {
+            return;
+        }
+
         $tokens = $phpcsFile->getTokens();
         $pairs = [];
+        
+        // Debug: identify which array we're processing
+        // file_put_contents('/tmp/array_debug.log', "\nProcessing array from {$tokens[$arrayStart]['line']} to {$tokens[$arrayEnd]['line']}\n", FILE_APPEND);
 
         $i = $arrayStart + 1;
         while ($i < $arrayEnd) {
@@ -403,6 +412,18 @@ protected function processMultiLineIndentation(File $phpcsFile, int $arrayStart,
                         continue;
                     }
 
+                    // Handle nested arrays - if we hit an array opener, skip to its closer
+                    if ($currentToken['code'] === T_OPEN_SHORT_ARRAY && isset($currentToken['bracket_closer'])) {
+                        $valueEnd = $currentToken['bracket_closer'];
+                        $j = $valueEnd;
+                        continue;
+                    }
+                    if ($currentToken['code'] === T_ARRAY && isset($currentToken['parenthesis_closer'])) {
+                        $valueEnd = $currentToken['parenthesis_closer'];
+                        $j = $valueEnd;
+                        continue;
+                    }
+
                     // Track parentheses depth
                     if ($currentToken['code'] === T_OPEN_PARENTHESIS) {
                         $depth++;
@@ -465,6 +486,18 @@ protected function processMultiLineIndentation(File $phpcsFile, int $arrayStart,
                         continue;
                     }
 
+                    // Handle nested arrays - if we hit an array opener, skip to its closer
+                    if ($currentToken['code'] === T_OPEN_SHORT_ARRAY && isset($currentToken['bracket_closer'])) {
+                        $valueEnd = $currentToken['bracket_closer'];
+                        $j = $valueEnd;
+                        continue;
+                    }
+                    if ($currentToken['code'] === T_ARRAY && isset($currentToken['parenthesis_closer'])) {
+                        $valueEnd = $currentToken['parenthesis_closer'];
+                        $j = $valueEnd;
+                        continue;
+                    }
+
                     // Track parentheses depth
                     if ($currentToken['code'] === T_OPEN_PARENTHESIS) {
                         $depth++;

tests/PhpCollective/Sniffs/Formatting/ArrayDeclarationSniffTest.php

@@ -17,7 +17,7 @@ class ArrayDeclarationSniffTest extends TestCase
      */
     public function testDocBlockConstSniffer(): void
     {
-        $this->assertSnifferFindsErrors(new ArrayDeclarationSniff(), 2);
+        $this->assertSnifferFindsErrors(new ArrayDeclarationSniff(), 3);
     }
 
     /**

tests/_data/ArrayDeclaration/after.php

@@ -13,8 +13,20 @@ public function test(): void
                 'z' => 'a',
             ],
             'c' => __FILE__,
-            'd' => Xyz::class, 'r',
+            'd' => Xyz::class,
             'content' => $this->getContent($tokens, $i, $tagEnd),
         ];
+
+        // Test case for nested arrays - should NOT be flagged
+        $config = [
+            'levels' => ['notice', 'info', 'debug'],
+            'other' => 'value',
+        ];
+
+        // Multiple items with nested arrays - SHOULD be flagged
+        $multi = [
+            'first' => ['a', 'b'],
+            'second' => ['c', 'd'],
+        ];
     }
 }

tests/_data/ArrayDeclaration/before.php

@@ -11,7 +11,18 @@ public function test(): void
             'x' => [
                 'y' => 'z', 'z' => 'a',
             ],
-            'c' => __FILE__, 'd' => Xyz::class, 'r', 'content' => $this->getContent($tokens, $i, $tagEnd),
+            'c' => __FILE__, 'd' => Xyz::class, 'content' => $this->getContent($tokens, $i, $tagEnd),
+        ];
+
+        // Test case for nested arrays - should NOT be flagged
+        $config = [
+            'levels' => ['notice', 'info', 'debug'],
+            'other' => 'value',
+        ];
+
+        // Multiple items with nested arrays - SHOULD be flagged
+        $multi = [
+            'first' => ['a', 'b'], 'second' => ['c', 'd'],
         ];
     }
 }