@@ -40,6 +40,12 @@ public function process(File $phpcsFile, $stackPtr)
4040 {
4141 $ tokens = $ phpcsFile ->getTokens ();
4242
43+ $ nextSemicolon = $ phpcsFile ->findNext (T_SEMICOLON , $ stackPtr );
44+ if (false !== $ nextSemicolon && ($ tokens [$ nextSemicolon ]['line ' ] !== $ tokens [$ stackPtr ]['line ' ])) {
45+ $ error = 'Expected 1 space after colon in style definition; newline found ' ;
46+ $ phpcsFile ->addError ($ error , $ stackPtr , 'AfterNewline ' );
47+ }
48+
4349 if ($ this ->needValidateSpaces ($ phpcsFile , $ stackPtr , $ tokens )) {
4450 $ this ->validateSpaces ($ phpcsFile , $ stackPtr , $ tokens );
4551 }
@@ -56,12 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
5662 */
5763 private function needValidateSpaces (File $ phpcsFile , $ stackPtr , $ tokens )
5864 {
59- $ nextSemicolon = $ phpcsFile ->findNext (T_SEMICOLON , $ stackPtr );
60-
61- if (false === $ nextSemicolon
62- || ($ tokens [$ nextSemicolon ]['line ' ] !== $ tokens [$ stackPtr ]['line ' ])
63- || TokenizerSymbolsInterface::BITWISE_AND === $ tokens [$ stackPtr - 1 ]['content ' ]
64- ) {
65+ if (TokenizerSymbolsInterface::BITWISE_AND === $ tokens [$ stackPtr - 1 ]['content ' ]) {
6566 return false ;
6667 }
6768
@@ -98,15 +99,12 @@ private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
9899 $ phpcsFile ->addError ('Expected 1 space after colon in style definition; 0 found ' , $ stackPtr , 'NoneAfter ' );
99100 } else {
100101 $ content = $ tokens [($ stackPtr + 1 )]['content ' ];
101- if (false === strpos ($ content , $ phpcsFile -> eolChar )) {
102+ if (false !== strpos ($ content , ' ' )) {
102103 $ length = strlen ($ content );
103104 if ($ length !== 1 ) {
104105 $ error = sprintf ('Expected 1 space after colon in style definition; %s found ' , $ length );
105106 $ phpcsFile ->addError ($ error , $ stackPtr , 'After ' );
106107 }
107- } else {
108- $ error = 'Expected 1 space after colon in style definition; newline found ' ;
109- $ phpcsFile ->addError ($ error , $ stackPtr , 'AfterNewline ' );
110108 }
111109 }
112110 }
0 commit comments