Fix ternary operator + negative numbers.

A few uses in CakePHP were failing because of this rule not being accurate.
cakephp · Apr 27, 2012 · 112ba26 · 112ba26
1 parent aa274f2
commit 112ba26
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -156,13 +156,22 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
 							return;
 						}
 					}
+
 					if (
 						($prev !== false && $tokens[$prev]['code'] === T_CASE) &&
 						$tokens[$semi]['code'] === T_COLON
 					) {
 						// Inside a case statement
 						return;
 					}
+
+					if (
+						$prev !== false && in_array($tokens[$prev]['code'], array(T_INLINE_THEN)) &&
+						$tokens[$semi]['code'] === T_COLON
+					) {
+						// Inside a ternary op.
+						return;
+					}
 				}
 			}
 

diff --git a/tests/files/operator_spacing_pass.php b/tests/files/operator_spacing_pass.php
@@ -0,0 +1,9 @@
+<?php
+$foo = -1;
+
+switch($foo) {
+	case -1:
+	break;
+}
+$bar = isset($foo) ? -2 : 0;
+$ten = 10 * 2;