Fix phpcs issues in the sniff

Author: dingo-d

Universal/Sniffs/DeclareStatements/DeclareStatementsStyleSniff.php

@@ -101,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $openParenPtr = $tokens[$stackPtr]['parenthesis_opener'];
+        $openParenPtr  = $tokens[$stackPtr]['parenthesis_opener'];
         $closeParenPtr = $tokens[$stackPtr]['parenthesis_closer'];
 
         if (isset($openParenPtr, $closeParenPtr) === false) {
@@ -158,12 +158,23 @@ public function process(File $phpcsFile, $stackPtr)
          * 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');
+            $phpcsFile->addError(
+                'Unexpected code found after opening the declare statement without closing it.',
+                $stackPtr,
+                'UnexpectedCodeFound'
+            );
             return;
         }
 
-        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');
+        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;
         }
 
@@ -173,30 +184,56 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if (in_array('ticks', $this->directiveType, true)) {
-            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && in_array('ticks', $directiveStrings, true)) {
-                $phpcsFile->addError('Declare statement for found without curly braces', $stackPtr, 'MissingCurlyBracesTicks');
+            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, 'DisallowedCurlyBracesTicks');
+                $phpcsFile->addError(
+                    'Declare statement found using curly braces',
+                    $stackPtr,
+                    'DisallowedCurlyBracesTicks'
+                );
                 return;
             }
         }
 
         if (in_array('encoding', $this->directiveType, true)) {
-            if ($this->declareStyle === 'requireBraces' && $hasScopeOpenerCloser === false && in_array('encoding', $directiveStrings, true)) {
-                $phpcsFile->addError('Declare statement found without curly braces', $stackPtr, 'MissingCurlyBracesEncoding');
+            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, 'DisallowedCurlyBracesEncoding');
+                $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)) {
+        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;
         }