Merge branch 'master' into 4.x

Author: jrfnl

src/Sniffs/AbstractPatternSniff.php

@@ -738,17 +738,17 @@ protected function registerSupplementary()
     }//end registerSupplementary()
 
 
-     /**
-      * Processes any tokens registered with registerSupplementary().
-      *
-      * @param \PHP_CodeSniffer\Files\File $phpcsFile The PHP_CodeSniffer file where to
-      *                                               process the skip.
-      * @param int                         $stackPtr  The position in the tokens stack to
-      *                                               process.
-      *
-      * @return void
-      * @see    registerSupplementary()
-      */
+    /**
+     * Processes any tokens registered with registerSupplementary().
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The PHP_CodeSniffer file where to
+     *                                               process the skip.
+     * @param int                         $stackPtr  The position in the tokens stack to
+     *                                               process.
+     *
+     * @return void
+     * @see    registerSupplementary()
+     */
     protected function processSupplementary(File $phpcsFile, $stackPtr)
     {
 

src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php

@@ -195,7 +195,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
 
         // Skip constructor and destructor.
         $methodName      = $phpcsFile->getDeclarationName($stackPtr);
-        $isSpecialMethod = in_array($methodName,  $this->specialMethods, true);
+        $isSpecialMethod = in_array($methodName, $this->specialMethods, true);
 
         $return = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {

src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php

@@ -67,7 +67,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
 
         // Skip constructor and destructor.
         $methodName      = $phpcsFile->getDeclarationName($stackPtr);
-        $isSpecialMethod = in_array($methodName,  $this->specialMethods, true);
+        $isSpecialMethod = in_array($methodName, $this->specialMethods, true);
 
         if ($return !== null) {
             $content = $tokens[($return + 2)]['content'];
@@ -781,7 +781,7 @@ protected function checkInheritdoc(File $phpcsFile, $stackPtr, $commentStart)
             T_DOC_COMMENT_STAR,
         ];
         for ($i = $commentStart; $i <= $tokens[$commentStart]['comment_closer']; $i++) {
-            if (in_array($tokens[$i]['code'], $allowedTokens) === false) {
+            if (in_array($tokens[$i]['code'], $allowedTokens, true) === false) {
                 $trimmedContent = strtolower(trim($tokens[$i]['content']));
 
                 if ($trimmedContent === '{@inheritdoc}') {

src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php

@@ -138,7 +138,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             return;
         }
 
-         // Support both a var type and a description.
+        // Support both a var type and a description.
         preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\]]+))*)( .*)?`i', $tokens[($foundVar + 2)]['content'], $varParts);
         if (isset($varParts[1]) === false) {
             return;

src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php

@@ -53,9 +53,9 @@ public function process(File $phpcsFile, $stackPtr)
         $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($openBrace + 1), null, true);
 
         if ($nextContent === $tokens[$stackPtr]['scope_closer']) {
-             // The next bit of content is the closing brace, so this
-             // is an empty function and should have a blank line
-             // between the opening and closing braces.
+            // The next bit of content is the closing brace, so this
+            // is an empty function and should have a blank line
+            // between the opening and closing braces.
             return;
         }