Generic/ArrayIndent: fix grammar for various error messages

Correct pluralization of the word space/spaces depending on the spacing value.

Includes adding tests for the `$indent` property being set to a 1 (open brace) and 0 (item indent, close brace).

Co-authored-by: Danny van der Sluijs <danny.van.der.sluijs@infi.nl>

Author: jrfnl

src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php

@@ -76,9 +76,15 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
         // check indent levels because it's not valid. But we don't enforce exactly
         // how far indented it should be.
         if ($startIndent < $baseIndent) {
-            $error = 'Array open brace not indented correctly; expected at least %s spaces but found %s';
+            $pluralizeSpace = 's';
+            if ($baseIndent === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Array open brace not indented correctly; expected at least %s space%s but found %s';
             $data  = [
                 $baseIndent,
+                $pluralizeSpace,
                 $startIndent,
             ];
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenBraceIncorrect', $data);
@@ -117,9 +123,15 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                 continue;
             }
 
-            $error = 'Array key not indented correctly; expected %s spaces but found %s';
+            $pluralizeSpace = 's';
+            if ($expectedIndent === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Array key not indented correctly; expected %s space%s but found %s';
             $data  = [
                 $expectedIndent,
+                $pluralizeSpace,
                 $foundIndent,
             ];
             $fix   = $phpcsFile->addFixableError($error, $first, 'KeyIncorrect', $data);
@@ -154,9 +166,15 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             return;
         }
 
-        $error = 'Array close brace not indented correctly; expected %s spaces but found %s';
+        $pluralizeSpace = 's';
+        if ($expectedIndent === 1) {
+            $pluralizeSpace = '';
+        }
+
+        $error = 'Array close brace not indented correctly; expected %s space%s but found %s';
         $data  = [
             $expectedIndent,
+            $pluralizeSpace,
             $foundIndent,
         ];
         $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceIncorrect', $data);

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc

@@ -111,3 +111,41 @@ $array = [
     name: $value
     ),
 ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 1
+
+// Testing pluralization of indent text - open brace indent.
+ $var =
+[
+ 1 => 'one',
+];
+
+// Testing pluralization of indent text - array item indent.
+$var = [
+ 1 => 'one',
+      2 => 'two',
+    /* three */ 3 => 'three',
+];
+
+// Testing pluralization of indent text - close brace indent.
+ $var = [
+  1 => 'one',
+  ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 0
+
+// No test for open brace indent as that is _minimum_ and any actual value will be 0 or more, so with indent 0, this will never yield an error.
+
+// Testing pluralization of indent text - array item indent.
+$var = [
+ 1 => 'one',
+      2 => 'two',
+    /* three */ 3 => 'three',
+];
+
+// Testing pluralization of indent text - close brace indent.
+$var = [
+1 => 'one',
+  ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 4

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc.fixed

@@ -112,3 +112,41 @@ $array = [
     name: $value
     ),
 ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 1
+
+// Testing pluralization of indent text - open brace indent.
+ $var =
+ [
+  1 => 'one',
+ ];
+
+// Testing pluralization of indent text - array item indent.
+$var = [
+ 1 => 'one',
+ 2 => 'two',
+ /* three */ 3 => 'three',
+];
+
+// Testing pluralization of indent text - close brace indent.
+ $var = [
+  1 => 'one',
+ ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 0
+
+// No test for open brace indent as that is _minimum_ and any actual value will be 0 or more, so with indent 0, this will never yield an error.
+
+// Testing pluralization of indent text - array item indent.
+$var = [
+1 => 'one',
+2 => 'two',
+/* three */ 3 => 'three',
+];
+
+// Testing pluralization of indent text - close brace indent.
+$var = [
+1 => 'one',
+];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 4

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php

@@ -45,6 +45,14 @@ public function getErrorList()
             88  => 1,
             98  => 1,
             110 => 1,
+            119 => 1,
+            126 => 1,
+            127 => 1,
+            133 => 1,
+            141 => 1,
+            142 => 1,
+            143 => 1,
+            149 => 1,
         ];
 
     }//end getErrorList()