Changelog + minor error message change for #2233

Author: gsherwood

package.xml

@@ -110,6 +110,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Chris Wilkinson for the patch
   - Generic.PHP.CharacterBeforePHPOpeningTag now ignores a BOM at the start of the file
     -- Thanks to Chris Wilkinson for the patch
+  - Generic.Formatting.SpaceAfterNot now has a setting to specify how many spaces are required after a NOT operator
+    -- Default remains 1
+    -- Override the "spacing" setting in a ruleset.xml file to change
+    -- Thanks to Juliette Reinders Folmer for the patch
+  - Generic.Formatting.SpaceAfterNot now has a setting to ignore newline characters after the NOT operator
+    -- Default remains FALSE, so newlines are not allowed
+    -- Override the "ignoreNewlines" setting in a ruleset.xml file to change
+    -- Thanks to Juliette Reinders Folmer for the patch
   - PEAR.Functions.FunctionDeclaration now checks spacing before the opening parenthesis of functions with no body
     -- Thanks to Chris Wilkinson for the patch
   - PEAR.Functions.FunctionDeclaration now enforces no space before the semicolon in functions with no body

src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php

@@ -82,20 +82,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $maybePlural = '';
-        if ($this->spacing !== 1) {
-            $maybePlural = 's';
-        }
-
         $nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== $nextNonWhitespace) {
-            $error = 'Expected %s space%s after NOT operator; comment found';
-            $data  = [
-                $this->spacing,
-                $maybePlural,
-            ];
+            $error = 'Expected %s space(s) after NOT operator; comment found';
+            $data  = [$this->spacing];
             $phpcsFile->addError($error, $stackPtr, 'CommentFound', $data);
-
             return;
         }
 
@@ -110,14 +101,13 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $error = 'Expected %s space%s after NOT operator; %s found';
+        $error = 'Expected %s space(s) after NOT operator; %s found';
         $data  = [
             $this->spacing,
-            $maybePlural,
             $found,
         ];
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
 
+        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
         if ($fix === true) {
             $padding = str_repeat(' ', $this->spacing);
             if ($found === 0) {