Generic/RequireStrictTypes: bug fix - allow for multi directive statements

PHP allows for multiple directives to be passed in one `declare()` statement.

The sniff, however, did not allow for this, which could lead to false positives.

Fixed now.

Includes unit tests.

Author: jrfnl

CHANGELOG.md

@@ -111,6 +111,8 @@ The file documents changes to the PHP_CodeSniffer project.
     - Thanks to Choraimy Kroonstuiver (@axlon) for the patch
 - Fixed bug #3720 : Generic/RequireStrictTypes : will now bow out silently in case of parse errors/live coding instead of throwing false positives/false negatives
     - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
+- Fixed bug #3720 : Generic/RequireStrictTypes : did not handle multi-directive declare statements
+    - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - Fixed bug #3722 : Potential "Uninitialized string offset 1" in octal notation backfill
     - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - Fixed bug #3728 : PHP 8.2 | PSR1/SideEffects: allow for readonly classes

src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php

@@ -51,20 +51,27 @@ public function process(File $phpcsFile, $stackPtr)
                 return $phpcsFile->numTokens;
             }
 
-            $next = $phpcsFile->findNext(
-                Tokens::$emptyTokens,
-                ($tokens[$declare]['parenthesis_opener'] + 1),
-                $tokens[$declare]['parenthesis_closer'],
-                true
-            );
-
-            if ($next !== false
-                && $tokens[$next]['code'] === T_STRING
-                && strtolower($tokens[$next]['content']) === 'strict_types'
-            ) {
-                // There is a strict types declaration.
-                $found = true;
-            }
+            $next = $tokens[$declare]['parenthesis_opener'];
+
+            do {
+                $next = $phpcsFile->findNext(
+                    Tokens::$emptyTokens,
+                    ($next + 1),
+                    $tokens[$declare]['parenthesis_closer'],
+                    true
+                );
+
+                if ($next !== false
+                    && $tokens[$next]['code'] === T_STRING
+                    && strtolower($tokens[$next]['content']) === 'strict_types'
+                ) {
+                    // There is a strict types declaration.
+                    $found = true;
+                    break;
+                }
+
+                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $tokens[$declare]['parenthesis_closer']);
+            } while ($next !== false && $next < $tokens[$declare]['parenthesis_closer']);
         }//end if
 
         if ($found === false) {

src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.10.inc

@@ -0,0 +1,5 @@
+<?php
+
+declare(encoding='utf-8', ticks=1);
+
+// some code

src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.8.inc

@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1, encoding='utf-8');
+
+// some code

src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.9.inc

@@ -0,0 +1,5 @@
+<?php
+
+declare(encoding='utf-8', strict_types=1);
+
+// some code

src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php

@@ -31,6 +31,7 @@ public function getErrorList($testFile='')
         case 'RequireStrictTypesUnitTest.2.inc':
         case 'RequireStrictTypesUnitTest.5.inc':
         case 'RequireStrictTypesUnitTest.6.inc':
+        case 'RequireStrictTypesUnitTest.10.inc':
             return [1 => 1];
 
         default: