Fixed bug #529 : Squiz.Strings.EchoedStrings gives false positive when echo'ing using an inline condition

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php

@@ -57,7 +57,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $firstContent = $phpcsFile->findNext(array(T_WHITESPACE), ($stackPtr + 1), null, true);
+        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         // If the first non-whitespace token is not an opening parenthesis, then we are not concerned.
         if ($tokens[$firstContent]['code'] !== T_OPEN_PARENTHESIS) {
             $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
@@ -73,6 +73,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             return;
         }
 
+        // If the parenthesis don't match, then we are not concerned.
+        if ($tokens[$firstContent]['parenthesis_closer'] !== $prev) {
+            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+            return;
+        }
+
         $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'yes');
 
         if (($phpcsFile->findNext(PHP_CodeSniffer_Tokens::$operators, $stackPtr, $end, false)) === false) {

CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc

@@ -6,6 +6,7 @@ echo('hello');
 echo($hello);
 echo ('hello');
 echo ($hello);
+echo ($loan_device->returndate == 0) ? 'Not returned' : date('d/m/Y', $loan_device->returndate);
 ?>
 <p><?php echo ($foo) ?  'true' : 'false' ?></p>
 <p><?php echo ($foo) ?></p>

CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php

@@ -47,7 +47,7 @@ public function getErrorList()
                 6  => 1,
                 7  => 1,
                 8  => 1,
-                11 => 1,
+                12 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -45,6 +45,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #515 : Spaces in JS block incorrectly flagged as indentation error
   - Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY
   - Fixed bug #527 : Closure inside IF statement is not tokenized correctly
+  - Fixed bug #529 : Squiz.Strings.EchoedStrings gives false positive when echo'ing using an inline condition
   - Fixed bug #543 : SWITCH with closure in condition generates inline control structure error
   - Fixed bug #551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
   - Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis