jazzsequence / games-collector

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -191,7 +191,7 @@ 
      * @param int                  $stackPtr  The position of the current token in
      *                                        the stack passed in $tokens.
      *
-     * @return void
+     * @return boolean
      */
     private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {

Indentation +182 added lines, -182 removed lines

@@ -29,188 +29,188 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_USE);
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in
-     *                                        the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        if ($this->_shouldIgnoreUse($phpcsFile, $stackPtr) === true) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // One space after the use keyword.
-        if ($tokens[($stackPtr + 1)]['content'] !== ' ') {
-            $error = 'There must be a single space after the USE keyword';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterUse');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
-            }
-        }
-
-        // Only one USE declaration allowed per statement.
-        $next = $phpcsFile->findNext(array(T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP), ($stackPtr + 1));
-        if ($tokens[$next]['code'] !== T_SEMICOLON) {
-            $error = 'There must be one USE keyword per declaration';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MultipleDeclarations');
-            if ($fix === true) {
-                if ($tokens[$next]['code'] === T_COMMA) {
-                    $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar.'use ');
-                } else {
-                    $baseUse      = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
-                    $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
-
-                    $phpcsFile->fixer->beginChangeset();
-
-                    // Remove base use statement.
-                    for ($i = $stackPtr; $i <= $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    // Convert grouped use statements into full use statements.
-                    do {
-                        $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
-
-                        $whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($next - 1), null, true);
-                        for ($i = ($whitespace + 1); $i < $next; $i++) {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        if ($tokens[$next]['code'] === T_CONST || $tokens[$next]['code'] === T_FUNCTION) {
-                            $phpcsFile->fixer->addContentBefore($next, 'use ');
-                            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
-                            $phpcsFile->fixer->addContentBefore($next, str_replace('use ', '', $baseUse));
-                        } else {
-                            $phpcsFile->fixer->addContentBefore($next, $baseUse);
-                        }
-
-                        $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
-                        if ($next !== false) {
-                            $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar);
-                        }
-                    } while ($next !== false);
-
-                    $phpcsFile->fixer->replaceToken($closingCurly, '');
-
-                    // Remove any trailing whitespace.
-                    $next       = $phpcsFile->findNext(T_SEMICOLON, $closingCurly);
-                    $whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($closingCurly - 1), null, true);
-                    for ($i = ($whitespace + 1); $i < $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }//end if
-            }//end if
-        }//end if
-
-        // Make sure this USE comes after the first namespace declaration.
-        $prev = $phpcsFile->findPrevious(T_NAMESPACE, ($stackPtr - 1));
-        if ($prev !== false) {
-            $first = $phpcsFile->findNext(T_NAMESPACE, 1);
-            if ($prev !== $first) {
-                $error = 'USE declarations must go after the first namespace declaration';
-                $phpcsFile->addError($error, $stackPtr, 'UseAfterNamespace');
-            }
-        }
-
-        // Only interested in the last USE statement from here onwards.
-        $nextUse = $phpcsFile->findNext(T_USE, ($stackPtr + 1));
-        while ($this->_shouldIgnoreUse($phpcsFile, $nextUse) === true) {
-            $nextUse = $phpcsFile->findNext(T_USE, ($nextUse + 1));
-            if ($nextUse === false) {
-                break;
-            }
-        }
-
-        if ($nextUse !== false) {
-            return;
-        }
-
-        $end  = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true);
-
-        if ($tokens[$next]['code'] === T_CLOSE_TAG) {
-            return;
-        }
-
-        $diff = ($tokens[$next]['line'] - $tokens[$end]['line'] - 1);
-        if ($diff !== 1) {
-            if ($diff < 0) {
-                $diff = 0;
-            }
-
-            $error = 'There must be one blank line after the last USE statement; %s found;';
-            $data  = array($diff);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterLastUse', $data);
-            if ($fix === true) {
-                if ($diff === 0) {
-                    $phpcsFile->fixer->addNewline($end);
-                } else {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($end + 1); $i < $next; $i++) {
-                        if ($tokens[$i]['line'] === $tokens[$next]['line']) {
-                            break;
-                        }
-
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->addNewline($end);
-                    $phpcsFile->fixer->endChangeset();
-                }
-            }
-        }//end if
-
-    }//end process()
-
-
-    /**
-     * Check if this use statement is part of the namespace block.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in
-     *                                        the stack passed in $tokens.
-     *
-     * @return void
-     */
-    private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Ignore USE keywords inside closures.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
-            return true;
-        }
-
-        // Ignore USE keywords for traits.
-        if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true) {
-            return true;
-        }
-
-        return false;
-
-    }//end _shouldIgnoreUse()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_USE);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in
+	  *                                        the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  if ($this->_shouldIgnoreUse($phpcsFile, $stackPtr) === true) {
+				return;
+		  }
+
+		  $tokens = $phpcsFile->getTokens();
+
+		  // One space after the use keyword.
+		  if ($tokens[($stackPtr + 1)]['content'] !== ' ') {
+				$error = 'There must be a single space after the USE keyword';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterUse');
+				if ($fix === true) {
+					 $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+				}
+		  }
+
+		  // Only one USE declaration allowed per statement.
+		  $next = $phpcsFile->findNext(array(T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP), ($stackPtr + 1));
+		  if ($tokens[$next]['code'] !== T_SEMICOLON) {
+				$error = 'There must be one USE keyword per declaration';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MultipleDeclarations');
+				if ($fix === true) {
+					 if ($tokens[$next]['code'] === T_COMMA) {
+						  $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar.'use ');
+					 } else {
+						  $baseUse      = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
+						  $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
+
+						  $phpcsFile->fixer->beginChangeset();
+
+						  // Remove base use statement.
+						  for ($i = $stackPtr; $i <= $next; $i++) {
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  // Convert grouped use statements into full use statements.
+						  do {
+								$next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
+
+								$whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($next - 1), null, true);
+								for ($i = ($whitespace + 1); $i < $next; $i++) {
+									 $phpcsFile->fixer->replaceToken($i, '');
+								}
+
+								if ($tokens[$next]['code'] === T_CONST || $tokens[$next]['code'] === T_FUNCTION) {
+									 $phpcsFile->fixer->addContentBefore($next, 'use ');
+									 $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
+									 $phpcsFile->fixer->addContentBefore($next, str_replace('use ', '', $baseUse));
+								} else {
+									 $phpcsFile->fixer->addContentBefore($next, $baseUse);
+								}
+
+								$next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
+								if ($next !== false) {
+									 $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar);
+								}
+						  } while ($next !== false);
+
+						  $phpcsFile->fixer->replaceToken($closingCurly, '');
+
+						  // Remove any trailing whitespace.
+						  $next       = $phpcsFile->findNext(T_SEMICOLON, $closingCurly);
+						  $whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($closingCurly - 1), null, true);
+						  for ($i = ($whitespace + 1); $i < $next; $i++) {
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  $phpcsFile->fixer->endChangeset();
+					 }//end if
+				}//end if
+		  }//end if
+
+		  // Make sure this USE comes after the first namespace declaration.
+		  $prev = $phpcsFile->findPrevious(T_NAMESPACE, ($stackPtr - 1));
+		  if ($prev !== false) {
+				$first = $phpcsFile->findNext(T_NAMESPACE, 1);
+				if ($prev !== $first) {
+					 $error = 'USE declarations must go after the first namespace declaration';
+					 $phpcsFile->addError($error, $stackPtr, 'UseAfterNamespace');
+				}
+		  }
+
+		  // Only interested in the last USE statement from here onwards.
+		  $nextUse = $phpcsFile->findNext(T_USE, ($stackPtr + 1));
+		  while ($this->_shouldIgnoreUse($phpcsFile, $nextUse) === true) {
+				$nextUse = $phpcsFile->findNext(T_USE, ($nextUse + 1));
+				if ($nextUse === false) {
+					 break;
+				}
+		  }
+
+		  if ($nextUse !== false) {
+				return;
+		  }
+
+		  $end  = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true);
+
+		  if ($tokens[$next]['code'] === T_CLOSE_TAG) {
+				return;
+		  }
+
+		  $diff = ($tokens[$next]['line'] - $tokens[$end]['line'] - 1);
+		  if ($diff !== 1) {
+				if ($diff < 0) {
+					 $diff = 0;
+				}
+
+				$error = 'There must be one blank line after the last USE statement; %s found;';
+				$data  = array($diff);
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterLastUse', $data);
+				if ($fix === true) {
+					 if ($diff === 0) {
+						  $phpcsFile->fixer->addNewline($end);
+					 } else {
+						  $phpcsFile->fixer->beginChangeset();
+						  for ($i = ($end + 1); $i < $next; $i++) {
+								if ($tokens[$i]['line'] === $tokens[$next]['line']) {
+									 break;
+								}
+
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  $phpcsFile->fixer->addNewline($end);
+						  $phpcsFile->fixer->endChangeset();
+					 }
+				}
+		  }//end if
+
+	 }//end process()
+
+
+	 /**
+	  * Check if this use statement is part of the namespace block.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in
+	  *                                        the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  // Ignore USE keywords inside closures.
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
+				return true;
+		  }
+
+		  // Ignore USE keywords for traits.
+		  if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true) {
+				return true;
+		  }
+
+		  return false;
+
+	 }//end _shouldIgnoreUse()
 
 
 }//end class

Spacing +64 added lines, -64 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function register()
     {
-        return array(T_USE);
+        return array( T_USE );
 
     }//end register()
 
@@ -50,72 +50,72 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
-        if ($this->_shouldIgnoreUse($phpcsFile, $stackPtr) === true) {
+        if ( $this->_shouldIgnoreUse( $phpcsFile, $stackPtr ) === true ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
         // One space after the use keyword.
-        if ($tokens[($stackPtr + 1)]['content'] !== ' ') {
+        if ( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] !== ' ' ) {
             $error = 'There must be a single space after the USE keyword';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterUse');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'SpaceAfterUse' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), ' ' );
             }
         }
 
         // Only one USE declaration allowed per statement.
-        $next = $phpcsFile->findNext(array(T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP), ($stackPtr + 1));
-        if ($tokens[$next]['code'] !== T_SEMICOLON) {
+        $next = $phpcsFile->findNext( array( T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP ), ( $stackPtr + 1 ) );
+        if ( $tokens[ $next ][ 'code' ] !== T_SEMICOLON ) {
             $error = 'There must be one USE keyword per declaration';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MultipleDeclarations');
-            if ($fix === true) {
-                if ($tokens[$next]['code'] === T_COMMA) {
-                    $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar.'use ');
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'MultipleDeclarations' );
+            if ( $fix === true ) {
+                if ( $tokens[ $next ][ 'code' ] === T_COMMA ) {
+                    $phpcsFile->fixer->replaceToken( $next, ';' . $phpcsFile->eolChar . 'use ' );
                 } else {
-                    $baseUse      = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
-                    $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
+                    $baseUse      = rtrim( $phpcsFile->getTokensAsString( $stackPtr, ( $next - $stackPtr ) ) );
+                    $closingCurly = $phpcsFile->findNext( T_CLOSE_USE_GROUP, ( $next + 1 ) );
 
                     $phpcsFile->fixer->beginChangeset();
 
                     // Remove base use statement.
-                    for ($i = $stackPtr; $i <= $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    for ( $i = $stackPtr; $i <= $next; $i++ ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
                     // Convert grouped use statements into full use statements.
                     do {
-                        $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
+                        $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $next + 1 ), $closingCurly, true );
 
-                        $whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($next - 1), null, true);
-                        for ($i = ($whitespace + 1); $i < $next; $i++) {
-                            $phpcsFile->fixer->replaceToken($i, '');
+                        $whitespace = $phpcsFile->findPrevious( T_WHITESPACE, ( $next - 1 ), null, true );
+                        for ( $i = ( $whitespace + 1 ); $i < $next; $i++ ) {
+                            $phpcsFile->fixer->replaceToken( $i, '' );
                         }
 
-                        if ($tokens[$next]['code'] === T_CONST || $tokens[$next]['code'] === T_FUNCTION) {
-                            $phpcsFile->fixer->addContentBefore($next, 'use ');
-                            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
-                            $phpcsFile->fixer->addContentBefore($next, str_replace('use ', '', $baseUse));
+                        if ( $tokens[ $next ][ 'code' ] === T_CONST || $tokens[ $next ][ 'code' ] === T_FUNCTION ) {
+                            $phpcsFile->fixer->addContentBefore( $next, 'use ' );
+                            $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $next + 1 ), $closingCurly, true );
+                            $phpcsFile->fixer->addContentBefore( $next, str_replace( 'use ', '', $baseUse ) );
                         } else {
-                            $phpcsFile->fixer->addContentBefore($next, $baseUse);
+                            $phpcsFile->fixer->addContentBefore( $next, $baseUse );
                         }
 
-                        $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
-                        if ($next !== false) {
-                            $phpcsFile->fixer->replaceToken($next, ';'.$phpcsFile->eolChar);
+                        $next = $phpcsFile->findNext( T_COMMA, ( $next + 1 ), $closingCurly );
+                        if ( $next !== false ) {
+                            $phpcsFile->fixer->replaceToken( $next, ';' . $phpcsFile->eolChar );
                         }
-                    } while ($next !== false);
+                    } while ( $next !== false );
 
-                    $phpcsFile->fixer->replaceToken($closingCurly, '');
+                    $phpcsFile->fixer->replaceToken( $closingCurly, '' );
 
                     // Remove any trailing whitespace.
-                    $next       = $phpcsFile->findNext(T_SEMICOLON, $closingCurly);
-                    $whitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($closingCurly - 1), null, true);
-                    for ($i = ($whitespace + 1); $i < $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    $next       = $phpcsFile->findNext( T_SEMICOLON, $closingCurly );
+                    $whitespace = $phpcsFile->findPrevious( T_WHITESPACE, ( $closingCurly - 1 ), null, true );
+                    for ( $i = ( $whitespace + 1 ); $i < $next; $i++ ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
                     $phpcsFile->fixer->endChangeset();
@@ -124,58 +124,58 @@ 
         }//end if
 
         // Make sure this USE comes after the first namespace declaration.
-        $prev = $phpcsFile->findPrevious(T_NAMESPACE, ($stackPtr - 1));
-        if ($prev !== false) {
-            $first = $phpcsFile->findNext(T_NAMESPACE, 1);
-            if ($prev !== $first) {
+        $prev = $phpcsFile->findPrevious( T_NAMESPACE, ( $stackPtr - 1 ) );
+        if ( $prev !== false ) {
+            $first = $phpcsFile->findNext( T_NAMESPACE, 1 );
+            if ( $prev !== $first ) {
                 $error = 'USE declarations must go after the first namespace declaration';
-                $phpcsFile->addError($error, $stackPtr, 'UseAfterNamespace');
+                $phpcsFile->addError( $error, $stackPtr, 'UseAfterNamespace' );
             }
         }
 
         // Only interested in the last USE statement from here onwards.
-        $nextUse = $phpcsFile->findNext(T_USE, ($stackPtr + 1));
-        while ($this->_shouldIgnoreUse($phpcsFile, $nextUse) === true) {
-            $nextUse = $phpcsFile->findNext(T_USE, ($nextUse + 1));
-            if ($nextUse === false) {
+        $nextUse = $phpcsFile->findNext( T_USE, ( $stackPtr + 1 ) );
+        while ( $this->_shouldIgnoreUse( $phpcsFile, $nextUse ) === true ) {
+            $nextUse = $phpcsFile->findNext( T_USE, ( $nextUse + 1 ) );
+            if ( $nextUse === false ) {
                 break;
             }
         }
 
-        if ($nextUse !== false) {
+        if ( $nextUse !== false ) {
             return;
         }
 
-        $end  = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true);
+        $end  = $phpcsFile->findNext( T_SEMICOLON, ( $stackPtr + 1 ) );
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $end + 1 ), null, true );
 
-        if ($tokens[$next]['code'] === T_CLOSE_TAG) {
+        if ( $tokens[ $next ][ 'code' ] === T_CLOSE_TAG ) {
             return;
         }
 
-        $diff = ($tokens[$next]['line'] - $tokens[$end]['line'] - 1);
-        if ($diff !== 1) {
-            if ($diff < 0) {
+        $diff = ( $tokens[ $next ][ 'line' ] - $tokens[ $end ][ 'line' ] - 1 );
+        if ( $diff !== 1 ) {
+            if ( $diff < 0 ) {
                 $diff = 0;
             }
 
             $error = 'There must be one blank line after the last USE statement; %s found;';
-            $data  = array($diff);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterLastUse', $data);
-            if ($fix === true) {
-                if ($diff === 0) {
-                    $phpcsFile->fixer->addNewline($end);
+            $data  = array( $diff );
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'SpaceAfterLastUse', $data );
+            if ( $fix === true ) {
+                if ( $diff === 0 ) {
+                    $phpcsFile->fixer->addNewline( $end );
                 } else {
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($end + 1); $i < $next; $i++) {
-                        if ($tokens[$i]['line'] === $tokens[$next]['line']) {
+                    for ( $i = ( $end + 1 ); $i < $next; $i++ ) {
+                        if ( $tokens[ $i ][ 'line' ] === $tokens[ $next ][ 'line' ] ) {
                             break;
                         }
 
-                        $phpcsFile->fixer->replaceToken($i, '');
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
-                    $phpcsFile->fixer->addNewline($end);
+                    $phpcsFile->fixer->addNewline( $end );
                     $phpcsFile->fixer->endChangeset();
                 }
             }
@@ -193,18 +193,18 @@ 
      *
      * @return void
      */
-    private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    private function _shouldIgnoreUse( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Ignore USE keywords inside closures.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        if ( $tokens[ $next ][ 'code' ] === T_OPEN_PARENTHESIS ) {
             return true;
         }
 
         // Ignore USE keywords for traits.
-        if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true) {
+        if ( $phpcsFile->hasCondition( $stackPtr, array( T_CLASS, T_TRAIT ) ) === true ) {
             return true;
         }
 

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class PSR2_Sniffs_Namespaces_UseDeclarationSniff implements PHP_CodeSniffer_Sniff
-{
+class PSR2_Sniffs_Namespaces_UseDeclarationSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -34,8 +33,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_USE);
 
     }//end register()
@@ -50,8 +48,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         if ($this->_shouldIgnoreUse($phpcsFile, $stackPtr) === true) {
             return;
         }
@@ -193,8 +190,7 @@ 
      *
      * @return void
      */
-    private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    private function _shouldIgnoreUse(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Ignore USE keywords inside closures.

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +74 added lines, -74 removed lines

@@ -31,89 +31,89 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_OPEN_SQUARE_BRACKET,
-                T_CLOSE_SQUARE_BRACKET,
-               );
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_OPEN_SQUARE_BRACKET,
+					 T_CLOSE_SQUARE_BRACKET,
+					);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being checked.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	 /**
+	  * Processes this sniff, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The current file being checked.
+	  * @param int                  $stackPtr  The position of the current token in the
+	  *                                        stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
 
-        // PHP 5.4 introduced a shorthand array declaration syntax, so we need
-        // to ignore the these type of array declarations because this sniff is
-        // only dealing with array usage.
-        if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
-            $openBracket = $stackPtr;
-        } else {
-            if (isset($tokens[$stackPtr]['bracket_opener']) === false) {
-                return;
-            }
+		  // PHP 5.4 introduced a shorthand array declaration syntax, so we need
+		  // to ignore the these type of array declarations because this sniff is
+		  // only dealing with array usage.
+		  if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
+				$openBracket = $stackPtr;
+		  } else {
+				if (isset($tokens[$stackPtr]['bracket_opener']) === false) {
+					 return;
+				}
 
-            $openBracket = $tokens[$stackPtr]['bracket_opener'];
-        }
+				$openBracket = $tokens[$stackPtr]['bracket_opener'];
+		  }
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket - 1), null, true);
-        if ($tokens[$prev]['code'] === T_EQUAL) {
-            return;
-        }
+		  $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket - 1), null, true);
+		  if ($tokens[$prev]['code'] === T_EQUAL) {
+				return;
+		  }
 
-        // Square brackets can not have a space before them.
-        $prevType = $tokens[($stackPtr - 1)]['code'];
-        if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === true) {
-            $nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
-            $expected = $tokens[$nonSpace]['content'].$tokens[$stackPtr]['content'];
-            $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).$tokens[$stackPtr]['content'];
-            $error    = 'Space found before square bracket; expected "%s" but found "%s"';
-            $data     = array(
-                         $expected,
-                         $found,
-                        );
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
-            }
-        }
+		  // Square brackets can not have a space before them.
+		  $prevType = $tokens[($stackPtr - 1)]['code'];
+		  if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === true) {
+				$nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
+				$expected = $tokens[$nonSpace]['content'].$tokens[$stackPtr]['content'];
+				$found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).$tokens[$stackPtr]['content'];
+				$error    = 'Space found before square bracket; expected "%s" but found "%s"';
+				$data     = array(
+								 $expected,
+								 $found,
+								);
+				$fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
+				if ($fix === true) {
+					 $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
+				}
+		  }
 
-        // Open square brackets can't ever have spaces after them.
-        if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
-            $nextType = $tokens[($stackPtr + 1)]['code'];
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$nextType]) === true) {
-                $nonSpace = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 2), null, true);
-                $expected = $tokens[$stackPtr]['content'].$tokens[$nonSpace]['content'];
-                $found    = $phpcsFile->getTokensAsString($stackPtr, ($nonSpace - $stackPtr + 1));
-                $error    = 'Space found after square bracket; expected "%s" but found "%s"';
-                $data     = array(
-                             $expected,
-                             $found,
-                            );
-                $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-                }
-            }
-        }
+		  // Open square brackets can't ever have spaces after them.
+		  if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
+				$nextType = $tokens[($stackPtr + 1)]['code'];
+				if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$nextType]) === true) {
+					 $nonSpace = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 2), null, true);
+					 $expected = $tokens[$stackPtr]['content'].$tokens[$nonSpace]['content'];
+					 $found    = $phpcsFile->getTokensAsString($stackPtr, ($nonSpace - $stackPtr + 1));
+					 $error    = 'Space found after square bracket; expected "%s" but found "%s"';
+					 $data     = array(
+									  $expected,
+									  $found,
+									 );
+					 $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
+					 if ($fix === true) {
+						  $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+					 }
+				}
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +23 added lines, -23 removed lines

@@ -55,60 +55,60 @@
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // PHP 5.4 introduced a shorthand array declaration syntax, so we need
         // to ignore the these type of array declarations because this sniff is
         // only dealing with array usage.
-        if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_OPEN_SQUARE_BRACKET ) {
             $openBracket = $stackPtr;
         } else {
-            if (isset($tokens[$stackPtr]['bracket_opener']) === false) {
+            if ( isset( $tokens[ $stackPtr ][ 'bracket_opener' ] ) === false ) {
                 return;
             }
 
-            $openBracket = $tokens[$stackPtr]['bracket_opener'];
+            $openBracket = $tokens[ $stackPtr ][ 'bracket_opener' ];
         }
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket - 1), null, true);
-        if ($tokens[$prev]['code'] === T_EQUAL) {
+        $prev = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $openBracket - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] === T_EQUAL ) {
             return;
         }
 
         // Square brackets can not have a space before them.
-        $prevType = $tokens[($stackPtr - 1)]['code'];
-        if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === true) {
-            $nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
-            $expected = $tokens[$nonSpace]['content'].$tokens[$stackPtr]['content'];
-            $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).$tokens[$stackPtr]['content'];
+        $prevType = $tokens[ ( $stackPtr - 1 ) ][ 'code' ];
+        if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $prevType ] ) === true ) {
+            $nonSpace = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $stackPtr - 2 ), null, true );
+            $expected = $tokens[ $nonSpace ][ 'content' ] . $tokens[ $stackPtr ][ 'content' ];
+            $found    = $phpcsFile->getTokensAsString( $nonSpace, ( $stackPtr - $nonSpace ) ) . $tokens[ $stackPtr ][ 'content' ];
             $error    = 'Space found before square bracket; expected "%s" but found "%s"';
             $data     = array(
                          $expected,
                          $found,
                         );
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
+            $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'SpaceBeforeBracket', $data );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( ( $stackPtr - 1 ), '' );
             }
         }
 
         // Open square brackets can't ever have spaces after them.
-        if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
-            $nextType = $tokens[($stackPtr + 1)]['code'];
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$nextType]) === true) {
-                $nonSpace = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 2), null, true);
-                $expected = $tokens[$stackPtr]['content'].$tokens[$nonSpace]['content'];
-                $found    = $phpcsFile->getTokensAsString($stackPtr, ($nonSpace - $stackPtr + 1));
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_OPEN_SQUARE_BRACKET ) {
+            $nextType = $tokens[ ( $stackPtr + 1 ) ][ 'code' ];
+            if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $nextType ] ) === true ) {
+                $nonSpace = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $stackPtr + 2 ), null, true );
+                $expected = $tokens[ $stackPtr ][ 'content' ] . $tokens[ $nonSpace ][ 'content' ];
+                $found    = $phpcsFile->getTokensAsString( $stackPtr, ( $nonSpace - $stackPtr + 1 ) );
                 $error    = 'Space found after square bracket; expected "%s" but found "%s"';
                 $data     = array(
                              $expected,
                              $found,
                             );
-                $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+                $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'SpaceAfterBracket', $data );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
                 }
             }
         }

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Arrays_ArrayBracketSpacingSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Arrays_ArrayBracketSpacingSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_OPEN_SQUARE_BRACKET,
                 T_CLOSE_SQUARE_BRACKET,
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // PHP 5.4 introduced a shorthand array declaration syntax, so we need

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +56 added lines, -56 removed lines

@@ -31,69 +31,69 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_CLASS,
-                T_INTERFACE,
-               );
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_CLASS,
+					 T_INTERFACE,
+					);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The current file being processed.
+	  * @param int                  $stackPtr  The position of the current token in the
+	  *                                        stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            $error = 'Possible parse error: %s missing opening or closing brace';
-            $data  = array($tokens[$stackPtr]['content']);
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
-            return;
-        }
+		  if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+				$error = 'Possible parse error: %s missing opening or closing brace';
+				$data  = array($tokens[$stackPtr]['content']);
+				$phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+				return;
+		  }
 
-        // Determine the name of the class or interface. Note that we cannot
-        // simply look for the first T_STRING because a class name
-        // starting with the number will be multiple tokens.
-        $opener    = $tokens[$stackPtr]['scope_opener'];
-        $nameStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $opener, true);
-        $nameEnd   = $phpcsFile->findNext(T_WHITESPACE, $nameStart, $opener);
-        if ($nameEnd === false) {
-            $name = $tokens[$nameStart]['content'];
-        } else {
-            $name = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
-        }
+		  // Determine the name of the class or interface. Note that we cannot
+		  // simply look for the first T_STRING because a class name
+		  // starting with the number will be multiple tokens.
+		  $opener    = $tokens[$stackPtr]['scope_opener'];
+		  $nameStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $opener, true);
+		  $nameEnd   = $phpcsFile->findNext(T_WHITESPACE, $nameStart, $opener);
+		  if ($nameEnd === false) {
+				$name = $tokens[$nameStart]['content'];
+		  } else {
+				$name = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
+		  }
 
-        // Check for camel caps format.
-        $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, false);
-        if ($valid === false) {
-            $type  = ucfirst($tokens[$stackPtr]['content']);
-            $error = '%s name "%s" is not in camel caps format';
-            $data  = array(
-                      $type,
-                      $name,
-                     );
-            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'no');
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'yes');
-        }
+		  // Check for camel caps format.
+		  $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, false);
+		  if ($valid === false) {
+				$type  = ucfirst($tokens[$stackPtr]['content']);
+				$error = '%s name "%s" is not in camel caps format';
+				$data  = array(
+							 $type,
+							 $name,
+							);
+				$phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'no');
+		  } else {
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'yes');
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +16 added lines, -16 removed lines

@@ -55,42 +55,42 @@
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ] ) === false ) {
             $error = 'Possible parse error: %s missing opening or closing brace';
-            $data  = array($tokens[$stackPtr]['content']);
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+            $data  = array( $tokens[ $stackPtr ][ 'content' ] );
+            $phpcsFile->addWarning( $error, $stackPtr, 'MissingBrace', $data );
             return;
         }
 
         // Determine the name of the class or interface. Note that we cannot
         // simply look for the first T_STRING because a class name
         // starting with the number will be multiple tokens.
-        $opener    = $tokens[$stackPtr]['scope_opener'];
-        $nameStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $opener, true);
-        $nameEnd   = $phpcsFile->findNext(T_WHITESPACE, $nameStart, $opener);
-        if ($nameEnd === false) {
-            $name = $tokens[$nameStart]['content'];
+        $opener    = $tokens[ $stackPtr ][ 'scope_opener' ];
+        $nameStart = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), $opener, true );
+        $nameEnd   = $phpcsFile->findNext( T_WHITESPACE, $nameStart, $opener );
+        if ( $nameEnd === false ) {
+            $name = $tokens[ $nameStart ][ 'content' ];
         } else {
-            $name = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
+            $name = trim( $phpcsFile->getTokensAsString( $nameStart, ( $nameEnd - $nameStart ) ) );
         }
 
         // Check for camel caps format.
-        $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, false);
-        if ($valid === false) {
-            $type  = ucfirst($tokens[$stackPtr]['content']);
+        $valid = PHP_CodeSniffer::isCamelCaps( $name, true, true, false );
+        if ( $valid === false ) {
+            $type  = ucfirst( $tokens[ $stackPtr ][ 'content' ] );
             $error = '%s name "%s" is not in camel caps format';
             $data  = array(
                       $type,
                       $name,
                      );
-            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'no');
+            $phpcsFile->addError( $error, $stackPtr, 'NotCamelCaps', $data );
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase class name', 'no' );
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase class name', 'yes');
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase class name', 'yes' );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Classes_ValidClassNameSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Classes_ValidClassNameSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_CLASS,
                 T_INTERFACE,
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]['scope_opener']) === false) {

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +47 added lines, -47 removed lines

@@ -36,62 +36,62 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_CLASS);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_CLASS);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $find   = PHP_CodeSniffer_Tokens::$methodPrefixes;
-        $find[] = T_WHITESPACE;
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+		  $find   = PHP_CodeSniffer_Tokens::$methodPrefixes;
+		  $find[] = T_WHITESPACE;
 
-        $commentEnd = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
-        if ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-            && $tokens[$commentEnd]['code'] !== T_COMMENT
-        ) {
-            $phpcsFile->addError('Missing class doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'no');
-            return;
-        }
+		  $commentEnd = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
+		  if ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
+				&& $tokens[$commentEnd]['code'] !== T_COMMENT
+		  ) {
+				$phpcsFile->addError('Missing class doc comment', $stackPtr, 'Missing');
+				$phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'no');
+				return;
+		  }
 
-        $phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'yes');
+		  $phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'yes');
 
-        if ($tokens[$commentEnd]['code'] === T_COMMENT) {
-            $phpcsFile->addError('You must use "/**" style comments for a class comment', $stackPtr, 'WrongStyle');
-            return;
-        }
+		  if ($tokens[$commentEnd]['code'] === T_COMMENT) {
+				$phpcsFile->addError('You must use "/**" style comments for a class comment', $stackPtr, 'WrongStyle');
+				return;
+		  }
 
-        if ($tokens[$commentEnd]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
-            $error = 'There must be no blank lines after the class comment';
-            $phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
-        }
+		  if ($tokens[$commentEnd]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
+				$error = 'There must be no blank lines after the class comment';
+				$phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
+		  }
 
-        $commentStart = $tokens[$commentEnd]['comment_opener'];
-        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
-            $error = '%s tag is not allowed in class comment';
-            $data  = array($tokens[$tag]['content']);
-            $phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data);
-        }
+		  $commentStart = $tokens[$commentEnd]['comment_opener'];
+		  foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
+				$error = '%s tag is not allowed in class comment';
+				$data  = array($tokens[$tag]['content']);
+				$phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data);
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function register()
     {
-        return array(T_CLASS);
+        return array( T_CLASS );
 
     }//end register()
 
@@ -57,38 +57,38 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
         $find   = PHP_CodeSniffer_Tokens::$methodPrefixes;
-        $find[] = T_WHITESPACE;
+        $find[ ] = T_WHITESPACE;
 
-        $commentEnd = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
-        if ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-            && $tokens[$commentEnd]['code'] !== T_COMMENT
+        $commentEnd = $phpcsFile->findPrevious( $find, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $commentEnd ][ 'code' ] !== T_DOC_COMMENT_CLOSE_TAG
+            && $tokens[ $commentEnd ][ 'code' ] !== T_COMMENT
         ) {
-            $phpcsFile->addError('Missing class doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'no');
+            $phpcsFile->addError( 'Missing class doc comment', $stackPtr, 'Missing' );
+            $phpcsFile->recordMetric( $stackPtr, 'Class has doc comment', 'no' );
             return;
         }
 
-        $phpcsFile->recordMetric($stackPtr, 'Class has doc comment', 'yes');
+        $phpcsFile->recordMetric( $stackPtr, 'Class has doc comment', 'yes' );
 
-        if ($tokens[$commentEnd]['code'] === T_COMMENT) {
-            $phpcsFile->addError('You must use "/**" style comments for a class comment', $stackPtr, 'WrongStyle');
+        if ( $tokens[ $commentEnd ][ 'code' ] === T_COMMENT ) {
+            $phpcsFile->addError( 'You must use "/**" style comments for a class comment', $stackPtr, 'WrongStyle' );
             return;
         }
 
-        if ($tokens[$commentEnd]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
+        if ( $tokens[ $commentEnd ][ 'line' ] !== ( $tokens[ $stackPtr ][ 'line' ] - 1 ) ) {
             $error = 'There must be no blank lines after the class comment';
-            $phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
+            $phpcsFile->addError( $error, $commentEnd, 'SpacingAfter' );
         }
 
-        $commentStart = $tokens[$commentEnd]['comment_opener'];
-        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
+        $commentStart = $tokens[ $commentEnd ][ 'comment_opener' ];
+        foreach ( $tokens[ $commentStart ][ 'comment_tags' ] as $tag ) {
             $error = '%s tag is not allowed in class comment';
-            $data  = array($tokens[$tag]['content']);
-            $phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data);
+            $data  = array( $tokens[ $tag ][ 'content' ] );
+            $phpcsFile->addWarning( $error, $tag, 'TagNotAllowed', $data );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -32,8 +32,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Commenting_ClassCommentSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Commenting_ClassCommentSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -41,8 +40,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_CLASS);
 
     }//end register()
@@ -57,8 +55,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
         $find   = PHP_CodeSniffer_Tokens::$methodPrefixes;
         $find[] = T_WHITESPACE;

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +113 added lines, -113 removed lines

@@ -31,119 +31,119 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_FUNCTION,
-                T_CLASS,
-                T_INTERFACE,
-               );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens..
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[$stackPtr]['code'] === T_FUNCTION) {
-            $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-
-            // Abstract methods do not require a closing comment.
-            if ($methodProps['is_abstract'] === true) {
-                return;
-            }
-
-            // Closures do not require a closing comment.
-            if ($methodProps['is_closure'] === true) {
-                return;
-            }
-
-            // If this function is in an interface then we don't require
-            // a closing comment.
-            if ($phpcsFile->hasCondition($stackPtr, T_INTERFACE) === true) {
-                return;
-            }
-
-            if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-                $error = 'Possible parse error: non-abstract method defined as abstract';
-                $phpcsFile->addWarning($error, $stackPtr, 'Abstract');
-                return;
-            }
-
-            $decName = $phpcsFile->getDeclarationName($stackPtr);
-            $comment = '//end '.$decName.'()';
-        } else if ($tokens[$stackPtr]['code'] === T_CLASS) {
-            $comment = '//end class';
-        } else {
-            $comment = '//end interface';
-        }//end if
-
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            $error = 'Possible parse error: %s missing opening or closing brace';
-            $data  = array($tokens[$stackPtr]['content']);
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
-            return;
-        }
-
-        $closingBracket = $tokens[$stackPtr]['scope_closer'];
-
-        if ($closingBracket === null) {
-            // Possible inline structure. Other tests will handle it.
-            return;
-        }
-
-        $error = 'Expected '.$comment;
-        if (isset($tokens[($closingBracket + 1)]) === false || $tokens[($closingBracket + 1)]['code'] !== T_COMMENT) {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($closingBracket + 1), null, true);
-            if (rtrim($tokens[$next]['content']) === $comment) {
-                // The comment isn't really missing; it is just in the wrong place.
-                $fix = $phpcsFile->addFixableError($error.' directly after closing brace', $closingBracket, 'Misplaced');
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($closingBracket + 1); $i < $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    // Just in case, because indentation fixes can add indents onto
-                    // these comments and cause us to be unable to fix them.
-                    $phpcsFile->fixer->replaceToken($next, $comment.$phpcsFile->eolChar);
-                    $phpcsFile->fixer->endChangeset();
-                }
-            } else {
-                $fix = $phpcsFile->addFixableError($error, $closingBracket, 'Missing');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($closingBracket, '}'.$comment.$phpcsFile->eolChar);
-                }
-            }
-
-            return;
-        }//end if
-
-        if (rtrim($tokens[($closingBracket + 1)]['content']) !== $comment) {
-            $fix = $phpcsFile->addFixableError($error, $closingBracket, 'Incorrect');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($closingBracket + 1), $comment.$phpcsFile->eolChar);
-            }
-
-            return;
-        }
-
-    }//end process()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_FUNCTION,
+					 T_CLASS,
+					 T_INTERFACE,
+					);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in the
+	  *                                        stack passed in $tokens..
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  if ($tokens[$stackPtr]['code'] === T_FUNCTION) {
+				$methodProps = $phpcsFile->getMethodProperties($stackPtr);
+
+				// Abstract methods do not require a closing comment.
+				if ($methodProps['is_abstract'] === true) {
+					 return;
+				}
+
+				// Closures do not require a closing comment.
+				if ($methodProps['is_closure'] === true) {
+					 return;
+				}
+
+				// If this function is in an interface then we don't require
+				// a closing comment.
+				if ($phpcsFile->hasCondition($stackPtr, T_INTERFACE) === true) {
+					 return;
+				}
+
+				if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+					 $error = 'Possible parse error: non-abstract method defined as abstract';
+					 $phpcsFile->addWarning($error, $stackPtr, 'Abstract');
+					 return;
+				}
+
+				$decName = $phpcsFile->getDeclarationName($stackPtr);
+				$comment = '//end '.$decName.'()';
+		  } else if ($tokens[$stackPtr]['code'] === T_CLASS) {
+				$comment = '//end class';
+		  } else {
+				$comment = '//end interface';
+		  }//end if
+
+		  if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+				$error = 'Possible parse error: %s missing opening or closing brace';
+				$data  = array($tokens[$stackPtr]['content']);
+				$phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+				return;
+		  }
+
+		  $closingBracket = $tokens[$stackPtr]['scope_closer'];
+
+		  if ($closingBracket === null) {
+				// Possible inline structure. Other tests will handle it.
+				return;
+		  }
+
+		  $error = 'Expected '.$comment;
+		  if (isset($tokens[($closingBracket + 1)]) === false || $tokens[($closingBracket + 1)]['code'] !== T_COMMENT) {
+				$next = $phpcsFile->findNext(T_WHITESPACE, ($closingBracket + 1), null, true);
+				if (rtrim($tokens[$next]['content']) === $comment) {
+					 // The comment isn't really missing; it is just in the wrong place.
+					 $fix = $phpcsFile->addFixableError($error.' directly after closing brace', $closingBracket, 'Misplaced');
+					 if ($fix === true) {
+						  $phpcsFile->fixer->beginChangeset();
+						  for ($i = ($closingBracket + 1); $i < $next; $i++) {
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  // Just in case, because indentation fixes can add indents onto
+						  // these comments and cause us to be unable to fix them.
+						  $phpcsFile->fixer->replaceToken($next, $comment.$phpcsFile->eolChar);
+						  $phpcsFile->fixer->endChangeset();
+					 }
+				} else {
+					 $fix = $phpcsFile->addFixableError($error, $closingBracket, 'Missing');
+					 if ($fix === true) {
+						  $phpcsFile->fixer->replaceToken($closingBracket, '}'.$comment.$phpcsFile->eolChar);
+					 }
+				}
+
+				return;
+		  }//end if
+
+		  if (rtrim($tokens[($closingBracket + 1)]['content']) !== $comment) {
+				$fix = $phpcsFile->addFixableError($error, $closingBracket, 'Incorrect');
+				if ($fix === true) {
+					 $phpcsFile->fixer->replaceToken(($closingBracket + 1), $comment.$phpcsFile->eolChar);
+				}
+
+				return;
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +32 added lines, -32 removed lines

@@ -56,88 +56,88 @@
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] === T_FUNCTION) {
-            $methodProps = $phpcsFile->getMethodProperties($stackPtr);
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_FUNCTION ) {
+            $methodProps = $phpcsFile->getMethodProperties( $stackPtr );
 
             // Abstract methods do not require a closing comment.
-            if ($methodProps['is_abstract'] === true) {
+            if ( $methodProps[ 'is_abstract' ] === true ) {
                 return;
             }
 
             // Closures do not require a closing comment.
-            if ($methodProps['is_closure'] === true) {
+            if ( $methodProps[ 'is_closure' ] === true ) {
                 return;
             }
 
             // If this function is in an interface then we don't require
             // a closing comment.
-            if ($phpcsFile->hasCondition($stackPtr, T_INTERFACE) === true) {
+            if ( $phpcsFile->hasCondition( $stackPtr, T_INTERFACE ) === true ) {
                 return;
             }
 
-            if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+            if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
                 $error = 'Possible parse error: non-abstract method defined as abstract';
-                $phpcsFile->addWarning($error, $stackPtr, 'Abstract');
+                $phpcsFile->addWarning( $error, $stackPtr, 'Abstract' );
                 return;
             }
 
-            $decName = $phpcsFile->getDeclarationName($stackPtr);
-            $comment = '//end '.$decName.'()';
-        } else if ($tokens[$stackPtr]['code'] === T_CLASS) {
+            $decName = $phpcsFile->getDeclarationName( $stackPtr );
+            $comment = '//end ' . $decName . '()';
+        } else if ( $tokens[ $stackPtr ][ 'code' ] === T_CLASS ) {
             $comment = '//end class';
         } else {
             $comment = '//end interface';
         }//end if
 
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             $error = 'Possible parse error: %s missing opening or closing brace';
-            $data  = array($tokens[$stackPtr]['content']);
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $data);
+            $data  = array( $tokens[ $stackPtr ][ 'content' ] );
+            $phpcsFile->addWarning( $error, $stackPtr, 'MissingBrace', $data );
             return;
         }
 
-        $closingBracket = $tokens[$stackPtr]['scope_closer'];
+        $closingBracket = $tokens[ $stackPtr ][ 'scope_closer' ];
 
-        if ($closingBracket === null) {
+        if ( $closingBracket === null ) {
             // Possible inline structure. Other tests will handle it.
             return;
         }
 
-        $error = 'Expected '.$comment;
-        if (isset($tokens[($closingBracket + 1)]) === false || $tokens[($closingBracket + 1)]['code'] !== T_COMMENT) {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($closingBracket + 1), null, true);
-            if (rtrim($tokens[$next]['content']) === $comment) {
+        $error = 'Expected ' . $comment;
+        if ( isset( $tokens[ ( $closingBracket + 1 ) ] ) === false || $tokens[ ( $closingBracket + 1 ) ][ 'code' ] !== T_COMMENT ) {
+            $next = $phpcsFile->findNext( T_WHITESPACE, ( $closingBracket + 1 ), null, true );
+            if ( rtrim( $tokens[ $next ][ 'content' ] ) === $comment ) {
                 // The comment isn't really missing; it is just in the wrong place.
-                $fix = $phpcsFile->addFixableError($error.' directly after closing brace', $closingBracket, 'Misplaced');
-                if ($fix === true) {
+                $fix = $phpcsFile->addFixableError( $error . ' directly after closing brace', $closingBracket, 'Misplaced' );
+                if ( $fix === true ) {
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($closingBracket + 1); $i < $next; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    for ( $i = ( $closingBracket + 1 ); $i < $next; $i++ ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
                     // Just in case, because indentation fixes can add indents onto
                     // these comments and cause us to be unable to fix them.
-                    $phpcsFile->fixer->replaceToken($next, $comment.$phpcsFile->eolChar);
+                    $phpcsFile->fixer->replaceToken( $next, $comment . $phpcsFile->eolChar );
                     $phpcsFile->fixer->endChangeset();
                 }
             } else {
-                $fix = $phpcsFile->addFixableError($error, $closingBracket, 'Missing');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($closingBracket, '}'.$comment.$phpcsFile->eolChar);
+                $fix = $phpcsFile->addFixableError( $error, $closingBracket, 'Missing' );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->replaceToken( $closingBracket, '}' . $comment . $phpcsFile->eolChar );
                 }
             }
 
             return;
         }//end if
 
-        if (rtrim($tokens[($closingBracket + 1)]['content']) !== $comment) {
-            $fix = $phpcsFile->addFixableError($error, $closingBracket, 'Incorrect');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($closingBracket + 1), $comment.$phpcsFile->eolChar);
+        if ( rtrim( $tokens[ ( $closingBracket + 1 ) ][ 'content' ] ) !== $comment ) {
+            $fix = $phpcsFile->addFixableError( $error, $closingBracket, 'Incorrect' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( ( $closingBracket + 1 ), $comment . $phpcsFile->eolChar );
             }
 
             return;

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Commenting_ClosingDeclarationCommentSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Commenting_ClosingDeclarationCommentSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_FUNCTION,
                 T_CLASS,
@@ -56,8 +54,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if ($tokens[$stackPtr]['code'] === T_FUNCTION) {

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

Indentation +188 added lines, -188 removed lines

@@ -29,194 +29,194 @@
 class Squiz_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_OPEN_TAG);
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return int
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $this->currentFile = $phpcsFile;
-
-        $tokens       = $phpcsFile->getTokens();
-        $commentStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-
-        if ($tokens[$commentStart]['code'] === T_COMMENT) {
-            $phpcsFile->addError('You must use "/**" style comments for a file comment', $commentStart, 'WrongStyle');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
-            return ($phpcsFile->numTokens + 1);
-        } else if ($commentStart === false || $tokens[$commentStart]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
-            $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
-        }
-
-        $commentEnd = $tokens[$commentStart]['comment_closer'];
-
-        $nextToken = $phpcsFile->findNext(
-            T_WHITESPACE,
-            ($commentEnd + 1),
-            null,
-            true
-        );
-
-        $ignore = array(
-                   T_CLASS,
-                   T_INTERFACE,
-                   T_TRAIT,
-                   T_FUNCTION,
-                   T_CLOSURE,
-                   T_PUBLIC,
-                   T_PRIVATE,
-                   T_PROTECTED,
-                   T_FINAL,
-                   T_STATIC,
-                   T_ABSTRACT,
-                   T_CONST,
-                   T_PROPERTY,
-                   T_INCLUDE,
-                   T_INCLUDE_ONCE,
-                   T_REQUIRE,
-                   T_REQUIRE_ONCE,
-                  );
-
-        if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
-            $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
-        }
-
-        $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
-
-        // No blank line between the open tag and the file comment.
-        if ($tokens[$commentStart]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
-            $error = 'There must be no blank lines before the file comment';
-            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterOpen');
-        }
-
-        // Exactly one blank line after the file comment.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($commentEnd + 1), null, true);
-        if ($tokens[$next]['line'] !== ($tokens[$commentEnd]['line'] + 2)) {
-            $error = 'There must be exactly one blank line after the file comment';
-            $phpcsFile->addError($error, $commentEnd, 'SpacingAfterComment');
-        }
-
-        // Required tags in correct order.
-        $required = array(
-                     '@package'    => true,
-                     '@subpackage' => true,
-                     '@author'     => true,
-                     '@copyright'  => true,
-                    );
-
-        $foundTags = array();
-        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
-            $name       = $tokens[$tag]['content'];
-            $isRequired = isset($required[$name]);
-
-            if ($isRequired === true && in_array($name, $foundTags) === true) {
-                $error = 'Only one %s tag is allowed in a file comment';
-                $data  = array($name);
-                $phpcsFile->addError($error, $tag, 'Duplicate'.ucfirst(substr($name, 1)).'Tag', $data);
-            }
-
-            $foundTags[] = $name;
-
-            if ($isRequired === false) {
-                continue;
-            }
-
-            $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $tag, $commentEnd);
-            if ($string === false || $tokens[$string]['line'] !== $tokens[$tag]['line']) {
-                $error = 'Content missing for %s tag in file comment';
-                $data  = array($name);
-                $phpcsFile->addError($error, $tag, 'Empty'.ucfirst(substr($name, 1)).'Tag', $data);
-                continue;
-            }
-
-            if ($name === '@author') {
-                if ($tokens[$string]['content'] !== 'Squiz Pty Ltd <products@squiz.net>') {
-                    $error = 'Expected "Squiz Pty Ltd <products@squiz.net>" for author tag';
-                    $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectAuthor');
-                    if ($fix === true) {
-                        $expected = 'Squiz Pty Ltd <products@squiz.net>';
-                        $phpcsFile->fixer->replaceToken($string, $expected);
-                    }
-                }
-            } else if ($name === '@copyright') {
-                if (preg_match('/^([0-9]{4})(-[0-9]{4})? (Squiz Pty Ltd \(ABN 77 084 670 600\))$/', $tokens[$string]['content']) === 0) {
-                    $error = 'Expected "xxxx-xxxx Squiz Pty Ltd (ABN 77 084 670 600)" for copyright declaration';
-                    $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectCopyright');
-                    if ($fix === true) {
-                        $matches = array();
-                        preg_match('/^(([0-9]{4})(-[0-9]{4})?)?.*$/', $tokens[$string]['content'], $matches);
-                        if (isset($matches[1]) === false) {
-                            $matches[1] = date('Y');
-                        }
-
-                        $expected = $matches[1].' Squiz Pty Ltd (ABN 77 084 670 600)';
-                        $phpcsFile->fixer->replaceToken($string, $expected);
-                    }
-                }
-            }//end if
-        }//end foreach
-
-        // Check if the tags are in the correct position.
-        $pos = 0;
-        foreach ($required as $tag => $true) {
-            if (in_array($tag, $foundTags) === false) {
-                $error = 'Missing %s tag in file comment';
-                $data  = array($tag);
-                $phpcsFile->addError($error, $commentEnd, 'Missing'.ucfirst(substr($tag, 1)).'Tag', $data);
-            }
-
-            if (isset($foundTags[$pos]) === false) {
-                break;
-            }
-
-            if ($foundTags[$pos] !== $tag) {
-                $error = 'The tag in position %s should be the %s tag';
-                $data  = array(
-                          ($pos + 1),
-                          $tag,
-                         );
-                $phpcsFile->addError($error, $tokens[$commentStart]['comment_tags'][$pos], ucfirst(substr($tag, 1)).'TagOrder', $data);
-            }
-
-            $pos++;
-        }//end foreach
-
-        // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
-
-    }//end process()
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array(
+											  'PHP',
+											  'JS',
+											 );
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_OPEN_TAG);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return int
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $this->currentFile = $phpcsFile;
+
+		  $tokens       = $phpcsFile->getTokens();
+		  $commentStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+
+		  if ($tokens[$commentStart]['code'] === T_COMMENT) {
+				$phpcsFile->addError('You must use "/**" style comments for a file comment', $commentStart, 'WrongStyle');
+				$phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
+				return ($phpcsFile->numTokens + 1);
+		  } else if ($commentStart === false || $tokens[$commentStart]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
+				$phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
+				$phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
+				return ($phpcsFile->numTokens + 1);
+		  }
+
+		  $commentEnd = $tokens[$commentStart]['comment_closer'];
+
+		  $nextToken = $phpcsFile->findNext(
+				T_WHITESPACE,
+				($commentEnd + 1),
+				null,
+				true
+		  );
+
+		  $ignore = array(
+						 T_CLASS,
+						 T_INTERFACE,
+						 T_TRAIT,
+						 T_FUNCTION,
+						 T_CLOSURE,
+						 T_PUBLIC,
+						 T_PRIVATE,
+						 T_PROTECTED,
+						 T_FINAL,
+						 T_STATIC,
+						 T_ABSTRACT,
+						 T_CONST,
+						 T_PROPERTY,
+						 T_INCLUDE,
+						 T_INCLUDE_ONCE,
+						 T_REQUIRE,
+						 T_REQUIRE_ONCE,
+						);
+
+		  if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
+				$phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
+				$phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
+				return ($phpcsFile->numTokens + 1);
+		  }
+
+		  $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
+
+		  // No blank line between the open tag and the file comment.
+		  if ($tokens[$commentStart]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
+				$error = 'There must be no blank lines before the file comment';
+				$phpcsFile->addError($error, $stackPtr, 'SpacingAfterOpen');
+		  }
+
+		  // Exactly one blank line after the file comment.
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($commentEnd + 1), null, true);
+		  if ($tokens[$next]['line'] !== ($tokens[$commentEnd]['line'] + 2)) {
+				$error = 'There must be exactly one blank line after the file comment';
+				$phpcsFile->addError($error, $commentEnd, 'SpacingAfterComment');
+		  }
+
+		  // Required tags in correct order.
+		  $required = array(
+							'@package'    => true,
+							'@subpackage' => true,
+							'@author'     => true,
+							'@copyright'  => true,
+						  );
+
+		  $foundTags = array();
+		  foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
+				$name       = $tokens[$tag]['content'];
+				$isRequired = isset($required[$name]);
+
+				if ($isRequired === true && in_array($name, $foundTags) === true) {
+					 $error = 'Only one %s tag is allowed in a file comment';
+					 $data  = array($name);
+					 $phpcsFile->addError($error, $tag, 'Duplicate'.ucfirst(substr($name, 1)).'Tag', $data);
+				}
+
+				$foundTags[] = $name;
+
+				if ($isRequired === false) {
+					 continue;
+				}
+
+				$string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $tag, $commentEnd);
+				if ($string === false || $tokens[$string]['line'] !== $tokens[$tag]['line']) {
+					 $error = 'Content missing for %s tag in file comment';
+					 $data  = array($name);
+					 $phpcsFile->addError($error, $tag, 'Empty'.ucfirst(substr($name, 1)).'Tag', $data);
+					 continue;
+				}
+
+				if ($name === '@author') {
+					 if ($tokens[$string]['content'] !== 'Squiz Pty Ltd <products@squiz.net>') {
+						  $error = 'Expected "Squiz Pty Ltd <products@squiz.net>" for author tag';
+						  $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectAuthor');
+						  if ($fix === true) {
+								$expected = 'Squiz Pty Ltd <products@squiz.net>';
+								$phpcsFile->fixer->replaceToken($string, $expected);
+						  }
+					 }
+				} else if ($name === '@copyright') {
+					 if (preg_match('/^([0-9]{4})(-[0-9]{4})? (Squiz Pty Ltd \(ABN 77 084 670 600\))$/', $tokens[$string]['content']) === 0) {
+						  $error = 'Expected "xxxx-xxxx Squiz Pty Ltd (ABN 77 084 670 600)" for copyright declaration';
+						  $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectCopyright');
+						  if ($fix === true) {
+								$matches = array();
+								preg_match('/^(([0-9]{4})(-[0-9]{4})?)?.*$/', $tokens[$string]['content'], $matches);
+								if (isset($matches[1]) === false) {
+									 $matches[1] = date('Y');
+								}
+
+								$expected = $matches[1].' Squiz Pty Ltd (ABN 77 084 670 600)';
+								$phpcsFile->fixer->replaceToken($string, $expected);
+						  }
+					 }
+				}//end if
+		  }//end foreach
+
+		  // Check if the tags are in the correct position.
+		  $pos = 0;
+		  foreach ($required as $tag => $true) {
+				if (in_array($tag, $foundTags) === false) {
+					 $error = 'Missing %s tag in file comment';
+					 $data  = array($tag);
+					 $phpcsFile->addError($error, $commentEnd, 'Missing'.ucfirst(substr($tag, 1)).'Tag', $data);
+				}
+
+				if (isset($foundTags[$pos]) === false) {
+					 break;
+				}
+
+				if ($foundTags[$pos] !== $tag) {
+					 $error = 'The tag in position %s should be the %s tag';
+					 $data  = array(
+								  ($pos + 1),
+								  $tag,
+								 );
+					 $phpcsFile->addError($error, $tokens[$commentStart]['comment_tags'][$pos], ucfirst(substr($tag, 1)).'TagOrder', $data);
+				}
+
+				$pos++;
+		  }//end foreach
+
+		  // Ignore the rest of the file.
+		  return ($phpcsFile->numTokens + 1);
+
+	 }//end process()
 
 
 }//end class

Spacing +59 added lines, -59 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -61,28 +61,28 @@ 
      *
      * @return int
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $this->currentFile = $phpcsFile;
 
         $tokens       = $phpcsFile->getTokens();
-        $commentStart = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-
-        if ($tokens[$commentStart]['code'] === T_COMMENT) {
-            $phpcsFile->addError('You must use "/**" style comments for a file comment', $commentStart, 'WrongStyle');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
-            return ($phpcsFile->numTokens + 1);
-        } else if ($commentStart === false || $tokens[$commentStart]['code'] !== T_DOC_COMMENT_OPEN_TAG) {
-            $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+        $commentStart = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+
+        if ( $tokens[ $commentStart ][ 'code' ] === T_COMMENT ) {
+            $phpcsFile->addError( 'You must use "/**" style comments for a file comment', $commentStart, 'WrongStyle' );
+            $phpcsFile->recordMetric( $stackPtr, 'File has doc comment', 'yes' );
+            return ( $phpcsFile->numTokens + 1 );
+        } else if ( $commentStart === false || $tokens[ $commentStart ][ 'code' ] !== T_DOC_COMMENT_OPEN_TAG ) {
+            $phpcsFile->addError( 'Missing file doc comment', $stackPtr, 'Missing' );
+            $phpcsFile->recordMetric( $stackPtr, 'File has doc comment', 'no' );
+            return ( $phpcsFile->numTokens + 1 );
         }
 
-        $commentEnd = $tokens[$commentStart]['comment_closer'];
+        $commentEnd = $tokens[ $commentStart ][ 'comment_closer' ];
 
         $nextToken = $phpcsFile->findNext(
             T_WHITESPACE,
-            ($commentEnd + 1),
+            ( $commentEnd + 1 ),
             null,
             true
         );
@@ -107,25 +107,25 @@ 
                    T_REQUIRE_ONCE,
                   );
 
-        if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
-            $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
-            $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+        if ( in_array( $tokens[ $nextToken ][ 'code' ], $ignore ) === true ) {
+            $phpcsFile->addError( 'Missing file doc comment', $stackPtr, 'Missing' );
+            $phpcsFile->recordMetric( $stackPtr, 'File has doc comment', 'no' );
+            return ( $phpcsFile->numTokens + 1 );
         }
 
-        $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
+        $phpcsFile->recordMetric( $stackPtr, 'File has doc comment', 'yes' );
 
         // No blank line between the open tag and the file comment.
-        if ($tokens[$commentStart]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
+        if ( $tokens[ $commentStart ][ 'line' ] > ( $tokens[ $stackPtr ][ 'line' ] + 1 ) ) {
             $error = 'There must be no blank lines before the file comment';
-            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterOpen');
+            $phpcsFile->addError( $error, $stackPtr, 'SpacingAfterOpen' );
         }
 
         // Exactly one blank line after the file comment.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($commentEnd + 1), null, true);
-        if ($tokens[$next]['line'] !== ($tokens[$commentEnd]['line'] + 2)) {
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $commentEnd + 1 ), null, true );
+        if ( $tokens[ $next ][ 'line' ] !== ( $tokens[ $commentEnd ][ 'line' ] + 2 ) ) {
             $error = 'There must be exactly one blank line after the file comment';
-            $phpcsFile->addError($error, $commentEnd, 'SpacingAfterComment');
+            $phpcsFile->addError( $error, $commentEnd, 'SpacingAfterComment' );
         }
 
         // Required tags in correct order.
@@ -137,52 +137,52 @@ 
                     );
 
         $foundTags = array();
-        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
-            $name       = $tokens[$tag]['content'];
-            $isRequired = isset($required[$name]);
+        foreach ( $tokens[ $commentStart ][ 'comment_tags' ] as $tag ) {
+            $name       = $tokens[ $tag ][ 'content' ];
+            $isRequired = isset( $required[ $name ] );
 
-            if ($isRequired === true && in_array($name, $foundTags) === true) {
+            if ( $isRequired === true && in_array( $name, $foundTags ) === true ) {
                 $error = 'Only one %s tag is allowed in a file comment';
-                $data  = array($name);
-                $phpcsFile->addError($error, $tag, 'Duplicate'.ucfirst(substr($name, 1)).'Tag', $data);
+                $data  = array( $name );
+                $phpcsFile->addError( $error, $tag, 'Duplicate' . ucfirst( substr( $name, 1 ) ) . 'Tag', $data );
             }
 
-            $foundTags[] = $name;
+            $foundTags[ ] = $name;
 
-            if ($isRequired === false) {
+            if ( $isRequired === false ) {
                 continue;
             }
 
-            $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $tag, $commentEnd);
-            if ($string === false || $tokens[$string]['line'] !== $tokens[$tag]['line']) {
+            $string = $phpcsFile->findNext( T_DOC_COMMENT_STRING, $tag, $commentEnd );
+            if ( $string === false || $tokens[ $string ][ 'line' ] !== $tokens[ $tag ][ 'line' ] ) {
                 $error = 'Content missing for %s tag in file comment';
-                $data  = array($name);
-                $phpcsFile->addError($error, $tag, 'Empty'.ucfirst(substr($name, 1)).'Tag', $data);
+                $data  = array( $name );
+                $phpcsFile->addError( $error, $tag, 'Empty' . ucfirst( substr( $name, 1 ) ) . 'Tag', $data );
                 continue;
             }
 
-            if ($name === '@author') {
-                if ($tokens[$string]['content'] !== 'Squiz Pty Ltd <products@squiz.net>') {
+            if ( $name === '@author' ) {
+                if ( $tokens[ $string ][ 'content' ] !== 'Squiz Pty Ltd <products@squiz.net>' ) {
                     $error = 'Expected "Squiz Pty Ltd <products@squiz.net>" for author tag';
-                    $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectAuthor');
-                    if ($fix === true) {
+                    $fix   = $phpcsFile->addFixableError( $error, $tag, 'IncorrectAuthor' );
+                    if ( $fix === true ) {
                         $expected = 'Squiz Pty Ltd <products@squiz.net>';
-                        $phpcsFile->fixer->replaceToken($string, $expected);
+                        $phpcsFile->fixer->replaceToken( $string, $expected );
                     }
                 }
-            } else if ($name === '@copyright') {
-                if (preg_match('/^([0-9]{4})(-[0-9]{4})? (Squiz Pty Ltd \(ABN 77 084 670 600\))$/', $tokens[$string]['content']) === 0) {
+            } else if ( $name === '@copyright' ) {
+                if ( preg_match( '/^([0-9]{4})(-[0-9]{4})? (Squiz Pty Ltd \(ABN 77 084 670 600\))$/', $tokens[ $string ][ 'content' ] ) === 0 ) {
                     $error = 'Expected "xxxx-xxxx Squiz Pty Ltd (ABN 77 084 670 600)" for copyright declaration';
-                    $fix   = $phpcsFile->addFixableError($error, $tag, 'IncorrectCopyright');
-                    if ($fix === true) {
+                    $fix   = $phpcsFile->addFixableError( $error, $tag, 'IncorrectCopyright' );
+                    if ( $fix === true ) {
                         $matches = array();
-                        preg_match('/^(([0-9]{4})(-[0-9]{4})?)?.*$/', $tokens[$string]['content'], $matches);
-                        if (isset($matches[1]) === false) {
-                            $matches[1] = date('Y');
+                        preg_match( '/^(([0-9]{4})(-[0-9]{4})?)?.*$/', $tokens[ $string ][ 'content' ], $matches );
+                        if ( isset( $matches[ 1 ] ) === false ) {
+                            $matches[ 1 ] = date( 'Y' );
                         }
 
-                        $expected = $matches[1].' Squiz Pty Ltd (ABN 77 084 670 600)';
-                        $phpcsFile->fixer->replaceToken($string, $expected);
+                        $expected = $matches[ 1 ] . ' Squiz Pty Ltd (ABN 77 084 670 600)';
+                        $phpcsFile->fixer->replaceToken( $string, $expected );
                     }
                 }
             }//end if
@@ -190,31 +190,31 @@ 
 
         // Check if the tags are in the correct position.
         $pos = 0;
-        foreach ($required as $tag => $true) {
-            if (in_array($tag, $foundTags) === false) {
+        foreach ( $required as $tag => $true ) {
+            if ( in_array( $tag, $foundTags ) === false ) {
                 $error = 'Missing %s tag in file comment';
-                $data  = array($tag);
-                $phpcsFile->addError($error, $commentEnd, 'Missing'.ucfirst(substr($tag, 1)).'Tag', $data);
+                $data  = array( $tag );
+                $phpcsFile->addError( $error, $commentEnd, 'Missing' . ucfirst( substr( $tag, 1 ) ) . 'Tag', $data );
             }
 
-            if (isset($foundTags[$pos]) === false) {
+            if ( isset( $foundTags[ $pos ] ) === false ) {
                 break;
             }
 
-            if ($foundTags[$pos] !== $tag) {
+            if ( $foundTags[ $pos ] !== $tag ) {
                 $error = 'The tag in position %s should be the %s tag';
                 $data  = array(
-                          ($pos + 1),
+                          ( $pos + 1 ),
                           $tag,
                          );
-                $phpcsFile->addError($error, $tokens[$commentStart]['comment_tags'][$pos], ucfirst(substr($tag, 1)).'TagOrder', $data);
+                $phpcsFile->addError( $error, $tokens[ $commentStart ][ 'comment_tags' ][ $pos ], ucfirst( substr( $tag, 1 ) ) . 'TagOrder', $data );
             }
 
             $pos++;
         }//end foreach
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return ( $phpcsFile->numTokens + 1 );
 
     }//end process()
 

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-class Squiz_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -45,8 +44,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_TAG);
 
     }//end register()
@@ -61,8 +59,7 @@ 
      *
      * @return int
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $this->currentFile = $phpcsFile;
 
         $tokens       = $phpcsFile->getTokens();

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +92 added lines, -92 removed lines

@@ -31,98 +31,98 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_INLINE_THEN);
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $openBracket  = null;
-        $closeBracket = null;
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $parens       = $tokens[$stackPtr]['nested_parenthesis'];
-            $openBracket  = array_pop($parens);
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-        }
-
-        // Find the beginning of the statement. If we don't find a
-        // semicolon (end of statement) or comma (end of array value)
-        // then assume the content before the closing parenthesis is the end.
-        $else         = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1));
-        $statementEnd = $phpcsFile->findNext(array(T_SEMICOLON, T_COMMA), ($else + 1), $closeBracket);
-        if ($statementEnd === false) {
-            $statementEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
-        }
-
-        // Make sure it's all on the same line.
-        if ($tokens[$statementEnd]['line'] !== $tokens[$stackPtr]['line']) {
-            $error = 'Inline shorthand IF statement must be declared on a single line';
-            $phpcsFile->addError($error, $stackPtr, 'NotSingleLine');
-            return;
-        }
-
-        // Make sure there are spaces around the question mark.
-        $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$contentBefore]['code'] !== T_CLOSE_PARENTHESIS) {
-            $error = 'Inline shorthand IF statement requires brackets around comparison';
-            $phpcsFile->addError($error, $stackPtr, 'NoBrackets');
-            return;
-        }
-
-        $spaceBefore = ($tokens[$stackPtr]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-        if ($spaceBefore !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space before THEN; %s found';
-            $data  = array($spaceBefore);
-            $phpcsFile->addError($error, $stackPtr, 'SpacingBeforeThen', $data);
-        }
-
-        $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$stackPtr]['column'] + 1));
-        if ($spaceAfter !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space after THEN; %s found';
-            $data  = array($spaceAfter);
-            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterThen', $data);
-        }
-
-        // Make sure the ELSE has the correct spacing.
-        $inlineElse    = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1), $statementEnd, false);
-        $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($inlineElse - 1), null, true);
-        $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($inlineElse + 1), null, true);
-
-        $spaceBefore = ($tokens[$inlineElse]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-        if ($spaceBefore !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space before ELSE; %s found';
-            $data  = array($spaceBefore);
-            $phpcsFile->addError($error, $inlineElse, 'SpacingBeforeElse', $data);
-        }
-
-        $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$inlineElse]['column'] + 1));
-        if ($spaceAfter !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space after ELSE; %s found';
-            $data  = array($spaceAfter);
-            $phpcsFile->addError($error, $inlineElse, 'SpacingAfterElse', $data);
-        }
-
-    }//end process()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_INLINE_THEN);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this sniff, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in the
+	  *                                        stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  $openBracket  = null;
+		  $closeBracket = null;
+		  if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
+				$parens       = $tokens[$stackPtr]['nested_parenthesis'];
+				$openBracket  = array_pop($parens);
+				$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+		  }
+
+		  // Find the beginning of the statement. If we don't find a
+		  // semicolon (end of statement) or comma (end of array value)
+		  // then assume the content before the closing parenthesis is the end.
+		  $else         = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1));
+		  $statementEnd = $phpcsFile->findNext(array(T_SEMICOLON, T_COMMA), ($else + 1), $closeBracket);
+		  if ($statementEnd === false) {
+				$statementEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
+		  }
+
+		  // Make sure it's all on the same line.
+		  if ($tokens[$statementEnd]['line'] !== $tokens[$stackPtr]['line']) {
+				$error = 'Inline shorthand IF statement must be declared on a single line';
+				$phpcsFile->addError($error, $stackPtr, 'NotSingleLine');
+				return;
+		  }
+
+		  // Make sure there are spaces around the question mark.
+		  $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  if ($tokens[$contentBefore]['code'] !== T_CLOSE_PARENTHESIS) {
+				$error = 'Inline shorthand IF statement requires brackets around comparison';
+				$phpcsFile->addError($error, $stackPtr, 'NoBrackets');
+				return;
+		  }
+
+		  $spaceBefore = ($tokens[$stackPtr]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
+		  if ($spaceBefore !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space before THEN; %s found';
+				$data  = array($spaceBefore);
+				$phpcsFile->addError($error, $stackPtr, 'SpacingBeforeThen', $data);
+		  }
+
+		  $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$stackPtr]['column'] + 1));
+		  if ($spaceAfter !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space after THEN; %s found';
+				$data  = array($spaceAfter);
+				$phpcsFile->addError($error, $stackPtr, 'SpacingAfterThen', $data);
+		  }
+
+		  // Make sure the ELSE has the correct spacing.
+		  $inlineElse    = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1), $statementEnd, false);
+		  $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($inlineElse - 1), null, true);
+		  $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($inlineElse + 1), null, true);
+
+		  $spaceBefore = ($tokens[$inlineElse]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
+		  if ($spaceBefore !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space before ELSE; %s found';
+				$data  = array($spaceBefore);
+				$phpcsFile->addError($error, $inlineElse, 'SpacingBeforeElse', $data);
+		  }
+
+		  $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$inlineElse]['column'] + 1));
+		  if ($spaceAfter !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space after ELSE; %s found';
+				$data  = array($spaceAfter);
+				$phpcsFile->addError($error, $inlineElse, 'SpacingAfterElse', $data);
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +35 added lines, -35 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(T_INLINE_THEN);
+        return array( T_INLINE_THEN );
 
     }//end register()
 
@@ -52,74 +52,74 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         $openBracket  = null;
         $closeBracket = null;
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $parens       = $tokens[$stackPtr]['nested_parenthesis'];
-            $openBracket  = array_pop($parens);
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+        if ( isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true ) {
+            $parens       = $tokens[ $stackPtr ][ 'nested_parenthesis' ];
+            $openBracket  = array_pop( $parens );
+            $closeBracket = $tokens[ $openBracket ][ 'parenthesis_closer' ];
         }
 
         // Find the beginning of the statement. If we don't find a
         // semicolon (end of statement) or comma (end of array value)
         // then assume the content before the closing parenthesis is the end.
-        $else         = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1));
-        $statementEnd = $phpcsFile->findNext(array(T_SEMICOLON, T_COMMA), ($else + 1), $closeBracket);
-        if ($statementEnd === false) {
-            $statementEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
+        $else         = $phpcsFile->findNext( T_INLINE_ELSE, ( $stackPtr + 1 ) );
+        $statementEnd = $phpcsFile->findNext( array( T_SEMICOLON, T_COMMA ), ( $else + 1 ), $closeBracket );
+        if ( $statementEnd === false ) {
+            $statementEnd = $phpcsFile->findPrevious( T_WHITESPACE, ( $closeBracket - 1 ), null, true );
         }
 
         // Make sure it's all on the same line.
-        if ($tokens[$statementEnd]['line'] !== $tokens[$stackPtr]['line']) {
+        if ( $tokens[ $statementEnd ][ 'line' ] !== $tokens[ $stackPtr ][ 'line' ] ) {
             $error = 'Inline shorthand IF statement must be declared on a single line';
-            $phpcsFile->addError($error, $stackPtr, 'NotSingleLine');
+            $phpcsFile->addError( $error, $stackPtr, 'NotSingleLine' );
             return;
         }
 
         // Make sure there are spaces around the question mark.
-        $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$contentBefore]['code'] !== T_CLOSE_PARENTHESIS) {
+        $contentBefore = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        $contentAfter  = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        if ( $tokens[ $contentBefore ][ 'code' ] !== T_CLOSE_PARENTHESIS ) {
             $error = 'Inline shorthand IF statement requires brackets around comparison';
-            $phpcsFile->addError($error, $stackPtr, 'NoBrackets');
+            $phpcsFile->addError( $error, $stackPtr, 'NoBrackets' );
             return;
         }
 
-        $spaceBefore = ($tokens[$stackPtr]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-        if ($spaceBefore !== 1) {
+        $spaceBefore = ( $tokens[ $stackPtr ][ 'column' ] - ( $tokens[ $contentBefore ][ 'column' ] + $tokens[ $contentBefore ][ 'length' ] ) );
+        if ( $spaceBefore !== 1 ) {
             $error = 'Inline shorthand IF statement requires 1 space before THEN; %s found';
-            $data  = array($spaceBefore);
-            $phpcsFile->addError($error, $stackPtr, 'SpacingBeforeThen', $data);
+            $data  = array( $spaceBefore );
+            $phpcsFile->addError( $error, $stackPtr, 'SpacingBeforeThen', $data );
         }
 
-        $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$stackPtr]['column'] + 1));
-        if ($spaceAfter !== 1) {
+        $spaceAfter = ( ( $tokens[ $contentAfter ][ 'column' ] ) - ( $tokens[ $stackPtr ][ 'column' ] + 1 ) );
+        if ( $spaceAfter !== 1 ) {
             $error = 'Inline shorthand IF statement requires 1 space after THEN; %s found';
-            $data  = array($spaceAfter);
-            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterThen', $data);
+            $data  = array( $spaceAfter );
+            $phpcsFile->addError( $error, $stackPtr, 'SpacingAfterThen', $data );
         }
 
         // Make sure the ELSE has the correct spacing.
-        $inlineElse    = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1), $statementEnd, false);
-        $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($inlineElse - 1), null, true);
-        $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($inlineElse + 1), null, true);
+        $inlineElse    = $phpcsFile->findNext( T_INLINE_ELSE, ( $stackPtr + 1 ), $statementEnd, false );
+        $contentBefore = $phpcsFile->findPrevious( T_WHITESPACE, ( $inlineElse - 1 ), null, true );
+        $contentAfter  = $phpcsFile->findNext( T_WHITESPACE, ( $inlineElse + 1 ), null, true );
 
-        $spaceBefore = ($tokens[$inlineElse]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-        if ($spaceBefore !== 1) {
+        $spaceBefore = ( $tokens[ $inlineElse ][ 'column' ] - ( $tokens[ $contentBefore ][ 'column' ] + $tokens[ $contentBefore ][ 'length' ] ) );
+        if ( $spaceBefore !== 1 ) {
             $error = 'Inline shorthand IF statement requires 1 space before ELSE; %s found';
-            $data  = array($spaceBefore);
-            $phpcsFile->addError($error, $inlineElse, 'SpacingBeforeElse', $data);
+            $data  = array( $spaceBefore );
+            $phpcsFile->addError( $error, $inlineElse, 'SpacingBeforeElse', $data );
         }
 
-        $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$inlineElse]['column'] + 1));
-        if ($spaceAfter !== 1) {
+        $spaceAfter = ( ( $tokens[ $contentAfter ][ 'column' ] ) - ( $tokens[ $inlineElse ][ 'column' ] + 1 ) );
+        if ( $spaceAfter !== 1 ) {
             $error = 'Inline shorthand IF statement requires 1 space after ELSE; %s found';
-            $data  = array($spaceAfter);
-            $phpcsFile->addError($error, $inlineElse, 'SpacingAfterElse', $data);
+            $data  = array( $spaceAfter );
+            $phpcsFile->addError( $error, $inlineElse, 'SpacingAfterElse', $data );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_ControlStructures_InlineIfDeclarationSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_ControlStructures_InlineIfDeclarationSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_INLINE_THEN);
 
     }//end register()
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $openBracket  = null;

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int[]
+     * @return string[]
      */
     public function register()
     {

Indentation +56 added lines, -56 removed lines

@@ -28,72 +28,72 @@
 class Squiz_Sniffs_CSS_MissingColonSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array('CSS');
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array('CSS');
 
 
-    /**
-     * Returns the token types that this sniff is interested in.
-     *
-     * @return int[]
-     */
-    public function register()
-    {
-        return array(T_OPEN_CURLY_BRACKET);
+	 /**
+	  * Returns the token types that this sniff is interested in.
+	  *
+	  * @return int[]
+	  */
+	 public function register()
+	 {
+		  return array(T_OPEN_CURLY_BRACKET);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes the tokens that this sniff is interested in.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
-     * @param int                  $stackPtr  The position in the stack where
-     *                                        the token was found.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens   = $phpcsFile->getTokens();
-        $lastLine = $tokens[$stackPtr]['line'];
-        $end      = $tokens[$stackPtr]['bracket_closer'];
-        $endLine  = $tokens[$end]['line'];
+	 /**
+	  * Processes the tokens that this sniff is interested in.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
+	  * @param int                  $stackPtr  The position in the stack where
+	  *                                        the token was found.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens   = $phpcsFile->getTokens();
+		  $lastLine = $tokens[$stackPtr]['line'];
+		  $end      = $tokens[$stackPtr]['bracket_closer'];
+		  $endLine  = $tokens[$end]['line'];
 
-        // Do not check nested style definitions as, for example, in @media style rules.
-        $nested = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, ($stackPtr + 1), $end);
-        if ($nested !== false) {
-            return;
-        }
+		  // Do not check nested style definitions as, for example, in @media style rules.
+		  $nested = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, ($stackPtr + 1), $end);
+		  if ($nested !== false) {
+				return;
+		  }
 
-        $foundColon  = false;
-        $foundString = false;
-        for ($i = ($stackPtr + 1); $i <= $end; $i++) {
-            if ($tokens[$i]['line'] !== $lastLine) {
-                // We changed lines.
-                if ($foundColon === false && $foundString !== false) {
-                    // We didn't find a colon on the previous line.
-                    $error = 'No style definition found on line; check for missing colon';
-                    $phpcsFile->addError($error, $foundString, 'Found');
-                }
+		  $foundColon  = false;
+		  $foundString = false;
+		  for ($i = ($stackPtr + 1); $i <= $end; $i++) {
+				if ($tokens[$i]['line'] !== $lastLine) {
+					 // We changed lines.
+					 if ($foundColon === false && $foundString !== false) {
+						  // We didn't find a colon on the previous line.
+						  $error = 'No style definition found on line; check for missing colon';
+						  $phpcsFile->addError($error, $foundString, 'Found');
+					 }
 
-                $foundColon  = false;
-                $foundString = false;
-                $lastLine    = $tokens[$i]['line'];
-            }
+					 $foundColon  = false;
+					 $foundString = false;
+					 $lastLine    = $tokens[$i]['line'];
+				}
 
-            if ($tokens[$i]['code'] === T_STRING) {
-                $foundString = $i;
-            } else if ($tokens[$i]['code'] === T_COLON) {
-                $foundColon = $i;
-            }
-        }//end for
+				if ($tokens[$i]['code'] === T_STRING) {
+					 $foundString = $i;
+				} else if ($tokens[$i]['code'] === T_COLON) {
+					 $foundColon = $i;
+				}
+		  }//end for
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
      *
      * @var array
      */
-    public $supportedTokenizers = array('CSS');
+    public $supportedTokenizers = array( 'CSS' );
 
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_CURLY_BRACKET);
+        return array( T_OPEN_CURLY_BRACKET );
 
     }//end register()
 
@@ -57,38 +57,38 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens   = $phpcsFile->getTokens();
-        $lastLine = $tokens[$stackPtr]['line'];
-        $end      = $tokens[$stackPtr]['bracket_closer'];
-        $endLine  = $tokens[$end]['line'];
+        $lastLine = $tokens[ $stackPtr ][ 'line' ];
+        $end      = $tokens[ $stackPtr ][ 'bracket_closer' ];
+        $endLine  = $tokens[ $end ][ 'line' ];
 
         // Do not check nested style definitions as, for example, in @media style rules.
-        $nested = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, ($stackPtr + 1), $end);
-        if ($nested !== false) {
+        $nested = $phpcsFile->findNext( T_OPEN_CURLY_BRACKET, ( $stackPtr + 1 ), $end );
+        if ( $nested !== false ) {
             return;
         }
 
         $foundColon  = false;
         $foundString = false;
-        for ($i = ($stackPtr + 1); $i <= $end; $i++) {
-            if ($tokens[$i]['line'] !== $lastLine) {
+        for ( $i = ( $stackPtr + 1 ); $i <= $end; $i++ ) {
+            if ( $tokens[ $i ][ 'line' ] !== $lastLine ) {
                 // We changed lines.
-                if ($foundColon === false && $foundString !== false) {
+                if ( $foundColon === false && $foundString !== false ) {
                     // We didn't find a colon on the previous line.
                     $error = 'No style definition found on line; check for missing colon';
-                    $phpcsFile->addError($error, $foundString, 'Found');
+                    $phpcsFile->addError( $error, $foundString, 'Found' );
                 }
 
                 $foundColon  = false;
                 $foundString = false;
-                $lastLine    = $tokens[$i]['line'];
+                $lastLine    = $tokens[ $i ][ 'line' ];
             }
 
-            if ($tokens[$i]['code'] === T_STRING) {
+            if ( $tokens[ $i ][ 'code' ] === T_STRING ) {
                 $foundString = $i;
-            } else if ($tokens[$i]['code'] === T_COLON) {
+            } else if ( $tokens[ $i ][ 'code' ] === T_COLON ) {
                 $foundColon = $i;
             }
         }//end for

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_CSS_MissingColonSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_CSS_MissingColonSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -41,8 +40,7 @@ 
      *
      * @return int[]
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_CURLY_BRACKET);
 
     }//end register()
@@ -57,8 +55,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens   = $phpcsFile->getTokens();
         $lastLine = $tokens[$stackPtr]['line'];
         $end      = $tokens[$stackPtr]['bracket_closer'];

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ShorthandSizeSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int[]
+     * @return string[]
      */
     public function register()
     {

Indentation +157 added lines, -157 removed lines

@@ -29,163 +29,163 @@
 class Squiz_Sniffs_CSS_ShorthandSizeSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array('CSS');
-
-    /**
-     * A list of styles that we shouldn't check.
-     *
-     * These have values that looks like sizes, but are not.
-     *
-     * @var array
-     */
-    public $excludeStyles = array(
-                             'background-position'      => 'background-position',
-                             'box-shadow'               => 'box-shadow',
-                             'transform-origin'         => 'transform-origin',
-                             '-webkit-transform-origin' => '-webkit-transform-origin',
-                             '-ms-transform-origin'     => '-ms-transform-origin',
-                            );
-
-
-    /**
-     * Returns the token types that this sniff is interested in.
-     *
-     * @return int[]
-     */
-    public function register()
-    {
-        return array(T_STYLE);
-
-    }//end register()
-
-
-    /**
-     * Processes the tokens that this sniff is interested in.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
-     * @param int                  $stackPtr  The position in the stack where
-     *                                        the token was found.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Some styles look like shorthand but are not actually a set of 4 sizes.
-        $style = strtolower($tokens[$stackPtr]['content']);
-        if (isset($this->excludeStyles[$style]) === true) {
-            return;
-        }
-
-        // Get the whole style content.
-        $end         = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
-        $origContent = $phpcsFile->getTokensAsString(($stackPtr + 1), ($end - $stackPtr - 1));
-        $origContent = trim($origContent, ': ');
-
-        // Account for a !important annotation.
-        $content = $origContent;
-        if (substr($content, -10) === '!important') {
-            $content = substr($content, 0, -10);
-            $content = trim($content);
-        }
-
-        // Check if this style value is a set of numbers with optional prefixes.
-        $content = preg_replace('/\s+/', ' ', $content);
-        $values  = array();
-        $num     = preg_match_all(
-            '/([0-9]+)([a-zA-Z]{2}\s+|%\s+|\s+)/',
-            $content.' ',
-            $values,
-            PREG_SET_ORDER
-        );
-
-        // Only interested in styles that have multiple sizes defined.
-        if ($num < 2) {
-            return;
-        }
-
-        // Rebuild the content we matched to ensure we got everything.
-        $matched = '';
-        foreach ($values as $value) {
-            $matched .= $value[0];
-        }
-
-        if ($content !== trim($matched)) {
-            return;
-        }
-
-        if ($num === 3) {
-            $expected = trim($content.' '.$values[1][1].$values[1][2]);
-            $error    = 'Shorthand syntax not allowed here; use %s instead';
-            $data     = array($expected);
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'NotAllowed', $data);
-
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                if (substr($origContent, -10) === '!important') {
-                    $expected .= ' !important';
-                }
-
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
-                $phpcsFile->fixer->replaceToken($next, $expected);
-                for ($next++; $next < $end; $next++) {
-                    $phpcsFile->fixer->replaceToken($next, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-
-            return;
-        }//end if
-
-        if ($num === 2) {
-            if ($values[0][0] !== $values[1][0]) {
-                // Both values are different, so it is already shorthand.
-                return;
-            }
-        } else if ($values[0][0] !== $values[2][0] || $values[1][0] !== $values[3][0]) {
-            // Can't shorthand this.
-            return;
-        }
-
-        if ($values[0][0] === $values[1][0]) {
-            // All values are the same.
-            $expected = $values[0][0];
-        } else {
-            $expected = $values[0][0].' '.$values[1][0];
-        }
-
-        $expected = preg_replace('/\s+/', ' ', trim($expected));
-
-        $error = 'Size definitions must use shorthand if available; expected "%s" but found "%s"';
-        $data  = array(
-                  $expected,
-                  $content,
-                 );
-
-        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'NotUsed', $data);
-        if ($fix === true) {
-            $phpcsFile->fixer->beginChangeset();
-            if (substr($origContent, -10) === '!important') {
-                $expected .= ' !important';
-            }
-
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
-            $phpcsFile->fixer->replaceToken($next, $expected);
-            for ($next++; $next < $end; $next++) {
-                $phpcsFile->fixer->replaceToken($next, '');
-            }
-
-            $phpcsFile->fixer->endChangeset();
-        }
-
-    }//end process()
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array('CSS');
+
+	 /**
+	  * A list of styles that we shouldn't check.
+	  *
+	  * These have values that looks like sizes, but are not.
+	  *
+	  * @var array
+	  */
+	 public $excludeStyles = array(
+									  'background-position'      => 'background-position',
+									  'box-shadow'               => 'box-shadow',
+									  'transform-origin'         => 'transform-origin',
+									  '-webkit-transform-origin' => '-webkit-transform-origin',
+									  '-ms-transform-origin'     => '-ms-transform-origin',
+									 );
+
+
+	 /**
+	  * Returns the token types that this sniff is interested in.
+	  *
+	  * @return int[]
+	  */
+	 public function register()
+	 {
+		  return array(T_STYLE);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes the tokens that this sniff is interested in.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
+	  * @param int                  $stackPtr  The position in the stack where
+	  *                                        the token was found.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  // Some styles look like shorthand but are not actually a set of 4 sizes.
+		  $style = strtolower($tokens[$stackPtr]['content']);
+		  if (isset($this->excludeStyles[$style]) === true) {
+				return;
+		  }
+
+		  // Get the whole style content.
+		  $end         = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
+		  $origContent = $phpcsFile->getTokensAsString(($stackPtr + 1), ($end - $stackPtr - 1));
+		  $origContent = trim($origContent, ': ');
+
+		  // Account for a !important annotation.
+		  $content = $origContent;
+		  if (substr($content, -10) === '!important') {
+				$content = substr($content, 0, -10);
+				$content = trim($content);
+		  }
+
+		  // Check if this style value is a set of numbers with optional prefixes.
+		  $content = preg_replace('/\s+/', ' ', $content);
+		  $values  = array();
+		  $num     = preg_match_all(
+				'/([0-9]+)([a-zA-Z]{2}\s+|%\s+|\s+)/',
+				$content.' ',
+				$values,
+				PREG_SET_ORDER
+		  );
+
+		  // Only interested in styles that have multiple sizes defined.
+		  if ($num < 2) {
+				return;
+		  }
+
+		  // Rebuild the content we matched to ensure we got everything.
+		  $matched = '';
+		  foreach ($values as $value) {
+				$matched .= $value[0];
+		  }
+
+		  if ($content !== trim($matched)) {
+				return;
+		  }
+
+		  if ($num === 3) {
+				$expected = trim($content.' '.$values[1][1].$values[1][2]);
+				$error    = 'Shorthand syntax not allowed here; use %s instead';
+				$data     = array($expected);
+				$fix      = $phpcsFile->addFixableError($error, $stackPtr, 'NotAllowed', $data);
+
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 if (substr($origContent, -10) === '!important') {
+						  $expected .= ' !important';
+					 }
+
+					 $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
+					 $phpcsFile->fixer->replaceToken($next, $expected);
+					 for ($next++; $next < $end; $next++) {
+						  $phpcsFile->fixer->replaceToken($next, '');
+					 }
+
+					 $phpcsFile->fixer->endChangeset();
+				}
+
+				return;
+		  }//end if
+
+		  if ($num === 2) {
+				if ($values[0][0] !== $values[1][0]) {
+					 // Both values are different, so it is already shorthand.
+					 return;
+				}
+		  } else if ($values[0][0] !== $values[2][0] || $values[1][0] !== $values[3][0]) {
+				// Can't shorthand this.
+				return;
+		  }
+
+		  if ($values[0][0] === $values[1][0]) {
+				// All values are the same.
+				$expected = $values[0][0];
+		  } else {
+				$expected = $values[0][0].' '.$values[1][0];
+		  }
+
+		  $expected = preg_replace('/\s+/', ' ', trim($expected));
+
+		  $error = 'Size definitions must use shorthand if available; expected "%s" but found "%s"';
+		  $data  = array(
+						$expected,
+						$content,
+					  );
+
+		  $fix = $phpcsFile->addFixableError($error, $stackPtr, 'NotUsed', $data);
+		  if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				if (substr($origContent, -10) === '!important') {
+					 $expected .= ' !important';
+				}
+
+				$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
+				$phpcsFile->fixer->replaceToken($next, $expected);
+				for ($next++; $next < $end; $next++) {
+					 $phpcsFile->fixer->replaceToken($next, '');
+				}
+
+				$phpcsFile->fixer->endChangeset();
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +41 added lines, -41 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @var array
      */
-    public $supportedTokenizers = array('CSS');
+    public $supportedTokenizers = array( 'CSS' );
 
     /**
      * A list of styles that we shouldn't check.
@@ -59,7 +59,7 @@ 
      */
     public function register()
     {
-        return array(T_STYLE);
+        return array( T_STYLE );
 
     }//end register()
 
@@ -73,69 +73,69 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Some styles look like shorthand but are not actually a set of 4 sizes.
-        $style = strtolower($tokens[$stackPtr]['content']);
-        if (isset($this->excludeStyles[$style]) === true) {
+        $style = strtolower( $tokens[ $stackPtr ][ 'content' ] );
+        if ( isset( $this->excludeStyles[ $style ] ) === true ) {
             return;
         }
 
         // Get the whole style content.
-        $end         = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
-        $origContent = $phpcsFile->getTokensAsString(($stackPtr + 1), ($end - $stackPtr - 1));
-        $origContent = trim($origContent, ': ');
+        $end         = $phpcsFile->findNext( T_SEMICOLON, ( $stackPtr + 1 ) );
+        $origContent = $phpcsFile->getTokensAsString( ( $stackPtr + 1 ), ( $end - $stackPtr - 1 ) );
+        $origContent = trim( $origContent, ': ' );
 
         // Account for a !important annotation.
         $content = $origContent;
-        if (substr($content, -10) === '!important') {
-            $content = substr($content, 0, -10);
-            $content = trim($content);
+        if ( substr( $content, -10 ) === '!important' ) {
+            $content = substr( $content, 0, -10 );
+            $content = trim( $content );
         }
 
         // Check if this style value is a set of numbers with optional prefixes.
-        $content = preg_replace('/\s+/', ' ', $content);
+        $content = preg_replace( '/\s+/', ' ', $content );
         $values  = array();
         $num     = preg_match_all(
             '/([0-9]+)([a-zA-Z]{2}\s+|%\s+|\s+)/',
-            $content.' ',
+            $content . ' ',
             $values,
             PREG_SET_ORDER
         );
 
         // Only interested in styles that have multiple sizes defined.
-        if ($num < 2) {
+        if ( $num < 2 ) {
             return;
         }
 
         // Rebuild the content we matched to ensure we got everything.
         $matched = '';
-        foreach ($values as $value) {
-            $matched .= $value[0];
+        foreach ( $values as $value ) {
+            $matched .= $value[ 0 ];
         }
 
-        if ($content !== trim($matched)) {
+        if ( $content !== trim( $matched ) ) {
             return;
         }
 
-        if ($num === 3) {
-            $expected = trim($content.' '.$values[1][1].$values[1][2]);
+        if ( $num === 3 ) {
+            $expected = trim( $content . ' ' . $values[ 1 ][ 1 ] . $values[ 1 ][ 2 ] );
             $error    = 'Shorthand syntax not allowed here; use %s instead';
-            $data     = array($expected);
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'NotAllowed', $data);
+            $data     = array( $expected );
+            $fix      = $phpcsFile->addFixableError( $error, $stackPtr, 'NotAllowed', $data );
 
-            if ($fix === true) {
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                if (substr($origContent, -10) === '!important') {
+                if ( substr( $origContent, -10 ) === '!important' ) {
                     $expected .= ' !important';
                 }
 
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
-                $phpcsFile->fixer->replaceToken($next, $expected);
-                for ($next++; $next < $end; $next++) {
-                    $phpcsFile->fixer->replaceToken($next, '');
+                $next = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 2 ), null, true );
+                $phpcsFile->fixer->replaceToken( $next, $expected );
+                for ( $next++; $next < $end; $next++ ) {
+                    $phpcsFile->fixer->replaceToken( $next, '' );
                 }
 
                 $phpcsFile->fixer->endChangeset();
@@ -144,24 +144,24 @@ 
             return;
         }//end if
 
-        if ($num === 2) {
-            if ($values[0][0] !== $values[1][0]) {
+        if ( $num === 2 ) {
+            if ( $values[ 0 ][ 0 ] !== $values[ 1 ][ 0 ] ) {
                 // Both values are different, so it is already shorthand.
                 return;
             }
-        } else if ($values[0][0] !== $values[2][0] || $values[1][0] !== $values[3][0]) {
+        } else if ( $values[ 0 ][ 0 ] !== $values[ 2 ][ 0 ] || $values[ 1 ][ 0 ] !== $values[ 3 ][ 0 ] ) {
             // Can't shorthand this.
             return;
         }
 
-        if ($values[0][0] === $values[1][0]) {
+        if ( $values[ 0 ][ 0 ] === $values[ 1 ][ 0 ] ) {
             // All values are the same.
-            $expected = $values[0][0];
+            $expected = $values[ 0 ][ 0 ];
         } else {
-            $expected = $values[0][0].' '.$values[1][0];
+            $expected = $values[ 0 ][ 0 ] . ' ' . $values[ 1 ][ 0 ];
         }
 
-        $expected = preg_replace('/\s+/', ' ', trim($expected));
+        $expected = preg_replace( '/\s+/', ' ', trim( $expected ) );
 
         $error = 'Size definitions must use shorthand if available; expected "%s" but found "%s"';
         $data  = array(
@@ -169,17 +169,17 @@ 
                   $content,
                  );
 
-        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'NotUsed', $data);
-        if ($fix === true) {
+        $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'NotUsed', $data );
+        if ( $fix === true ) {
             $phpcsFile->fixer->beginChangeset();
-            if (substr($origContent, -10) === '!important') {
+            if ( substr( $origContent, -10 ) === '!important' ) {
                 $expected .= ' !important';
             }
 
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
-            $phpcsFile->fixer->replaceToken($next, $expected);
-            for ($next++; $next < $end; $next++) {
-                $phpcsFile->fixer->replaceToken($next, '');
+            $next = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 2 ), null, true );
+            $phpcsFile->fixer->replaceToken( $next, $expected );
+            for ( $next++; $next < $end; $next++ ) {
+                $phpcsFile->fixer->replaceToken( $next, '' );
             }
 
             $phpcsFile->fixer->endChangeset();

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_CSS_ShorthandSizeSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_CSS_ShorthandSizeSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -57,8 +56,7 @@ 
      *
      * @return int[]
      */
-    public function register()
-    {
+    public function register() {
         return array(T_STYLE);
 
     }//end register()
@@ -73,8 +71,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Some styles look like shorthand but are not actually a set of 4 sizes.