More array declarations

Author: louisl

CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -374,7 +374,24 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
         case T_COMMA:
             // The end of an array line "[],".
             // Argument in a function "$item->save($data, [...], ...)".
-            $firstOnLine = $phpcsFile->findFirstOnLine(array(T_VARIABLE, T_CLOSE_SHORT_ARRAY), $prevNonWhitespaceToken);
+            $starts = array(
+                       T_VARIABLE,
+                       T_VAR,
+                       T_PUBLIC,
+                       T_PRIVATE,
+                       T_PROTECTED,
+                       T_ARRAY_CAST,
+                       T_UNSET_CAST,
+                       T_OBJECT_CAST,
+                       T_STATIC,
+                       T_CONST,
+                       T_RETURN,
+                       T_OBJECT_OPERATOR,
+                       T_CLOSE_SHORT_ARRAY,
+                       T_CONSTANT_ENCAPSED_STRING,
+                      );
+
+            $firstOnLine = $phpcsFile->findFirstOnLine($starts, $prevNonWhitespaceToken);
             $indentStart = $firstOnLine;
             break;
         default:
@@ -592,6 +609,10 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                     true
                 );
 
+                if ($nextContent === false) {
+                    break;
+                }
+
                 $currentEntry['value'] = $nextContent;
                 $indices[] = $currentEntry;
                 $lastToken = $nextToken;

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.inc

@@ -112,4 +112,36 @@ class MyClass {
 'version'   => $version,
 'name'      => $this->name,
 			]);
+
+		$message->setCustomProperty('user_info', array(
+				'id' => $id,
+				'name' => 'Test message'
+			)
+		);
+
+		$users = [
+			[
+				'id'    => 1,
+				'name'  => 'John',
+				'email' => 'john@example.com',
+				'fact'  => 'Loves coding',
+			],
+			[
+				'id'    => 2,
+				'name'  => 'Jim',
+				'email' => 'jim@example.com',
+				'fact'  => 'Developed on CodeIgniter',
+			],
+			[
+				'id'    => 3,
+				'name'  => 'Jane',
+				'email' => 'jane@example.com',
+				'fact'  => 'Lives in the USA', [
+					'hobbies' => [
+						'guitar',
+						'cycling',
+					],
+				]
+			],
+		];
 }

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -178,4 +178,36 @@ class MyClass {
                 'version' => $version,
                 'name'    => $this->name,
 			]);
+
+		$message->setCustomProperty('user_info', [
+            'id'   => $id,
+            'name' => 'Test message',
+        ]
+		);
+
+		$users = [
+			[
+				'id'    => 1,
+				'name'  => 'John',
+				'email' => 'john@example.com',
+				'fact'  => 'Loves coding',
+			],
+			[
+				'id'    => 2,
+				'name'  => 'Jim',
+				'email' => 'jim@example.com',
+				'fact'  => 'Developed on CodeIgniter',
+			],
+			[
+				'id'    => 3,
+				'name'  => 'Jane',
+				'email' => 'jane@example.com',
+				'fact'  => 'Lives in the USA', [
+					'hobbies' => [
+						'guitar',
+						'cycling',
+					],
+				]
+			],
+		];
 }

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -92,6 +92,10 @@ public function getErrorList()
                 107 => 1,
                 112 => 1,
                 113 => 1,
+                116 => 1,
+                117 => 1,
+                118 => 1,
+                119 => 1,
                );
 
     }//end getErrorList()