@@ -40,6 +40,12 @@ public function process(File $phpcsFile, $stackPtr)
40
40
{
41
41
$ tokens = $ phpcsFile ->getTokens ();
42
42
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
+
43
49
if ($ this ->needValidateSpaces ($ phpcsFile , $ stackPtr , $ tokens )) {
44
50
$ this ->validateSpaces ($ phpcsFile , $ stackPtr , $ tokens );
45
51
}
@@ -56,12 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
56
62
*/
57
63
private function needValidateSpaces (File $ phpcsFile , $ stackPtr , $ tokens )
58
64
{
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 ' ]) {
65
66
return false ;
66
67
}
67
68
@@ -98,15 +99,12 @@ private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
98
99
$ phpcsFile ->addError ('Expected 1 space after colon in style definition; 0 found ' , $ stackPtr , 'NoneAfter ' );
99
100
} else {
100
101
$ content = $ tokens [($ stackPtr + 1 )]['content ' ];
101
- if (false === strpos ($ content , $ phpcsFile -> eolChar )) {
102
+ if (false !== strpos ($ content , ' ' )) {
102
103
$ length = strlen ($ content );
103
104
if ($ length !== 1 ) {
104
105
$ error = sprintf ('Expected 1 space after colon in style definition; %s found ' , $ length );
105
106
$ phpcsFile ->addError ($ error , $ stackPtr , 'After ' );
106
107
}
107
- } else {
108
- $ error = 'Expected 1 space after colon in style definition; newline found ' ;
109
- $ phpcsFile ->addError ($ error , $ stackPtr , 'AfterNewline ' );
110
108
}
111
109
}
112
110
}
0 commit comments