Merge branch 'inline-else' of https://github.com/klausi/PHP_CodeSniffer

amllano · Nov 19, 2012 · 81b7567 · 81b7567
2 parents c55c754 + 27f1c2b
commit 81b7567
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -159,6 +159,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                               T_DOUBLE_ARROW,
                               T_COLON,
                               T_INLINE_THEN,
+                              T_INLINE_ELSE,
                               T_CASE,
                              );
 

diff --git a/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -105,6 +105,7 @@ $boo = -$foo;
 function foo($boo = -1) {}
 $foo = array('boo' => -1);
 $x = $test ? -1 : 1;
+$y = $test ? 1 : -1;
 
 $closureWithDefaultParamter = function (array $testArray=array()) {};