Fixed bug #502 : PSR1 SideEffectsSniff sees declare() statements as side effects

Author: gsherwood

CodeSniffer/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php

@@ -119,23 +119,19 @@ private function _searchForConflict(PHP_CodeSniffer_File $phpcsFile, $start, $en
                 continue;
             }
 
-            // Ignore entire namespace, const and use statements.
-            if ($tokens[$i]['code'] === T_NAMESPACE) {
-                $next = $phpcsFile->findNext(array(T_SEMICOLON, T_OPEN_CURLY_BRACKET), ($i + 1));
-                if ($next === false) {
-                    $next = $i++;
-                } else if ($tokens[$next]['code'] === T_OPEN_CURLY_BRACKET) {
-                    $next = $tokens[$next]['bracket_closer'];
-                }
-
-                $i = $next;
-                continue;
-            } else if ($tokens[$i]['code'] === T_USE
+            // Ignore entire namespace, declare, const and use statements.
+            if ($tokens[$i]['code'] === T_NAMESPACE
+                || $tokens[$i]['code'] === T_USE
+                || $tokens[$i]['code'] === T_DECLARE
                 || $tokens[$i]['code'] === T_CONST
             ) {
-                $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
-                if ($semicolon !== false) {
-                    $i = $semicolon;
+                if (isset($tokens[$i]['scope_opener']) === true) {
+                    $i = $tokens[$i]['scope_closer'];
+                } else {
+                    $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
+                    if ($semicolon !== false) {
+                        $i = $semicolon;
+                    }
                 }
 
                 continue;

CodeSniffer/Standards/PSR1/Tests/Files/SideEffectsUnitTest.1.inc

@@ -7,6 +7,12 @@ const CONSTANT2 = 2;
 use Something;
 use SomethingElse;
 
+declare(ticks=1);
+
+declare(ticks=1) {
+    // Code.
+}
+
 define("MAXSIZE", 100);
 if (defined('MINSIZE') === false) {
     define("MINSIZE", 10);

CodeSniffer/Tokenizers/PHP.php

@@ -171,6 +171,13 @@ class PHP_CodeSniffer_Tokenizers_PHP
                                                 'shared' => false,
                                                 'with'   => array(),
                                                ),
+                            T_DECLARE       => array(
+                                                'start'  => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET),
+                                                'end'    => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET),
+                                                'strict' => false,
+                                                'shared' => false,
+                                                'with'   => array(),
+                                               ),
                             T_NAMESPACE     => array(
                                                 'start'  => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET),
                                                 'end'    => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET),

package.xml

@@ -64,6 +64,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #500 : Functions not supported as values in Squiz ArrayDeclaration sniff
   - Fixed bug #501 : ScopeClosingBrace and ScopeIndent conflict with closures used as array values
     -- Generic ScopeIndentSniff may now report fewer errors for closures, but perform the same fixes
+  - Fixed bug #502 : PSR1 SideEffectsSniff sees declare() statements as side effects
  </notes>
  <contents>
   <dir name="/">