Update the sniff to catch all the test cases

Author: dingo-d

Universal/Sniffs/DeclareStatements/DeclareStatementsStyleSniff.php

@@ -101,33 +101,44 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+        $openParenPtr = $tokens[$stackPtr]['parenthesis_opener'];
+        $closeParenPtr = $tokens[$stackPtr]['parenthesis_closer'];
+
+        if (isset($openParenPtr, $closeParenPtr) === false) {
             // Parse error or live coding, bow out.
             return;
         }
 
+        $directiveStrings = [];
         // Get the next string and check if it's an allowed directive.
-        $directiveStringPtr = $phpcsFile->findNext(\T_STRING, $stackPtr);
-        $directiveString    = $tokens[$directiveStringPtr]['content'];
+        // Find all the directive strings inside the declare statement.
+        for ($i = $openParenPtr; $i <= $closeParenPtr; $i++) {
+            if ($tokens[$i]['code'] === \T_STRING) {
+                $directiveStrings[] = $tokens[$i]['content'];
+            }
+        }
 
-        if (!in_array($directiveString, $this->allowedDirectives, true)) {
-            $phpcsFile->addError(
-                sprintf(
-                    'Declare directives can be one of: %1$s. "%2$s" found.',
-                    implode(', ', $this->allowedDirectives),
-                    $directiveString
-                ),
-                $stackPtr,
-                'WrongDeclareDirective'
-            );
-            return;
+        foreach ($directiveStrings as $directiveString) {
+            if (!in_array($directiveString, $this->allowedDirectives, true)) {
+                $phpcsFile->addError(
+                    sprintf(
+                        'Declare directives can be one of: %1$s. "%2$s" found.',
+                        implode(', ', $this->allowedDirectives),
+                        $directiveString
+                    ),
+                    $stackPtr,
+                    'WrongDeclareDirective'
+                );
+                return;
+            }
+            unset($directiveString);
         }
 
         // Curly braces.
         $hasScopeOpenerCloser = isset($tokens[$stackPtr]['scope_opener']);
 
         // If strict types is defined using curly brace, throw error.
-        if ($hasScopeOpenerCloser !== false && $directiveString === 'strict_types') {
+        if ($hasScopeOpenerCloser !== false && in_array('strict_types', $directiveStrings, true)) {
             $phpcsFile->addError(
                 sprintf(
                     'strict_types declaration must not use block mode. Opening brace found on line %d',
@@ -140,17 +151,19 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         // Fix for the case when the code is between the curly braces for the strict_types.
-        $closeParenPtr = $tokens[$stackPtr]['parenthesis_closer'];
         $codePtr = $phpcsFile->findNext(Tokens::$emptyTokens, ($closeParenPtr + 1), null, true);
 
-        // If the code pointer is not one of: \T_SEMICOLON, \T_CLOSE_TAG or \T_OPEN_CURLY_BRACKET, throw an error.
-        if (!in_array($tokens[$codePtr]['code'], [\T_SEMICOLON, \T_CLOSE_TAG, \T_OPEN_CURLY_BRACKET], true)) {
+        /* If the code pointer is not one of:
+         *    \T_SEMICOLON, \T_CLOSE_TAG or \T_OPEN_CURLY_BRACKET, \T_COLON
+         * throw an error.
+         */
+        if (!in_array($tokens[$codePtr]['code'], [\T_SEMICOLON, \T_CLOSE_TAG, \T_OPEN_CURLY_BRACKET, \T_COLON], true)) {
             $phpcsFile->addError('Unexpected code found after opening the declare statement without closing it.', $stackPtr, 'UnexpectedCodeFound');
             return;
         }
 
-        if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false) {
-            $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBraces');
+        if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && in_array('strict_types', $directiveStrings, true)) {
+            $phpcsFile->addError('strict_types declaration is not compatible with requireBraces option.', $stackPtr, 'IncompatibleCurlyBracesRequirement');
             return;
         }
 
@@ -160,27 +173,32 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if (in_array('ticks', $this->directiveType, true)) {
-            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false) {
-                $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBraces');
+            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && in_array('ticks', $directiveStrings, true)) {
+                $phpcsFile->addError('Declare statement for found without curly braces', $stackPtr, 'MissingCurlyBracesTicks');
                 return;
             }
 
             if ($this->declareStyle === 'disallowBraces' && $hasScopeOpenerCloser !== false) {
-                $phpcsFile->addError('Declare statement found using curly braces', $stackPtr, 'DisallowedCurlyBraces');
+                $phpcsFile->addError('Declare statement found using curly braces', $stackPtr, 'DisallowedCurlyBracesTicks');
                 return;
             }
         }
 
         if (in_array('encoding', $this->directiveType, true)) {
-            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false) {
-                $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBraces');
+            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && in_array('encoding', $directiveStrings, true)) {
+                $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBracesEncoding');
                 return;
             }
 
             if ($this->declareStyle === 'disallowBraces' && $hasScopeOpenerCloser !== false) {
-                $phpcsFile->addError('Declare statement found using curly braces', $stackPtr, 'DisallowedCurlyBraces');
+                $phpcsFile->addError('Declare statement found using curly braces', $stackPtr, 'DisallowedCurlyBracesEncoding');
                 return;
             }
         }
+
+        if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && empty($this->directiveType) && !in_array('strict_types', $directiveStrings, true)) {
+            $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBraces');
+            return;
+        }
     }
 }