jazzsequence / games-collector

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php

Indentation +182 added lines, -182 removed lines

@@ -14,7 +14,7 @@ 
  */
 
 if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found');
+	 throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found');
 }
 
 /**
@@ -35,187 +35,187 @@ 
 class Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
 {
 
-    /**
-     * A list of all PHP magic methods.
-     *
-     * @var array
-     */
-    protected $magicMethods = array(
-                               'construct'  => true,
-                               'destruct'   => true,
-                               'call'       => true,
-                               'callstatic' => true,
-                               'get'        => true,
-                               'set'        => true,
-                               'isset'      => true,
-                               'unset'      => true,
-                               'sleep'      => true,
-                               'wakeup'     => true,
-                               'tostring'   => true,
-                               'set_state'  => true,
-                               'clone'      => true,
-                               'invoke'     => true,
-                               'debuginfo'  => true,
-                              );
-
-    /**
-     * A list of all PHP non-magic methods starting with a double underscore.
-     *
-     * These come from PHP modules such as SOAPClient.
-     *
-     * @var array
-     */
-    protected $methodsDoubleUnderscore = array(
-                                          'soapcall'               => true,
-                                          'getlastrequest'         => true,
-                                          'getlastresponse'        => true,
-                                          'getlastrequestheaders'  => true,
-                                          'getlastresponseheaders' => true,
-                                          'getfunctions'           => true,
-                                          'gettypes'               => true,
-                                          'dorequest'              => true,
-                                          'setcookie'              => true,
-                                          'setlocation'            => true,
-                                          'setsoapheaders'         => true,
-                                         );
-
-    /**
-     * A list of all PHP magic functions.
-     *
-     * @var array
-     */
-    protected $magicFunctions = array('autoload' => true);
-
-    /**
-     * If TRUE, the string must not have two capital letters next to each other.
-     *
-     * @var bool
-     */
-    public $strict = true;
-
-
-    /**
-     * Constructs a Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff.
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE, T_TRAIT), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes the tokens within the scope.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     * @param int                  $currScope The position of the current scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope)
-    {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
-            // Ignore closures.
-            return;
-        }
-
-        $className = $phpcsFile->getDeclarationName($currScope);
-        $errorData = array($className.'::'.$methodName);
-
-        // Is this a magic method. i.e., is prefixed with "__" ?
-        if (preg_match('|^__|', $methodName) !== 0) {
-            $magicPart = strtolower(substr($methodName, 2));
-            if (isset($this->magicMethods[$magicPart]) === false
-                && isset($this->methodsDoubleUnderscore[$magicPart]) === false
-            ) {
-                $error = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                $phpcsFile->addError($error, $stackPtr, 'MethodDoubleUnderscore', $errorData);
-            }
-
-            return;
-        }
-
-        // PHP4 constructors are allowed to break our rules.
-        if ($methodName === $className) {
-            return;
-        }
-
-        // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
-            return;
-        }
-
-        // Ignore first underscore in methods prefixed with "_".
-        $methodName = ltrim($methodName, '_');
-
-        $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-        if (PHP_CodeSniffer::isCamelCaps($methodName, false, true, $this->strict) === false) {
-            if ($methodProps['scope_specified'] === true) {
-                $error = '%s method name "%s" is not in camel caps format';
-                $data  = array(
-                          ucfirst($methodProps['scope']),
-                          $errorData[0],
-                         );
-                $phpcsFile->addError($error, $stackPtr, 'ScopeNotCamelCaps', $data);
-            } else {
-                $error = 'Method name "%s" is not in camel caps format';
-                $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
-            }
-
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'no');
-            return;
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
-        }
-
-    }//end processTokenWithinScope()
-
-
-    /**
-     * Processes the tokens outside the scope.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     *
-     * @return void
-     */
-    protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($functionName === null) {
-            // Ignore closures.
-            return;
-        }
-
-        $errorData = array($functionName);
-
-        // Is this a magic function. i.e., it is prefixed with "__".
-        if (preg_match('|^__|', $functionName) !== 0) {
-            $magicPart = strtolower(substr($functionName, 2));
-            if (isset($this->magicFunctions[$magicPart]) === false) {
-                 $error = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                 $phpcsFile->addError($error, $stackPtr, 'FunctionDoubleUnderscore', $errorData);
-            }
-
-            return;
-        }
-
-        // Ignore first underscore in functions prefixed with "_".
-        $functionName = ltrim($functionName, '_');
-
-        if (PHP_CodeSniffer::isCamelCaps($functionName, false, true, $this->strict) === false) {
-            $error = 'Function name "%s" is not in camel caps format';
-            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase function name', 'no');
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
-        }
-
-    }//end processTokenOutsideScope()
+	 /**
+	  * A list of all PHP magic methods.
+	  *
+	  * @var array
+	  */
+	 protected $magicMethods = array(
+										 'construct'  => true,
+										 'destruct'   => true,
+										 'call'       => true,
+										 'callstatic' => true,
+										 'get'        => true,
+										 'set'        => true,
+										 'isset'      => true,
+										 'unset'      => true,
+										 'sleep'      => true,
+										 'wakeup'     => true,
+										 'tostring'   => true,
+										 'set_state'  => true,
+										 'clone'      => true,
+										 'invoke'     => true,
+										 'debuginfo'  => true,
+										);
+
+	 /**
+	  * A list of all PHP non-magic methods starting with a double underscore.
+	  *
+	  * These come from PHP modules such as SOAPClient.
+	  *
+	  * @var array
+	  */
+	 protected $methodsDoubleUnderscore = array(
+														'soapcall'               => true,
+														'getlastrequest'         => true,
+														'getlastresponse'        => true,
+														'getlastrequestheaders'  => true,
+														'getlastresponseheaders' => true,
+														'getfunctions'           => true,
+														'gettypes'               => true,
+														'dorequest'              => true,
+														'setcookie'              => true,
+														'setlocation'            => true,
+														'setsoapheaders'         => true,
+													  );
+
+	 /**
+	  * A list of all PHP magic functions.
+	  *
+	  * @var array
+	  */
+	 protected $magicFunctions = array('autoload' => true);
+
+	 /**
+	  * If TRUE, the string must not have two capital letters next to each other.
+	  *
+	  * @var bool
+	  */
+	 public $strict = true;
+
+
+	 /**
+	  * Constructs a Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff.
+	  */
+	 public function __construct()
+	 {
+		  parent::__construct(array(T_CLASS, T_INTERFACE, T_TRAIT), array(T_FUNCTION), true);
+
+	 }//end __construct()
+
+
+	 /**
+	  * Processes the tokens within the scope.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
+	  * @param int                  $stackPtr  The position where this token was
+	  *                                        found.
+	  * @param int                  $currScope The position of the current scope.
+	  *
+	  * @return void
+	  */
+	 protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope)
+	 {
+		  $methodName = $phpcsFile->getDeclarationName($stackPtr);
+		  if ($methodName === null) {
+				// Ignore closures.
+				return;
+		  }
+
+		  $className = $phpcsFile->getDeclarationName($currScope);
+		  $errorData = array($className.'::'.$methodName);
+
+		  // Is this a magic method. i.e., is prefixed with "__" ?
+		  if (preg_match('|^__|', $methodName) !== 0) {
+				$magicPart = strtolower(substr($methodName, 2));
+				if (isset($this->magicMethods[$magicPart]) === false
+					 && isset($this->methodsDoubleUnderscore[$magicPart]) === false
+				) {
+					 $error = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
+					 $phpcsFile->addError($error, $stackPtr, 'MethodDoubleUnderscore', $errorData);
+				}
+
+				return;
+		  }
+
+		  // PHP4 constructors are allowed to break our rules.
+		  if ($methodName === $className) {
+				return;
+		  }
+
+		  // PHP4 destructors are allowed to break our rules.
+		  if ($methodName === '_'.$className) {
+				return;
+		  }
+
+		  // Ignore first underscore in methods prefixed with "_".
+		  $methodName = ltrim($methodName, '_');
+
+		  $methodProps = $phpcsFile->getMethodProperties($stackPtr);
+		  if (PHP_CodeSniffer::isCamelCaps($methodName, false, true, $this->strict) === false) {
+				if ($methodProps['scope_specified'] === true) {
+					 $error = '%s method name "%s" is not in camel caps format';
+					 $data  = array(
+								  ucfirst($methodProps['scope']),
+								  $errorData[0],
+								 );
+					 $phpcsFile->addError($error, $stackPtr, 'ScopeNotCamelCaps', $data);
+				} else {
+					 $error = 'Method name "%s" is not in camel caps format';
+					 $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
+				}
+
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'no');
+				return;
+		  } else {
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
+		  }
+
+	 }//end processTokenWithinScope()
+
+
+	 /**
+	  * Processes the tokens outside the scope.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being processed.
+	  * @param int                  $stackPtr  The position where this token was
+	  *                                        found.
+	  *
+	  * @return void
+	  */
+	 protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $functionName = $phpcsFile->getDeclarationName($stackPtr);
+		  if ($functionName === null) {
+				// Ignore closures.
+				return;
+		  }
+
+		  $errorData = array($functionName);
+
+		  // Is this a magic function. i.e., it is prefixed with "__".
+		  if (preg_match('|^__|', $functionName) !== 0) {
+				$magicPart = strtolower(substr($functionName, 2));
+				if (isset($this->magicFunctions[$magicPart]) === false) {
+					  $error = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
+					  $phpcsFile->addError($error, $stackPtr, 'FunctionDoubleUnderscore', $errorData);
+				}
+
+				return;
+		  }
+
+		  // Ignore first underscore in functions prefixed with "_".
+		  $functionName = ltrim($functionName, '_');
+
+		  if (PHP_CodeSniffer::isCamelCaps($functionName, false, true, $this->strict) === false) {
+				$error = 'Function name "%s" is not in camel caps format';
+				$phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase function name', 'no');
+		  } else {
+				$phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
+		  }
+
+	 }//end processTokenOutsideScope()
 
 
 }//end class

Spacing +39 added lines, -39 removed lines

@@ -13,8 +13,8 @@ 
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found');
+if ( class_exists( 'PHP_CodeSniffer_Standards_AbstractScopeSniff', true ) === false ) {
+    throw new PHP_CodeSniffer_Exception( 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found' );
 }
 
 /**
@@ -84,7 +84,7 @@ 
      *
      * @var array
      */
-    protected $magicFunctions = array('autoload' => true);
+    protected $magicFunctions = array( 'autoload' => true );
 
     /**
      * If TRUE, the string must not have two capital letters next to each other.
@@ -99,7 +99,7 @@ 
      */
     public function __construct()
     {
-        parent::__construct(array(T_CLASS, T_INTERFACE, T_TRAIT), array(T_FUNCTION), true);
+        parent::__construct( array( T_CLASS, T_INTERFACE, T_TRAIT ), array( T_FUNCTION ), true );
 
     }//end __construct()
 
@@ -114,61 +114,61 @@ 
      *
      * @return void
      */
-    protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope)
+    protected function processTokenWithinScope( PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope )
     {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
+        $methodName = $phpcsFile->getDeclarationName( $stackPtr );
+        if ( $methodName === null ) {
             // Ignore closures.
             return;
         }
 
-        $className = $phpcsFile->getDeclarationName($currScope);
-        $errorData = array($className.'::'.$methodName);
+        $className = $phpcsFile->getDeclarationName( $currScope );
+        $errorData = array( $className . '::' . $methodName );
 
         // Is this a magic method. i.e., is prefixed with "__" ?
-        if (preg_match('|^__|', $methodName) !== 0) {
-            $magicPart = strtolower(substr($methodName, 2));
-            if (isset($this->magicMethods[$magicPart]) === false
-                && isset($this->methodsDoubleUnderscore[$magicPart]) === false
+        if ( preg_match( '|^__|', $methodName ) !== 0 ) {
+            $magicPart = strtolower( substr( $methodName, 2 ) );
+            if ( isset( $this->magicMethods[ $magicPart ] ) === false
+                && isset( $this->methodsDoubleUnderscore[ $magicPart ] ) === false
             ) {
                 $error = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                $phpcsFile->addError($error, $stackPtr, 'MethodDoubleUnderscore', $errorData);
+                $phpcsFile->addError( $error, $stackPtr, 'MethodDoubleUnderscore', $errorData );
             }
 
             return;
         }
 
         // PHP4 constructors are allowed to break our rules.
-        if ($methodName === $className) {
+        if ( $methodName === $className ) {
             return;
         }
 
         // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
+        if ( $methodName === '_' . $className ) {
             return;
         }
 
         // Ignore first underscore in methods prefixed with "_".
-        $methodName = ltrim($methodName, '_');
+        $methodName = ltrim( $methodName, '_' );
 
-        $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-        if (PHP_CodeSniffer::isCamelCaps($methodName, false, true, $this->strict) === false) {
-            if ($methodProps['scope_specified'] === true) {
+        $methodProps = $phpcsFile->getMethodProperties( $stackPtr );
+        if ( PHP_CodeSniffer::isCamelCaps( $methodName, false, true, $this->strict ) === false ) {
+            if ( $methodProps[ 'scope_specified' ] === true ) {
                 $error = '%s method name "%s" is not in camel caps format';
                 $data  = array(
-                          ucfirst($methodProps['scope']),
-                          $errorData[0],
+                          ucfirst( $methodProps[ 'scope' ] ),
+                          $errorData[ 0 ],
                          );
-                $phpcsFile->addError($error, $stackPtr, 'ScopeNotCamelCaps', $data);
+                $phpcsFile->addError( $error, $stackPtr, 'ScopeNotCamelCaps', $data );
             } else {
                 $error = 'Method name "%s" is not in camel caps format';
-                $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
+                $phpcsFile->addError( $error, $stackPtr, 'NotCamelCaps', $errorData );
             }
 
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'no');
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase method name', 'no' );
             return;
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase method name', 'yes' );
         }
 
     }//end processTokenWithinScope()
@@ -183,36 +183,36 @@ 
      *
      * @return void
      */
-    protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    protected function processTokenOutsideScope( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($functionName === null) {
+        $functionName = $phpcsFile->getDeclarationName( $stackPtr );
+        if ( $functionName === null ) {
             // Ignore closures.
             return;
         }
 
-        $errorData = array($functionName);
+        $errorData = array( $functionName );
 
         // Is this a magic function. i.e., it is prefixed with "__".
-        if (preg_match('|^__|', $functionName) !== 0) {
-            $magicPart = strtolower(substr($functionName, 2));
-            if (isset($this->magicFunctions[$magicPart]) === false) {
+        if ( preg_match( '|^__|', $functionName ) !== 0 ) {
+            $magicPart = strtolower( substr( $functionName, 2 ) );
+            if ( isset( $this->magicFunctions[ $magicPart ] ) === false ) {
                  $error = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                 $phpcsFile->addError($error, $stackPtr, 'FunctionDoubleUnderscore', $errorData);
+                 $phpcsFile->addError( $error, $stackPtr, 'FunctionDoubleUnderscore', $errorData );
             }
 
             return;
         }
 
         // Ignore first underscore in functions prefixed with "_".
-        $functionName = ltrim($functionName, '_');
+        $functionName = ltrim( $functionName, '_' );
 
-        if (PHP_CodeSniffer::isCamelCaps($functionName, false, true, $this->strict) === false) {
+        if ( PHP_CodeSniffer::isCamelCaps( $functionName, false, true, $this->strict ) === false ) {
             $error = 'Function name "%s" is not in camel caps format';
-            $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase function name', 'no');
+            $phpcsFile->addError( $error, $stackPtr, 'NotCamelCaps', $errorData );
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase function name', 'no' );
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
+            $phpcsFile->recordMetric( $stackPtr, 'CamelCase method name', 'yes' );
         }
 
     }//end processTokenOutsideScope()

Braces +4 added lines, -8 removed lines

@@ -32,8 +32,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
-{
+class Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff {
 
     /**
      * A list of all PHP magic methods.
@@ -97,8 +96,7 @@ 
     /**
      * Constructs a Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct(array(T_CLASS, T_INTERFACE, T_TRAIT), array(T_FUNCTION), true);
 
     }//end __construct()
@@ -114,8 +112,7 @@ 
      *
      * @return void
      */
-    protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope)
-    {
+    protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $currScope) {
         $methodName = $phpcsFile->getDeclarationName($stackPtr);
         if ($methodName === null) {
             // Ignore closures.
@@ -183,8 +180,7 @@ 
      *
      * @return void
      */
-    protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    protected function processTokenOutsideScope(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $functionName = $phpcsFile->getDeclarationName($stackPtr);
         if ($functionName === null) {
             // Ignore closures.

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php

Indentation +148 added lines, -148 removed lines

@@ -31,157 +31,157 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_STRING);
-
-    }//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();
-        $constName = $tokens[$stackPtr]['content'];
-
-        // If this token is in a heredoc, ignore it.
-        if ($phpcsFile->hasCondition($stackPtr, T_START_HEREDOC) === true) {
-            return;
-        }
-
-        // Special case for PHP 5.5 class name resolution.
-        if (strtolower($constName) === 'class'
-            && $tokens[($stackPtr - 1)]['code'] === T_DOUBLE_COLON
-        ) {
-            return;
-        }
-
-        // Special case for PHPUnit.
-        if ($constName === 'PHPUnit_MAIN_METHOD') {
-            return;
-        }
-
-        // If the next non-whitespace token after this token
-        // is not an opening parenthesis then it is not a function call.
-        for ($openBracket = ($stackPtr + 1); $openBracket < $phpcsFile->numTokens; $openBracket++) {
-            if ($tokens[$openBracket]['code'] !== T_WHITESPACE) {
-                break;
-            }
-        }
-
-        if ($openBracket === $phpcsFile->numTokens) {
-            return;
-        }
-
-        if ($tokens[$openBracket]['code'] !== T_OPEN_PARENTHESIS) {
-            $functionKeyword = $phpcsFile->findPrevious(
-                array(
-                 T_WHITESPACE,
-                 T_COMMA,
-                 T_COMMENT,
-                 T_STRING,
-                 T_NS_SEPARATOR,
-                ),
-                ($stackPtr - 1),
-                null,
-                true
-            );
-
-            if ($tokens[$functionKeyword]['code'] !== T_CONST) {
-                return;
-            }
-
-            // This is a class constant.
-            if (strtoupper($constName) !== $constName) {
-                if (strtolower($constName) === $constName) {
-                    $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
-                } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
-                }
-
-                $error = 'Class constants must be uppercase; expected %s but found %s';
-                $data  = array(
-                          strtoupper($constName),
-                          $constName,
-                         );
-                $phpcsFile->addError($error, $stackPtr, 'ClassConstantNotUpperCase', $data);
-            } else {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
-            }
-
-            return;
-        }//end if
-
-        if (strtolower($constName) !== 'define') {
-            return;
-        }
-
-        /*
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_STRING);
+
+	 }//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();
+		  $constName = $tokens[$stackPtr]['content'];
+
+		  // If this token is in a heredoc, ignore it.
+		  if ($phpcsFile->hasCondition($stackPtr, T_START_HEREDOC) === true) {
+				return;
+		  }
+
+		  // Special case for PHP 5.5 class name resolution.
+		  if (strtolower($constName) === 'class'
+				&& $tokens[($stackPtr - 1)]['code'] === T_DOUBLE_COLON
+		  ) {
+				return;
+		  }
+
+		  // Special case for PHPUnit.
+		  if ($constName === 'PHPUnit_MAIN_METHOD') {
+				return;
+		  }
+
+		  // If the next non-whitespace token after this token
+		  // is not an opening parenthesis then it is not a function call.
+		  for ($openBracket = ($stackPtr + 1); $openBracket < $phpcsFile->numTokens; $openBracket++) {
+				if ($tokens[$openBracket]['code'] !== T_WHITESPACE) {
+					 break;
+				}
+		  }
+
+		  if ($openBracket === $phpcsFile->numTokens) {
+				return;
+		  }
+
+		  if ($tokens[$openBracket]['code'] !== T_OPEN_PARENTHESIS) {
+				$functionKeyword = $phpcsFile->findPrevious(
+					 array(
+					  T_WHITESPACE,
+					  T_COMMA,
+					  T_COMMENT,
+					  T_STRING,
+					  T_NS_SEPARATOR,
+					 ),
+					 ($stackPtr - 1),
+					 null,
+					 true
+				);
+
+				if ($tokens[$functionKeyword]['code'] !== T_CONST) {
+					 return;
+				}
+
+				// This is a class constant.
+				if (strtoupper($constName) !== $constName) {
+					 if (strtolower($constName) === $constName) {
+						  $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
+					 } else {
+						  $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
+					 }
+
+					 $error = 'Class constants must be uppercase; expected %s but found %s';
+					 $data  = array(
+								  strtoupper($constName),
+								  $constName,
+								 );
+					 $phpcsFile->addError($error, $stackPtr, 'ClassConstantNotUpperCase', $data);
+				} else {
+					 $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
+				}
+
+				return;
+		  }//end if
+
+		  if (strtolower($constName) !== 'define') {
+				return;
+		  }
+
+		  /*
             This may be a "define" function call.
         */
 
-        // Make sure this is not a method call.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_OBJECT_OPERATOR
-            || $tokens[$prev]['code'] === T_DOUBLE_COLON
-        ) {
-            return;
-        }
-
-        // The next non-whitespace token must be the constant name.
-        $constPtr = $phpcsFile->findNext(T_WHITESPACE, ($openBracket + 1), null, true);
-        if ($tokens[$constPtr]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
-            return;
-        }
-
-        $constName = $tokens[$constPtr]['content'];
-
-        // Check for constants like self::CONSTANT.
-        $prefix   = '';
-        $splitPos = strpos($constName, '::');
-        if ($splitPos !== false) {
-            $prefix    = substr($constName, 0, ($splitPos + 2));
-            $constName = substr($constName, ($splitPos + 2));
-        }
-
-        // Strip namesspace from constant like /foo/bar/CONSTANT.
-        $splitPos = strrpos($constName, '\\');
-        if ($splitPos !== false) {
-            $prefix    = substr($constName, 0, ($splitPos + 1));
-            $constName = substr($constName, ($splitPos + 1));
-        }
-
-        if (strtoupper($constName) !== $constName) {
-            if (strtolower($constName) === $constName) {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
-            } else {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
-            }
-
-            $error = 'Constants must be uppercase; expected %s but found %s';
-            $data  = array(
-                      $prefix.strtoupper($constName),
-                      $prefix.$constName,
-                     );
-            $phpcsFile->addError($error, $stackPtr, 'ConstantNotUpperCase', $data);
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
-        }
-
-    }//end process()
+		  // Make sure this is not a method call.
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($tokens[$prev]['code'] === T_OBJECT_OPERATOR
+				|| $tokens[$prev]['code'] === T_DOUBLE_COLON
+		  ) {
+				return;
+		  }
+
+		  // The next non-whitespace token must be the constant name.
+		  $constPtr = $phpcsFile->findNext(T_WHITESPACE, ($openBracket + 1), null, true);
+		  if ($tokens[$constPtr]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
+				return;
+		  }
+
+		  $constName = $tokens[$constPtr]['content'];
+
+		  // Check for constants like self::CONSTANT.
+		  $prefix   = '';
+		  $splitPos = strpos($constName, '::');
+		  if ($splitPos !== false) {
+				$prefix    = substr($constName, 0, ($splitPos + 2));
+				$constName = substr($constName, ($splitPos + 2));
+		  }
+
+		  // Strip namesspace from constant like /foo/bar/CONSTANT.
+		  $splitPos = strrpos($constName, '\\');
+		  if ($splitPos !== false) {
+				$prefix    = substr($constName, 0, ($splitPos + 1));
+				$constName = substr($constName, ($splitPos + 1));
+		  }
+
+		  if (strtoupper($constName) !== $constName) {
+				if (strtolower($constName) === $constName) {
+					 $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
+				} else {
+					 $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
+				}
+
+				$error = 'Constants must be uppercase; expected %s but found %s';
+				$data  = array(
+							 $prefix.strtoupper($constName),
+							 $prefix.$constName,
+							);
+				$phpcsFile->addError($error, $stackPtr, 'ConstantNotUpperCase', $data);
+		  } else {
+				$phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +43 added lines, -43 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(T_STRING);
+        return array( T_STRING );
 
     }//end register()
 
@@ -52,41 +52,41 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens    = $phpcsFile->getTokens();
-        $constName = $tokens[$stackPtr]['content'];
+        $constName = $tokens[ $stackPtr ][ 'content' ];
 
         // If this token is in a heredoc, ignore it.
-        if ($phpcsFile->hasCondition($stackPtr, T_START_HEREDOC) === true) {
+        if ( $phpcsFile->hasCondition( $stackPtr, T_START_HEREDOC ) === true ) {
             return;
         }
 
         // Special case for PHP 5.5 class name resolution.
-        if (strtolower($constName) === 'class'
-            && $tokens[($stackPtr - 1)]['code'] === T_DOUBLE_COLON
+        if ( strtolower( $constName ) === 'class'
+            && $tokens[ ( $stackPtr - 1 ) ][ 'code' ] === T_DOUBLE_COLON
         ) {
             return;
         }
 
         // Special case for PHPUnit.
-        if ($constName === 'PHPUnit_MAIN_METHOD') {
+        if ( $constName === 'PHPUnit_MAIN_METHOD' ) {
             return;
         }
 
         // If the next non-whitespace token after this token
         // is not an opening parenthesis then it is not a function call.
-        for ($openBracket = ($stackPtr + 1); $openBracket < $phpcsFile->numTokens; $openBracket++) {
-            if ($tokens[$openBracket]['code'] !== T_WHITESPACE) {
+        for ( $openBracket = ( $stackPtr + 1 ); $openBracket < $phpcsFile->numTokens; $openBracket++ ) {
+            if ( $tokens[ $openBracket ][ 'code' ] !== T_WHITESPACE ) {
                 break;
             }
         }
 
-        if ($openBracket === $phpcsFile->numTokens) {
+        if ( $openBracket === $phpcsFile->numTokens ) {
             return;
         }
 
-        if ($tokens[$openBracket]['code'] !== T_OPEN_PARENTHESIS) {
+        if ( $tokens[ $openBracket ][ 'code' ] !== T_OPEN_PARENTHESIS ) {
             $functionKeyword = $phpcsFile->findPrevious(
                 array(
                  T_WHITESPACE,
@@ -95,37 +95,37 @@ 
                  T_STRING,
                  T_NS_SEPARATOR,
                 ),
-                ($stackPtr - 1),
+                ( $stackPtr - 1 ),
                 null,
                 true
             );
 
-            if ($tokens[$functionKeyword]['code'] !== T_CONST) {
+            if ( $tokens[ $functionKeyword ][ 'code' ] !== T_CONST ) {
                 return;
             }
 
             // This is a class constant.
-            if (strtoupper($constName) !== $constName) {
-                if (strtolower($constName) === $constName) {
-                    $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
+            if ( strtoupper( $constName ) !== $constName ) {
+                if ( strtolower( $constName ) === $constName ) {
+                    $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'lower' );
                 } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
+                    $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'mixed' );
                 }
 
                 $error = 'Class constants must be uppercase; expected %s but found %s';
                 $data  = array(
-                          strtoupper($constName),
+                          strtoupper( $constName ),
                           $constName,
                          );
-                $phpcsFile->addError($error, $stackPtr, 'ClassConstantNotUpperCase', $data);
+                $phpcsFile->addError( $error, $stackPtr, 'ClassConstantNotUpperCase', $data );
             } else {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
+                $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'upper' );
             }
 
             return;
         }//end if
 
-        if (strtolower($constName) !== 'define') {
+        if ( strtolower( $constName ) !== 'define' ) {
             return;
         }
 
@@ -134,51 +134,51 @@ 
         */
 
         // Make sure this is not a method call.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_OBJECT_OPERATOR
-            || $tokens[$prev]['code'] === T_DOUBLE_COLON
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] === T_OBJECT_OPERATOR
+            || $tokens[ $prev ][ 'code' ] === T_DOUBLE_COLON
         ) {
             return;
         }
 
         // The next non-whitespace token must be the constant name.
-        $constPtr = $phpcsFile->findNext(T_WHITESPACE, ($openBracket + 1), null, true);
-        if ($tokens[$constPtr]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
+        $constPtr = $phpcsFile->findNext( T_WHITESPACE, ( $openBracket + 1 ), null, true );
+        if ( $tokens[ $constPtr ][ 'code' ] !== T_CONSTANT_ENCAPSED_STRING ) {
             return;
         }
 
-        $constName = $tokens[$constPtr]['content'];
+        $constName = $tokens[ $constPtr ][ 'content' ];
 
         // Check for constants like self::CONSTANT.
         $prefix   = '';
-        $splitPos = strpos($constName, '::');
-        if ($splitPos !== false) {
-            $prefix    = substr($constName, 0, ($splitPos + 2));
-            $constName = substr($constName, ($splitPos + 2));
+        $splitPos = strpos( $constName, '::' );
+        if ( $splitPos !== false ) {
+            $prefix    = substr( $constName, 0, ( $splitPos + 2 ) );
+            $constName = substr( $constName, ( $splitPos + 2 ) );
         }
 
         // Strip namesspace from constant like /foo/bar/CONSTANT.
-        $splitPos = strrpos($constName, '\\');
-        if ($splitPos !== false) {
-            $prefix    = substr($constName, 0, ($splitPos + 1));
-            $constName = substr($constName, ($splitPos + 1));
+        $splitPos = strrpos( $constName, '\\' );
+        if ( $splitPos !== false ) {
+            $prefix    = substr( $constName, 0, ( $splitPos + 1 ) );
+            $constName = substr( $constName, ( $splitPos + 1 ) );
         }
 
-        if (strtoupper($constName) !== $constName) {
-            if (strtolower($constName) === $constName) {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'lower');
+        if ( strtoupper( $constName ) !== $constName ) {
+            if ( strtolower( $constName ) === $constName ) {
+                $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'lower' );
             } else {
-                $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'mixed');
+                $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'mixed' );
             }
 
             $error = 'Constants must be uppercase; expected %s but found %s';
             $data  = array(
-                      $prefix.strtoupper($constName),
-                      $prefix.$constName,
+                      $prefix . strtoupper( $constName ),
+                      $prefix . $constName,
                      );
-            $phpcsFile->addError($error, $stackPtr, 'ConstantNotUpperCase', $data);
+            $phpcsFile->addError( $error, $stackPtr, 'ConstantNotUpperCase', $data );
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'Constant name case', 'upper');
+            $phpcsFile->recordMetric( $stackPtr, 'Constant name case', 'upper' );
         }
 
     }//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 Generic_Sniffs_NamingConventions_UpperCaseConstantNameSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_NamingConventions_UpperCaseConstantNameSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_STRING);
 
     }//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();
         $constName = $tokens[$stackPtr]['content'];
 

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php

Indentation +111 added lines, -111 removed lines

@@ -14,8 +14,8 @@ 
  */
 
 if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
-    $error = 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found';
-    throw new PHP_CodeSniffer_Exception($error);
+	 $error = 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found';
+	 throw new PHP_CodeSniffer_Exception($error);
 }
 
 /**
@@ -34,115 +34,115 @@ 
 class Generic_Sniffs_NamingConventions_ConstructorNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
 {
 
-    /**
-     * The name of the class we are currently checking.
-     *
-     * @var string
-     */
-    private $_currentClass = '';
-
-    /**
-     * A list of functions in the current class.
-     *
-     * @var string[]
-     */
-    private $_functionList = array();
-
-
-    /**
-     * Constructs the test with the tokens it wishes to listen for.
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes this test when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param int                  $currScope A pointer to the start of the scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(
-        PHP_CodeSniffer_File $phpcsFile,
-        $stackPtr,
-        $currScope
-    ) {
-        $className = $phpcsFile->getDeclarationName($currScope);
-        if ($className !== $this->_currentClass) {
-            $this->loadFunctionNamesInScope($phpcsFile, $currScope);
-            $this->_currentClass = $className;
-        }
-
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-
-        if (strcasecmp($methodName, $className) === 0) {
-            if (in_array('__construct', $this->_functionList) === false) {
-                $error = 'PHP4 style constructors are not allowed; use "__construct()" instead';
-                $phpcsFile->addError($error, $stackPtr, 'OldStyle');
-            }
-        } else if (strcasecmp($methodName, '__construct') !== 0) {
-            // Not a constructor.
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
-        if ($parentClassName === false) {
-            return;
-        }
-
-        // Stop if the constructor doesn't have a body, like when it is abstract.
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
-
-        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
-        $startIndex       = $stackPtr;
-        while (($doubleColonIndex = $phpcsFile->findNext(T_DOUBLE_COLON, $startIndex, $endFunctionIndex)) !== false) {
-            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
-                && $tokens[($doubleColonIndex + 1)]['content'] === $parentClassName
-            ) {
-                $error = 'PHP4 style calls to parent constructors are not allowed; use "parent::__construct()" instead';
-                $phpcsFile->addError($error, ($doubleColonIndex + 1), 'OldStyleCall');
-            }
-
-            $startIndex = ($doubleColonIndex + 1);
-        }
-
-    }//end processTokenWithinScope()
-
-
-    /**
-     * Extracts all the function names found in the given scope.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The current file being scanned.
-     * @param int                  $currScope A pointer to the start of the scope.
-     *
-     * @return void
-     */
-    protected function loadFunctionNamesInScope(PHP_CodeSniffer_File $phpcsFile, $currScope)
-    {
-        $this->_functionList = array();
-        $tokens = $phpcsFile->getTokens();
-
-        for ($i = ($tokens[$currScope]['scope_opener'] + 1); $i < $tokens[$currScope]['scope_closer']; $i++) {
-            if ($tokens[$i]['code'] !== T_FUNCTION) {
-                continue;
-            }
-
-            $next = $phpcsFile->findNext(T_STRING, $i);
-            $this->_functionList[] = trim($tokens[$next]['content']);
-        }
-
-    }//end loadFunctionNamesInScope()
+	 /**
+	  * The name of the class we are currently checking.
+	  *
+	  * @var string
+	  */
+	 private $_currentClass = '';
+
+	 /**
+	  * A list of functions in the current class.
+	  *
+	  * @var string[]
+	  */
+	 private $_functionList = array();
+
+
+	 /**
+	  * Constructs the test with the tokens it wishes to listen for.
+	  */
+	 public function __construct()
+	 {
+		  parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+
+	 }//end __construct()
+
+
+	 /**
+	  * Processes this test when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The current file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  * @param int                  $currScope A pointer to the start of the scope.
+	  *
+	  * @return void
+	  */
+	 protected function processTokenWithinScope(
+		  PHP_CodeSniffer_File $phpcsFile,
+		  $stackPtr,
+		  $currScope
+	 ) {
+		  $className = $phpcsFile->getDeclarationName($currScope);
+		  if ($className !== $this->_currentClass) {
+				$this->loadFunctionNamesInScope($phpcsFile, $currScope);
+				$this->_currentClass = $className;
+		  }
+
+		  $methodName = $phpcsFile->getDeclarationName($stackPtr);
+
+		  if (strcasecmp($methodName, $className) === 0) {
+				if (in_array('__construct', $this->_functionList) === false) {
+					 $error = 'PHP4 style constructors are not allowed; use "__construct()" instead';
+					 $phpcsFile->addError($error, $stackPtr, 'OldStyle');
+				}
+		  } else if (strcasecmp($methodName, '__construct') !== 0) {
+				// Not a constructor.
+				return;
+		  }
+
+		  $tokens = $phpcsFile->getTokens();
+
+		  $parentClassName = $phpcsFile->findExtendedClassName($currScope);
+		  if ($parentClassName === false) {
+				return;
+		  }
+
+		  // Stop if the constructor doesn't have a body, like when it is abstract.
+		  if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+				return;
+		  }
+
+		  $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
+		  $startIndex       = $stackPtr;
+		  while (($doubleColonIndex = $phpcsFile->findNext(T_DOUBLE_COLON, $startIndex, $endFunctionIndex)) !== false) {
+				if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
+					 && $tokens[($doubleColonIndex + 1)]['content'] === $parentClassName
+				) {
+					 $error = 'PHP4 style calls to parent constructors are not allowed; use "parent::__construct()" instead';
+					 $phpcsFile->addError($error, ($doubleColonIndex + 1), 'OldStyleCall');
+				}
+
+				$startIndex = ($doubleColonIndex + 1);
+		  }
+
+	 }//end processTokenWithinScope()
+
+
+	 /**
+	  * Extracts all the function names found in the given scope.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The current file being scanned.
+	  * @param int                  $currScope A pointer to the start of the scope.
+	  *
+	  * @return void
+	  */
+	 protected function loadFunctionNamesInScope(PHP_CodeSniffer_File $phpcsFile, $currScope)
+	 {
+		  $this->_functionList = array();
+		  $tokens = $phpcsFile->getTokens();
+
+		  for ($i = ($tokens[$currScope]['scope_opener'] + 1); $i < $tokens[$currScope]['scope_closer']; $i++) {
+				if ($tokens[$i]['code'] !== T_FUNCTION) {
+					 continue;
+				}
+
+				$next = $phpcsFile->findNext(T_STRING, $i);
+				$this->_functionList[] = trim($tokens[$next]['content']);
+		  }
+
+	 }//end loadFunctionNamesInScope()
 
 
 }//end class

Spacing +25 added lines, -25 removed lines

@@ -13,9 +13,9 @@ 
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
+if ( class_exists( 'PHP_CodeSniffer_Standards_AbstractScopeSniff', true ) === false ) {
     $error = 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found';
-    throw new PHP_CodeSniffer_Exception($error);
+    throw new PHP_CodeSniffer_Exception( $error );
 }
 
 /**
@@ -54,7 +54,7 @@ 
      */
     public function __construct()
     {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+        parent::__construct( array( T_CLASS, T_INTERFACE ), array( T_FUNCTION ), true );
 
     }//end __construct()
 
@@ -74,47 +74,47 @@ 
         $stackPtr,
         $currScope
     ) {
-        $className = $phpcsFile->getDeclarationName($currScope);
-        if ($className !== $this->_currentClass) {
-            $this->loadFunctionNamesInScope($phpcsFile, $currScope);
+        $className = $phpcsFile->getDeclarationName( $currScope );
+        if ( $className !== $this->_currentClass ) {
+            $this->loadFunctionNamesInScope( $phpcsFile, $currScope );
             $this->_currentClass = $className;
         }
 
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
+        $methodName = $phpcsFile->getDeclarationName( $stackPtr );
 
-        if (strcasecmp($methodName, $className) === 0) {
-            if (in_array('__construct', $this->_functionList) === false) {
+        if ( strcasecmp( $methodName, $className ) === 0 ) {
+            if ( in_array( '__construct', $this->_functionList ) === false ) {
                 $error = 'PHP4 style constructors are not allowed; use "__construct()" instead';
-                $phpcsFile->addError($error, $stackPtr, 'OldStyle');
+                $phpcsFile->addError( $error, $stackPtr, 'OldStyle' );
             }
-        } else if (strcasecmp($methodName, '__construct') !== 0) {
+        } else if ( strcasecmp( $methodName, '__construct' ) !== 0 ) {
             // Not a constructor.
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
-        if ($parentClassName === false) {
+        $parentClassName = $phpcsFile->findExtendedClassName( $currScope );
+        if ( $parentClassName === false ) {
             return;
         }
 
         // Stop if the constructor doesn't have a body, like when it is abstract.
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             return;
         }
 
-        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
+        $endFunctionIndex = $tokens[ $stackPtr ][ 'scope_closer' ];
         $startIndex       = $stackPtr;
-        while (($doubleColonIndex = $phpcsFile->findNext(T_DOUBLE_COLON, $startIndex, $endFunctionIndex)) !== false) {
-            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
-                && $tokens[($doubleColonIndex + 1)]['content'] === $parentClassName
+        while ( ( $doubleColonIndex = $phpcsFile->findNext( T_DOUBLE_COLON, $startIndex, $endFunctionIndex ) ) !== false ) {
+            if ( $tokens[ ( $doubleColonIndex + 1 ) ][ 'code' ] === T_STRING
+                && $tokens[ ( $doubleColonIndex + 1 ) ][ 'content' ] === $parentClassName
             ) {
                 $error = 'PHP4 style calls to parent constructors are not allowed; use "parent::__construct()" instead';
-                $phpcsFile->addError($error, ($doubleColonIndex + 1), 'OldStyleCall');
+                $phpcsFile->addError( $error, ( $doubleColonIndex + 1 ), 'OldStyleCall' );
             }
 
-            $startIndex = ($doubleColonIndex + 1);
+            $startIndex = ( $doubleColonIndex + 1 );
         }
 
     }//end processTokenWithinScope()
@@ -128,18 +128,18 @@ 
      *
      * @return void
      */
-    protected function loadFunctionNamesInScope(PHP_CodeSniffer_File $phpcsFile, $currScope)
+    protected function loadFunctionNamesInScope( PHP_CodeSniffer_File $phpcsFile, $currScope )
     {
         $this->_functionList = array();
         $tokens = $phpcsFile->getTokens();
 
-        for ($i = ($tokens[$currScope]['scope_opener'] + 1); $i < $tokens[$currScope]['scope_closer']; $i++) {
-            if ($tokens[$i]['code'] !== T_FUNCTION) {
+        for ( $i = ( $tokens[ $currScope ][ 'scope_opener' ] + 1 ); $i < $tokens[ $currScope ][ 'scope_closer' ]; $i++ ) {
+            if ( $tokens[ $i ][ 'code' ] !== T_FUNCTION ) {
                 continue;
             }
 
-            $next = $phpcsFile->findNext(T_STRING, $i);
-            $this->_functionList[] = trim($tokens[$next]['content']);
+            $next = $phpcsFile->findNext( T_STRING, $i );
+            $this->_functionList[ ] = trim( $tokens[ $next ][ 'content' ] );
         }
 
     }//end loadFunctionNamesInScope()

Braces +3 added lines, -6 removed lines

@@ -31,8 +31,7 @@ 
  * @version  Release: @package_version@
  * @link     http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_NamingConventions_ConstructorNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff
-{
+class Generic_Sniffs_NamingConventions_ConstructorNameSniff extends PHP_CodeSniffer_Standards_AbstractScopeSniff {
 
     /**
      * The name of the class we are currently checking.
@@ -52,8 +51,7 @@ 
     /**
      * Constructs the test with the tokens it wishes to listen for.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
 
     }//end __construct()
@@ -128,8 +126,7 @@ 
      *
      * @return void
      */
-    protected function loadFunctionNamesInScope(PHP_CodeSniffer_File $phpcsFile, $currScope)
-    {
+    protected function loadFunctionNamesInScope(PHP_CodeSniffer_File $phpcsFile, $currScope) {
         $this->_functionList = array();
         $tokens = $phpcsFile->getTokens();
 

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php

Indentation +96 added lines, -96 removed lines

@@ -26,102 +26,102 @@
 class Generic_Sniffs_Classes_DuplicateClassNameSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * List of classes that have been found during checking.
-     *
-     * @var array
-     */
-    public $foundClasses = array();
-
-
-    /**
-     * Registers the tokens that this sniff wants to listen for.
-     *
-     * @return int[]
-     */
-    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 void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $namespace  = '';
-        $findTokens = array(
-                       T_CLASS,
-                       T_INTERFACE,
-                       T_NAMESPACE,
-                       T_CLOSE_TAG,
-                      );
-
-        $stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
-        while ($stackPtr !== false) {
-            if ($tokens[$stackPtr]['code'] === T_CLOSE_TAG) {
-                // We can stop here. The sniff will continue from the next open
-                // tag when PHPCS reaches that token, if there is one.
-                return;
-            }
-
-            // Keep track of what namespace we are in.
-            if ($tokens[$stackPtr]['code'] === T_NAMESPACE) {
-                $nsEnd = $phpcsFile->findNext(
-                    array(
-                     T_NS_SEPARATOR,
-                     T_STRING,
-                     T_WHITESPACE,
-                    ),
-                    ($stackPtr + 1),
-                    null,
-                    true
-                );
-
-                $namespace = trim($phpcsFile->getTokensAsString(($stackPtr + 1), ($nsEnd - $stackPtr - 1)));
-                $stackPtr  = $nsEnd;
-            } else {
-                $nameToken = $phpcsFile->findNext(T_STRING, $stackPtr);
-                $name      = $tokens[$nameToken]['content'];
-                if ($namespace !== '') {
-                    $name = $namespace.'\\'.$name;
-                }
-
-                $compareName = strtolower($name);
-                if (isset($this->foundClasses[$compareName]) === true) {
-                    $type  = strtolower($tokens[$stackPtr]['content']);
-                    $file  = $this->foundClasses[$compareName]['file'];
-                    $line  = $this->foundClasses[$compareName]['line'];
-                    $error = 'Duplicate %s name "%s" found; first defined in %s on line %s';
-                    $data  = array(
-                              $type,
-                              $name,
-                              $file,
-                              $line,
-                             );
-                    $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
-                } else {
-                    $this->foundClasses[$compareName] = array(
-                                                         'file' => $phpcsFile->getFilename(),
-                                                         'line' => $tokens[$stackPtr]['line'],
-                                                        );
-                }
-            }//end if
-
-            $stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
-        }//end while
-
-    }//end process()
+	 /**
+	  * List of classes that have been found during checking.
+	  *
+	  * @var array
+	  */
+	 public $foundClasses = array();
+
+
+	 /**
+	  * Registers the tokens that this sniff wants to listen for.
+	  *
+	  * @return int[]
+	  */
+	 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 void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  $namespace  = '';
+		  $findTokens = array(
+							  T_CLASS,
+							  T_INTERFACE,
+							  T_NAMESPACE,
+							  T_CLOSE_TAG,
+							 );
+
+		  $stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
+		  while ($stackPtr !== false) {
+				if ($tokens[$stackPtr]['code'] === T_CLOSE_TAG) {
+					 // We can stop here. The sniff will continue from the next open
+					 // tag when PHPCS reaches that token, if there is one.
+					 return;
+				}
+
+				// Keep track of what namespace we are in.
+				if ($tokens[$stackPtr]['code'] === T_NAMESPACE) {
+					 $nsEnd = $phpcsFile->findNext(
+						  array(
+							T_NS_SEPARATOR,
+							T_STRING,
+							T_WHITESPACE,
+						  ),
+						  ($stackPtr + 1),
+						  null,
+						  true
+					 );
+
+					 $namespace = trim($phpcsFile->getTokensAsString(($stackPtr + 1), ($nsEnd - $stackPtr - 1)));
+					 $stackPtr  = $nsEnd;
+				} else {
+					 $nameToken = $phpcsFile->findNext(T_STRING, $stackPtr);
+					 $name      = $tokens[$nameToken]['content'];
+					 if ($namespace !== '') {
+						  $name = $namespace.'\\'.$name;
+					 }
+
+					 $compareName = strtolower($name);
+					 if (isset($this->foundClasses[$compareName]) === true) {
+						  $type  = strtolower($tokens[$stackPtr]['content']);
+						  $file  = $this->foundClasses[$compareName]['file'];
+						  $line  = $this->foundClasses[$compareName]['line'];
+						  $error = 'Duplicate %s name "%s" found; first defined in %s on line %s';
+						  $data  = array(
+										$type,
+										$name,
+										$file,
+										$line,
+									  );
+						  $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
+					 } else {
+						  $this->foundClasses[$compareName] = array(
+																			'file' => $phpcsFile->getFilename(),
+																			'line' => $tokens[$stackPtr]['line'],
+																		  );
+					 }
+				}//end if
+
+				$stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
+		  }//end while
+
+	 }//end process()
 
 
 }//end class

Spacing +21 added lines, -21 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -55,7 +55,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -67,41 +67,41 @@ 
                        T_CLOSE_TAG,
                       );
 
-        $stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
-        while ($stackPtr !== false) {
-            if ($tokens[$stackPtr]['code'] === T_CLOSE_TAG) {
+        $stackPtr = $phpcsFile->findNext( $findTokens, ( $stackPtr + 1 ) );
+        while ( $stackPtr !== false ) {
+            if ( $tokens[ $stackPtr ][ 'code' ] === T_CLOSE_TAG ) {
                 // We can stop here. The sniff will continue from the next open
                 // tag when PHPCS reaches that token, if there is one.
                 return;
             }
 
             // Keep track of what namespace we are in.
-            if ($tokens[$stackPtr]['code'] === T_NAMESPACE) {
+            if ( $tokens[ $stackPtr ][ 'code' ] === T_NAMESPACE ) {
                 $nsEnd = $phpcsFile->findNext(
                     array(
                      T_NS_SEPARATOR,
                      T_STRING,
                      T_WHITESPACE,
                     ),
-                    ($stackPtr + 1),
+                    ( $stackPtr + 1 ),
                     null,
                     true
                 );
 
-                $namespace = trim($phpcsFile->getTokensAsString(($stackPtr + 1), ($nsEnd - $stackPtr - 1)));
+                $namespace = trim( $phpcsFile->getTokensAsString( ( $stackPtr + 1 ), ( $nsEnd - $stackPtr - 1 ) ) );
                 $stackPtr  = $nsEnd;
             } else {
-                $nameToken = $phpcsFile->findNext(T_STRING, $stackPtr);
-                $name      = $tokens[$nameToken]['content'];
-                if ($namespace !== '') {
-                    $name = $namespace.'\\'.$name;
+                $nameToken = $phpcsFile->findNext( T_STRING, $stackPtr );
+                $name      = $tokens[ $nameToken ][ 'content' ];
+                if ( $namespace !== '' ) {
+                    $name = $namespace . '\\' . $name;
                 }
 
-                $compareName = strtolower($name);
-                if (isset($this->foundClasses[$compareName]) === true) {
-                    $type  = strtolower($tokens[$stackPtr]['content']);
-                    $file  = $this->foundClasses[$compareName]['file'];
-                    $line  = $this->foundClasses[$compareName]['line'];
+                $compareName = strtolower( $name );
+                if ( isset( $this->foundClasses[ $compareName ] ) === true ) {
+                    $type  = strtolower( $tokens[ $stackPtr ][ 'content' ] );
+                    $file  = $this->foundClasses[ $compareName ][ 'file' ];
+                    $line  = $this->foundClasses[ $compareName ][ 'line' ];
                     $error = 'Duplicate %s name "%s" found; first defined in %s on line %s';
                     $data  = array(
                               $type,
@@ -109,16 +109,16 @@ 
                               $file,
                               $line,
                              );
-                    $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
+                    $phpcsFile->addWarning( $error, $stackPtr, 'Found', $data );
                 } else {
-                    $this->foundClasses[$compareName] = array(
+                    $this->foundClasses[ $compareName ] = array(
                                                          'file' => $phpcsFile->getFilename(),
-                                                         'line' => $tokens[$stackPtr]['line'],
+                                                         'line' => $tokens[ $stackPtr ][ 'line' ],
                                                         );
                 }
             }//end if
 
-            $stackPtr = $phpcsFile->findNext($findTokens, ($stackPtr + 1));
+            $stackPtr = $phpcsFile->findNext( $findTokens, ( $stackPtr + 1 ) );
         }//end while
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_Classes_DuplicateClassNameSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_Classes_DuplicateClassNameSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * List of classes that have been found during checking.
@@ -39,8 +38,7 @@ 
      *
      * @return int[]
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_TAG);
 
     }//end register()
@@ -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();
 
         $namespace  = '';

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php

Indentation +102 added lines, -102 removed lines

@@ -34,108 +34,108 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_CLASS,
-                T_INTERFACE,
-                T_TRAIT,
-               );
-
-    }//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();
-        $scope_identifier = $phpcsFile->findNext(T_STRING, ($stackPtr + 1));
-        $errorData        = array(strtolower($tokens[$stackPtr]['content']).' '.$tokens[$scope_identifier]['content']);
-
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
-            $error = 'Possible parse error: %s missing opening or closing brace';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $errorData);
-            return;
-        }
-
-        $openingBrace = $tokens[$stackPtr]['scope_opener'];
-
-        // Is the brace on the same line as the class/interface/trait declaration ?
-        $lastClassLineToken = $phpcsFile->findPrevious(T_STRING, ($openingBrace - 1), $stackPtr);
-        $lastClassLine      = $tokens[$lastClassLineToken]['line'];
-        $braceLine          = $tokens[$openingBrace]['line'];
-        $lineDifference     = ($braceLine - $lastClassLine);
-
-        if ($lineDifference > 0) {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'new line');
-            $error = 'Opening brace should be on the same line as the declaration for %s';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'BraceOnNewLine', $errorData);
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContent($lastClassLineToken, ' {');
-                $phpcsFile->fixer->replaceToken($openingBrace, '');
-                $phpcsFile->fixer->endChangeset();
-            }
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'same line');
-        }
-
-        // Is the opening brace the last thing on the line ?
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($openingBrace + 1), null, true);
-        if ($tokens[$next]['line'] === $tokens[$openingBrace]['line']) {
-            if ($next === $tokens[$stackPtr]['scope_closer']) {
-                // Ignore empty classes.
-                return;
-            }
-
-            $error = 'Opening brace must be the last content on the line';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($openingBrace);
-            }
-        }
-
-        // Only continue checking if the opening brace looks good.
-        if ($lineDifference > 0) {
-            return;
-        }
-
-        // Is there precisely one space before the opening brace ?
-        if ($tokens[($openingBrace - 1)]['code'] !== T_WHITESPACE) {
-            $length = 0;
-        } else if ($tokens[($openingBrace - 1)]['content'] === "\t") {
-            $length = '\t';
-        } else {
-            $length = strlen($tokens[($openingBrace - 1)]['content']);
-        }
-
-        if ($length !== 1) {
-            $error = 'Expected 1 space before opening brace; found %s';
-            $data  = array($length);
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'SpaceBeforeBrace', $data);
-            if ($fix === true) {
-                if ($length === 0 || $length === '\t') {
-                    $phpcsFile->fixer->addContentBefore($openingBrace, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken(($openingBrace - 1), ' ');
-                }
-            }
-        }
-
-    }//end process()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_CLASS,
+					 T_INTERFACE,
+					 T_TRAIT,
+					);
+
+	 }//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();
+		  $scope_identifier = $phpcsFile->findNext(T_STRING, ($stackPtr + 1));
+		  $errorData        = array(strtolower($tokens[$stackPtr]['content']).' '.$tokens[$scope_identifier]['content']);
+
+		  if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+				$error = 'Possible parse error: %s missing opening or closing brace';
+				$phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $errorData);
+				return;
+		  }
+
+		  $openingBrace = $tokens[$stackPtr]['scope_opener'];
+
+		  // Is the brace on the same line as the class/interface/trait declaration ?
+		  $lastClassLineToken = $phpcsFile->findPrevious(T_STRING, ($openingBrace - 1), $stackPtr);
+		  $lastClassLine      = $tokens[$lastClassLineToken]['line'];
+		  $braceLine          = $tokens[$openingBrace]['line'];
+		  $lineDifference     = ($braceLine - $lastClassLine);
+
+		  if ($lineDifference > 0) {
+				$phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'new line');
+				$error = 'Opening brace should be on the same line as the declaration for %s';
+				$fix   = $phpcsFile->addFixableError($error, $openingBrace, 'BraceOnNewLine', $errorData);
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 $phpcsFile->fixer->addContent($lastClassLineToken, ' {');
+					 $phpcsFile->fixer->replaceToken($openingBrace, '');
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  } else {
+				$phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'same line');
+		  }
+
+		  // Is the opening brace the last thing on the line ?
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($openingBrace + 1), null, true);
+		  if ($tokens[$next]['line'] === $tokens[$openingBrace]['line']) {
+				if ($next === $tokens[$stackPtr]['scope_closer']) {
+					 // Ignore empty classes.
+					 return;
+				}
+
+				$error = 'Opening brace must be the last content on the line';
+				$fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
+				if ($fix === true) {
+					 $phpcsFile->fixer->addNewline($openingBrace);
+				}
+		  }
+
+		  // Only continue checking if the opening brace looks good.
+		  if ($lineDifference > 0) {
+				return;
+		  }
+
+		  // Is there precisely one space before the opening brace ?
+		  if ($tokens[($openingBrace - 1)]['code'] !== T_WHITESPACE) {
+				$length = 0;
+		  } else if ($tokens[($openingBrace - 1)]['content'] === "\t") {
+				$length = '\t';
+		  } else {
+				$length = strlen($tokens[($openingBrace - 1)]['content']);
+		  }
+
+		  if ($length !== 1) {
+				$error = 'Expected 1 space before opening brace; found %s';
+				$data  = array($length);
+				$fix   = $phpcsFile->addFixableError($error, $openingBrace, 'SpaceBeforeBrace', $data);
+				if ($fix === true) {
+					 if ($length === 0 || $length === '\t') {
+						  $phpcsFile->fixer->addContentBefore($openingBrace, ' ');
+					 } else {
+						  $phpcsFile->fixer->replaceToken(($openingBrace - 1), ' ');
+					 }
+				}
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +34 added lines, -34 removed lines

@@ -59,78 +59,78 @@
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens           = $phpcsFile->getTokens();
-        $scope_identifier = $phpcsFile->findNext(T_STRING, ($stackPtr + 1));
-        $errorData        = array(strtolower($tokens[$stackPtr]['content']).' '.$tokens[$scope_identifier]['content']);
+        $scope_identifier = $phpcsFile->findNext( T_STRING, ( $stackPtr + 1 ) );
+        $errorData        = array( strtolower( $tokens[ $stackPtr ][ 'content' ] ) . ' ' . $tokens[ $scope_identifier ][ 'content' ] );
 
-        if (isset($tokens[$stackPtr]['scope_opener']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ] ) === false ) {
             $error = 'Possible parse error: %s missing opening or closing brace';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingBrace', $errorData);
+            $phpcsFile->addWarning( $error, $stackPtr, 'MissingBrace', $errorData );
             return;
         }
 
-        $openingBrace = $tokens[$stackPtr]['scope_opener'];
+        $openingBrace = $tokens[ $stackPtr ][ 'scope_opener' ];
 
         // Is the brace on the same line as the class/interface/trait declaration ?
-        $lastClassLineToken = $phpcsFile->findPrevious(T_STRING, ($openingBrace - 1), $stackPtr);
-        $lastClassLine      = $tokens[$lastClassLineToken]['line'];
-        $braceLine          = $tokens[$openingBrace]['line'];
-        $lineDifference     = ($braceLine - $lastClassLine);
+        $lastClassLineToken = $phpcsFile->findPrevious( T_STRING, ( $openingBrace - 1 ), $stackPtr );
+        $lastClassLine      = $tokens[ $lastClassLineToken ][ 'line' ];
+        $braceLine          = $tokens[ $openingBrace ][ 'line' ];
+        $lineDifference     = ( $braceLine - $lastClassLine );
 
-        if ($lineDifference > 0) {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'new line');
+        if ( $lineDifference > 0 ) {
+            $phpcsFile->recordMetric( $stackPtr, 'Class opening brace placement', 'new line' );
             $error = 'Opening brace should be on the same line as the declaration for %s';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'BraceOnNewLine', $errorData);
-            if ($fix === true) {
+            $fix   = $phpcsFile->addFixableError( $error, $openingBrace, 'BraceOnNewLine', $errorData );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContent($lastClassLineToken, ' {');
-                $phpcsFile->fixer->replaceToken($openingBrace, '');
+                $phpcsFile->fixer->addContent( $lastClassLineToken, ' {' );
+                $phpcsFile->fixer->replaceToken( $openingBrace, '' );
                 $phpcsFile->fixer->endChangeset();
             }
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'same line');
+            $phpcsFile->recordMetric( $stackPtr, 'Class opening brace placement', 'same line' );
         }
 
         // Is the opening brace the last thing on the line ?
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($openingBrace + 1), null, true);
-        if ($tokens[$next]['line'] === $tokens[$openingBrace]['line']) {
-            if ($next === $tokens[$stackPtr]['scope_closer']) {
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $openingBrace + 1 ), null, true );
+        if ( $tokens[ $next ][ 'line' ] === $tokens[ $openingBrace ][ 'line' ] ) {
+            if ( $next === $tokens[ $stackPtr ][ 'scope_closer' ] ) {
                 // Ignore empty classes.
                 return;
             }
 
             $error = 'Opening brace must be the last content on the line';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($openingBrace);
+            $fix   = $phpcsFile->addFixableError( $error, $openingBrace, 'ContentAfterBrace' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->addNewline( $openingBrace );
             }
         }
 
         // Only continue checking if the opening brace looks good.
-        if ($lineDifference > 0) {
+        if ( $lineDifference > 0 ) {
             return;
         }
 
         // Is there precisely one space before the opening brace ?
-        if ($tokens[($openingBrace - 1)]['code'] !== T_WHITESPACE) {
+        if ( $tokens[ ( $openingBrace - 1 ) ][ 'code' ] !== T_WHITESPACE ) {
             $length = 0;
-        } else if ($tokens[($openingBrace - 1)]['content'] === "\t") {
+        } else if ( $tokens[ ( $openingBrace - 1 ) ][ 'content' ] === "\t" ) {
             $length = '\t';
         } else {
-            $length = strlen($tokens[($openingBrace - 1)]['content']);
+            $length = strlen( $tokens[ ( $openingBrace - 1 ) ][ 'content' ] );
         }
 
-        if ($length !== 1) {
+        if ( $length !== 1 ) {
             $error = 'Expected 1 space before opening brace; found %s';
-            $data  = array($length);
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'SpaceBeforeBrace', $data);
-            if ($fix === true) {
-                if ($length === 0 || $length === '\t') {
-                    $phpcsFile->fixer->addContentBefore($openingBrace, ' ');
+            $data  = array( $length );
+            $fix   = $phpcsFile->addFixableError( $error, $openingBrace, 'SpaceBeforeBrace', $data );
+            if ( $fix === true ) {
+                if ( $length === 0 || $length === '\t' ) {
+                    $phpcsFile->fixer->addContentBefore( $openingBrace, ' ' );
                 } else {
-                    $phpcsFile->fixer->replaceToken(($openingBrace - 1), ' ');
+                    $phpcsFile->fixer->replaceToken( ( $openingBrace - 1 ), ' ' );
                 }
             }
         }

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_Classes_OpeningBraceSameLineSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_Classes_OpeningBraceSameLineSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -39,8 +38,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_CLASS,
                 T_INTERFACE,
@@ -59,8 +57,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens           = $phpcsFile->getTokens();
         $scope_identifier = $phpcsFile->findNext(T_STRING, ($stackPtr + 1));
         $errorData        = array(strtolower($tokens[$stackPtr]['content']).' '.$tokens[$scope_identifier]['content']);

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

Indentation +329 added lines, -329 removed lines

@@ -30,335 +30,335 @@
 class Squiz_Sniffs_Formatting_OperatorBracketSniff 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 PHP_CodeSniffer_Tokens::$operators;
-
-    }//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 ($phpcsFile->tokenizerType === 'JS' && $tokens[$stackPtr]['code'] === T_PLUS) {
-            // JavaScript uses the plus operator for string concatenation as well
-            // so we cannot accurately determine if it is a string concat or addition.
-            // So just ignore it.
-            return;
-        }
-
-        // If the & is a reference, then we don't want to check for brackets.
-        if ($tokens[$stackPtr]['code'] === T_BITWISE_AND && $phpcsFile->isReference($stackPtr) === true) {
-            return;
-        }
-
-        // There is one instance where brackets aren't needed, which involves
-        // the minus sign being used to assign a negative number to a variable.
-        if ($tokens[$stackPtr]['code'] === T_MINUS) {
-            // Check to see if we are trying to return -n.
-            $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-            if ($tokens[$prev]['code'] === T_RETURN) {
-                return;
-            }
-
-            $number = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if ($tokens[$number]['code'] === T_LNUMBER || $tokens[$number]['code'] === T_DNUMBER) {
-                $previous = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-                if ($previous !== false) {
-                    $isAssignment = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens);
-                    $isEquality   = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$equalityTokens);
-                    $isComparison = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens);
-                    if ($isAssignment === true || $isEquality === true || $isComparison === true) {
-                        // This is a negative assignment or comparison.
-                        // We need to check that the minus and the number are
-                        // adjacent.
-                        if (($number - $stackPtr) !== 1) {
-                            $error = 'No space allowed between minus sign and number';
-                            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterMinus');
-                        }
-
-                        return;
-                    }
-                }
-            }
-        }//end if
-
-        $previousToken = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true, null, true);
-        if ($previousToken !== false) {
-            // A list of tokens that indicate that the token is not
-            // part of an arithmetic operation.
-            $invalidTokens = array(
-                              T_COMMA,
-                              T_COLON,
-                              T_OPEN_PARENTHESIS,
-                              T_OPEN_SQUARE_BRACKET,
-                              T_OPEN_SHORT_ARRAY,
-                              T_CASE,
-                             );
-
-            if (in_array($tokens[$previousToken]['code'], $invalidTokens) === true) {
-                return;
-            }
-        }
-
-        // Tokens that are allowed inside a bracketed operation.
-        $allowed = array(
-                    T_VARIABLE,
-                    T_LNUMBER,
-                    T_DNUMBER,
-                    T_STRING,
-                    T_WHITESPACE,
-                    T_THIS,
-                    T_SELF,
-                    T_OBJECT_OPERATOR,
-                    T_DOUBLE_COLON,
-                    T_OPEN_SQUARE_BRACKET,
-                    T_CLOSE_SQUARE_BRACKET,
-                    T_MODULUS,
-                    T_NONE,
-                   );
-
-        $allowed += PHP_CodeSniffer_Tokens::$operators;
-
-        $lastBracket = false;
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $parenthesis = array_reverse($tokens[$stackPtr]['nested_parenthesis'], true);
-            foreach ($parenthesis as $bracket => $endBracket) {
-                $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($bracket - 1), null, true);
-                $prevCode  = $tokens[$prevToken]['code'];
-
-                if ($prevCode === T_ISSET) {
-                    // This operation is inside an isset() call, but has
-                    // no bracket of it's own.
-                    break;
-                }
-
-                if ($prevCode === T_STRING || $prevCode === T_SWITCH) {
-                    // We allow simple operations to not be bracketed.
-                    // For example, ceil($one / $two).
-                    for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
-                        if (in_array($tokens[$prev]['code'], $allowed) === true) {
-                            continue;
-                        }
-
-                        if ($tokens[$prev]['code'] === T_CLOSE_PARENTHESIS) {
-                            $prev = $tokens[$prev]['parenthesis_opener'];
-                        } else {
-                            break;
-                        }
-                    }
-
-                    if ($prev !== $bracket) {
-                        break;
-                    }
-
-                    for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
-                        if (in_array($tokens[$next]['code'], $allowed) === true) {
-                            continue;
-                        }
-
-                        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
-                            $next = $tokens[$next]['parenthesis_closer'];
-                        } else {
-                            break;
-                        }
-                    }
-
-                    if ($next !== $endBracket) {
-                        break;
-                    }
-                }//end if
-
-                if (in_array($prevCode, PHP_CodeSniffer_Tokens::$scopeOpeners) === true) {
-                    // This operation is inside a control structure like FOREACH
-                    // or IF, but has no bracket of it's own.
-                    // The only control structure allowed to do this is SWITCH.
-                    if ($prevCode !== T_SWITCH) {
-                        break;
-                    }
-                }
-
-                if ($prevCode === T_OPEN_PARENTHESIS) {
-                    // These are two open parenthesis in a row. If the current
-                    // one doesn't enclose the operator, go to the previous one.
-                    if ($endBracket < $stackPtr) {
-                        continue;
-                    }
-                }
-
-                $lastBracket = $bracket;
-                break;
-            }//end foreach
-        }//end if
-
-        if ($lastBracket === false) {
-            // It is not in a bracketed statement at all.
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
-            return;
-        } else if ($tokens[$lastBracket]['parenthesis_closer'] < $stackPtr) {
-            // There are a set of brackets in front of it that don't include it.
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
-            return;
-        } else {
-            // We are enclosed in a set of bracket, so the last thing to
-            // check is that we are not also enclosed in square brackets
-            // like this: ($array[$index + 1]), which is invalid.
-            $brackets = array(
-                         T_OPEN_SQUARE_BRACKET,
-                         T_CLOSE_SQUARE_BRACKET,
-                        );
-
-            $squareBracket = $phpcsFile->findPrevious($brackets, ($stackPtr - 1), $lastBracket);
-            if ($squareBracket !== false && $tokens[$squareBracket]['code'] === T_OPEN_SQUARE_BRACKET) {
-                $closeSquareBracket = $phpcsFile->findNext($brackets, ($stackPtr + 1));
-                if ($closeSquareBracket !== false && $tokens[$closeSquareBracket]['code'] === T_CLOSE_SQUARE_BRACKET) {
-                    $this->addMissingBracketsError($phpcsFile, $stackPtr);
-                }
-            }
-
-            return;
-        }//end if
-
-        $lastAssignment = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$assignmentTokens, $stackPtr, null, false, null, true);
-        if ($lastAssignment !== false && $lastAssignment > $lastBracket) {
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
-        }
-
-    }//end process()
-
-
-    /**
-     * Add and fix the missing brackets error.
-     *
-     * @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 addMissingBracketsError(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $error = 'Arithmetic operation must be bracketed';
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MissingBrackets');
-
-        if ($fix === false || $phpcsFile->fixer->enabled === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $allowed = array(
-                    T_VARIABLE        => true,
-                    T_LNUMBER         => true,
-                    T_DNUMBER         => true,
-                    T_STRING          => true,
-                    T_WHITESPACE      => true,
-                    T_THIS            => true,
-                    T_SELF            => true,
-                    T_OBJECT_OPERATOR => true,
-                    T_DOUBLE_COLON    => true,
-                    T_MODULUS         => true,
-                    T_ISSET           => true,
-                    T_ARRAY           => true,
-                    T_NONE            => true,
-                   );
-
-        // Find the first token in the expression.
-        for ($before = ($stackPtr - 1); $before > 0; $before--) {
-            // Special case for plus operators because we can't tell if they are used
-            // for addition or string contact. So assume string concat to be safe.
-            if ($phpcsFile->tokenizerType === 'JS' && $tokens[$before]['code'] === T_PLUS) {
-                break;
-            }
-
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$before]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$before]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$before]['code']]) === true
-                || isset($allowed[$tokens[$before]['code']]) === true
-            ) {
-                continue;
-            }
-
-            if ($tokens[$before]['code'] === T_CLOSE_PARENTHESIS) {
-                $before = $tokens[$before]['parenthesis_opener'];
-                continue;
-            }
-
-            if ($tokens[$before]['code'] === T_CLOSE_SQUARE_BRACKET) {
-                $before = $tokens[$before]['bracket_opener'];
-                continue;
-            }
-
-            break;
-        }//end for
-
-        $before = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($before + 1), null, true);
-
-        // Find the last token in the expression.
-        for ($after = ($stackPtr + 1); $after < $phpcsFile->numTokens; $after++) {
-            // Special case for plus operators because we can't tell if they are used
-            // for addition or string contact. So assume string concat to be safe.
-            if ($phpcsFile->tokenizerType === 'JS' && $tokens[$after]['code'] === T_PLUS) {
-                break;
-            }
-
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$after]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$after]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$after]['code']]) === true
-                || isset($allowed[$tokens[$after]['code']]) === true
-            ) {
-                continue;
-            }
-
-            if ($tokens[$after]['code'] === T_OPEN_PARENTHESIS) {
-                $after = $tokens[$after]['parenthesis_closer'];
-                continue;
-            }
-
-            if ($tokens[$after]['code'] === T_OPEN_SQUARE_BRACKET) {
-                $after = $tokens[$after]['bracket_closer'];
-                continue;
-            }
-
-            break;
-        }//end for
-
-        $after = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($after - 1), null, true);
-
-        // Can only fix this error if both tokens are available for fixing.
-        // Adding one bracket without the other will create parse errors.
-        $phpcsFile->fixer->beginChangeset();
-        $phpcsFile->fixer->replaceToken($before, '('.$tokens[$before]['content']);
-        $phpcsFile->fixer->replaceToken($after, $tokens[$after]['content'].')');
-        $phpcsFile->fixer->endChangeset();
-
-    }//end addMissingBracketsError()
+	 /**
+	  * 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 PHP_CodeSniffer_Tokens::$operators;
+
+	 }//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 ($phpcsFile->tokenizerType === 'JS' && $tokens[$stackPtr]['code'] === T_PLUS) {
+				// JavaScript uses the plus operator for string concatenation as well
+				// so we cannot accurately determine if it is a string concat or addition.
+				// So just ignore it.
+				return;
+		  }
+
+		  // If the & is a reference, then we don't want to check for brackets.
+		  if ($tokens[$stackPtr]['code'] === T_BITWISE_AND && $phpcsFile->isReference($stackPtr) === true) {
+				return;
+		  }
+
+		  // There is one instance where brackets aren't needed, which involves
+		  // the minus sign being used to assign a negative number to a variable.
+		  if ($tokens[$stackPtr]['code'] === T_MINUS) {
+				// Check to see if we are trying to return -n.
+				$prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+				if ($tokens[$prev]['code'] === T_RETURN) {
+					 return;
+				}
+
+				$number = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+				if ($tokens[$number]['code'] === T_LNUMBER || $tokens[$number]['code'] === T_DNUMBER) {
+					 $previous = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+					 if ($previous !== false) {
+						  $isAssignment = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens);
+						  $isEquality   = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$equalityTokens);
+						  $isComparison = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens);
+						  if ($isAssignment === true || $isEquality === true || $isComparison === true) {
+								// This is a negative assignment or comparison.
+								// We need to check that the minus and the number are
+								// adjacent.
+								if (($number - $stackPtr) !== 1) {
+									 $error = 'No space allowed between minus sign and number';
+									 $phpcsFile->addError($error, $stackPtr, 'SpacingAfterMinus');
+								}
+
+								return;
+						  }
+					 }
+				}
+		  }//end if
+
+		  $previousToken = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true, null, true);
+		  if ($previousToken !== false) {
+				// A list of tokens that indicate that the token is not
+				// part of an arithmetic operation.
+				$invalidTokens = array(
+										T_COMMA,
+										T_COLON,
+										T_OPEN_PARENTHESIS,
+										T_OPEN_SQUARE_BRACKET,
+										T_OPEN_SHORT_ARRAY,
+										T_CASE,
+									  );
+
+				if (in_array($tokens[$previousToken]['code'], $invalidTokens) === true) {
+					 return;
+				}
+		  }
+
+		  // Tokens that are allowed inside a bracketed operation.
+		  $allowed = array(
+						  T_VARIABLE,
+						  T_LNUMBER,
+						  T_DNUMBER,
+						  T_STRING,
+						  T_WHITESPACE,
+						  T_THIS,
+						  T_SELF,
+						  T_OBJECT_OPERATOR,
+						  T_DOUBLE_COLON,
+						  T_OPEN_SQUARE_BRACKET,
+						  T_CLOSE_SQUARE_BRACKET,
+						  T_MODULUS,
+						  T_NONE,
+						 );
+
+		  $allowed += PHP_CodeSniffer_Tokens::$operators;
+
+		  $lastBracket = false;
+		  if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
+				$parenthesis = array_reverse($tokens[$stackPtr]['nested_parenthesis'], true);
+				foreach ($parenthesis as $bracket => $endBracket) {
+					 $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($bracket - 1), null, true);
+					 $prevCode  = $tokens[$prevToken]['code'];
+
+					 if ($prevCode === T_ISSET) {
+						  // This operation is inside an isset() call, but has
+						  // no bracket of it's own.
+						  break;
+					 }
+
+					 if ($prevCode === T_STRING || $prevCode === T_SWITCH) {
+						  // We allow simple operations to not be bracketed.
+						  // For example, ceil($one / $two).
+						  for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
+								if (in_array($tokens[$prev]['code'], $allowed) === true) {
+									 continue;
+								}
+
+								if ($tokens[$prev]['code'] === T_CLOSE_PARENTHESIS) {
+									 $prev = $tokens[$prev]['parenthesis_opener'];
+								} else {
+									 break;
+								}
+						  }
+
+						  if ($prev !== $bracket) {
+								break;
+						  }
+
+						  for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
+								if (in_array($tokens[$next]['code'], $allowed) === true) {
+									 continue;
+								}
+
+								if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
+									 $next = $tokens[$next]['parenthesis_closer'];
+								} else {
+									 break;
+								}
+						  }
+
+						  if ($next !== $endBracket) {
+								break;
+						  }
+					 }//end if
+
+					 if (in_array($prevCode, PHP_CodeSniffer_Tokens::$scopeOpeners) === true) {
+						  // This operation is inside a control structure like FOREACH
+						  // or IF, but has no bracket of it's own.
+						  // The only control structure allowed to do this is SWITCH.
+						  if ($prevCode !== T_SWITCH) {
+								break;
+						  }
+					 }
+
+					 if ($prevCode === T_OPEN_PARENTHESIS) {
+						  // These are two open parenthesis in a row. If the current
+						  // one doesn't enclose the operator, go to the previous one.
+						  if ($endBracket < $stackPtr) {
+								continue;
+						  }
+					 }
+
+					 $lastBracket = $bracket;
+					 break;
+				}//end foreach
+		  }//end if
+
+		  if ($lastBracket === false) {
+				// It is not in a bracketed statement at all.
+				$this->addMissingBracketsError($phpcsFile, $stackPtr);
+				return;
+		  } else if ($tokens[$lastBracket]['parenthesis_closer'] < $stackPtr) {
+				// There are a set of brackets in front of it that don't include it.
+				$this->addMissingBracketsError($phpcsFile, $stackPtr);
+				return;
+		  } else {
+				// We are enclosed in a set of bracket, so the last thing to
+				// check is that we are not also enclosed in square brackets
+				// like this: ($array[$index + 1]), which is invalid.
+				$brackets = array(
+								 T_OPEN_SQUARE_BRACKET,
+								 T_CLOSE_SQUARE_BRACKET,
+								);
+
+				$squareBracket = $phpcsFile->findPrevious($brackets, ($stackPtr - 1), $lastBracket);
+				if ($squareBracket !== false && $tokens[$squareBracket]['code'] === T_OPEN_SQUARE_BRACKET) {
+					 $closeSquareBracket = $phpcsFile->findNext($brackets, ($stackPtr + 1));
+					 if ($closeSquareBracket !== false && $tokens[$closeSquareBracket]['code'] === T_CLOSE_SQUARE_BRACKET) {
+						  $this->addMissingBracketsError($phpcsFile, $stackPtr);
+					 }
+				}
+
+				return;
+		  }//end if
+
+		  $lastAssignment = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$assignmentTokens, $stackPtr, null, false, null, true);
+		  if ($lastAssignment !== false && $lastAssignment > $lastBracket) {
+				$this->addMissingBracketsError($phpcsFile, $stackPtr);
+		  }
+
+	 }//end process()
+
+
+	 /**
+	  * Add and fix the missing brackets error.
+	  *
+	  * @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 addMissingBracketsError(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $error = 'Arithmetic operation must be bracketed';
+		  $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MissingBrackets');
+
+		  if ($fix === false || $phpcsFile->fixer->enabled === false) {
+				return;
+		  }
+
+		  $tokens = $phpcsFile->getTokens();
+
+		  $allowed = array(
+						  T_VARIABLE        => true,
+						  T_LNUMBER         => true,
+						  T_DNUMBER         => true,
+						  T_STRING          => true,
+						  T_WHITESPACE      => true,
+						  T_THIS            => true,
+						  T_SELF            => true,
+						  T_OBJECT_OPERATOR => true,
+						  T_DOUBLE_COLON    => true,
+						  T_MODULUS         => true,
+						  T_ISSET           => true,
+						  T_ARRAY           => true,
+						  T_NONE            => true,
+						 );
+
+		  // Find the first token in the expression.
+		  for ($before = ($stackPtr - 1); $before > 0; $before--) {
+				// Special case for plus operators because we can't tell if they are used
+				// for addition or string contact. So assume string concat to be safe.
+				if ($phpcsFile->tokenizerType === 'JS' && $tokens[$before]['code'] === T_PLUS) {
+					 break;
+				}
+
+				if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$before]['code']]) === true
+					 || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$before]['code']]) === true
+					 || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$before]['code']]) === true
+					 || isset($allowed[$tokens[$before]['code']]) === true
+				) {
+					 continue;
+				}
+
+				if ($tokens[$before]['code'] === T_CLOSE_PARENTHESIS) {
+					 $before = $tokens[$before]['parenthesis_opener'];
+					 continue;
+				}
+
+				if ($tokens[$before]['code'] === T_CLOSE_SQUARE_BRACKET) {
+					 $before = $tokens[$before]['bracket_opener'];
+					 continue;
+				}
+
+				break;
+		  }//end for
+
+		  $before = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($before + 1), null, true);
+
+		  // Find the last token in the expression.
+		  for ($after = ($stackPtr + 1); $after < $phpcsFile->numTokens; $after++) {
+				// Special case for plus operators because we can't tell if they are used
+				// for addition or string contact. So assume string concat to be safe.
+				if ($phpcsFile->tokenizerType === 'JS' && $tokens[$after]['code'] === T_PLUS) {
+					 break;
+				}
+
+				if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$after]['code']]) === true
+					 || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$after]['code']]) === true
+					 || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$after]['code']]) === true
+					 || isset($allowed[$tokens[$after]['code']]) === true
+				) {
+					 continue;
+				}
+
+				if ($tokens[$after]['code'] === T_OPEN_PARENTHESIS) {
+					 $after = $tokens[$after]['parenthesis_closer'];
+					 continue;
+				}
+
+				if ($tokens[$after]['code'] === T_OPEN_SQUARE_BRACKET) {
+					 $after = $tokens[$after]['bracket_closer'];
+					 continue;
+				}
+
+				break;
+		  }//end for
+
+		  $after = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($after - 1), null, true);
+
+		  // Can only fix this error if both tokens are available for fixing.
+		  // Adding one bracket without the other will create parse errors.
+		  $phpcsFile->fixer->beginChangeset();
+		  $phpcsFile->fixer->replaceToken($before, '('.$tokens[$before]['content']);
+		  $phpcsFile->fixer->replaceToken($after, $tokens[$after]['content'].')');
+		  $phpcsFile->fixer->endChangeset();
+
+	 }//end addMissingBracketsError()
 
 
 }//end class

Spacing +79 added lines, -79 removed lines

@@ -62,11 +62,11 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if ($phpcsFile->tokenizerType === 'JS' && $tokens[$stackPtr]['code'] === T_PLUS) {
+        if ( $phpcsFile->tokenizerType === 'JS' && $tokens[ $stackPtr ][ 'code' ] === T_PLUS ) {
             // JavaScript uses the plus operator for string concatenation as well
             // so we cannot accurately determine if it is a string concat or addition.
             // So just ignore it.
@@ -74,33 +74,33 @@ 
         }
 
         // If the & is a reference, then we don't want to check for brackets.
-        if ($tokens[$stackPtr]['code'] === T_BITWISE_AND && $phpcsFile->isReference($stackPtr) === true) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_BITWISE_AND && $phpcsFile->isReference( $stackPtr ) === true ) {
             return;
         }
 
         // There is one instance where brackets aren't needed, which involves
         // the minus sign being used to assign a negative number to a variable.
-        if ($tokens[$stackPtr]['code'] === T_MINUS) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_MINUS ) {
             // Check to see if we are trying to return -n.
-            $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-            if ($tokens[$prev]['code'] === T_RETURN) {
+            $prev = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+            if ( $tokens[ $prev ][ 'code' ] === T_RETURN ) {
                 return;
             }
 
-            $number = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if ($tokens[$number]['code'] === T_LNUMBER || $tokens[$number]['code'] === T_DNUMBER) {
-                $previous = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-                if ($previous !== false) {
-                    $isAssignment = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens);
-                    $isEquality   = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$equalityTokens);
-                    $isComparison = in_array($tokens[$previous]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens);
-                    if ($isAssignment === true || $isEquality === true || $isComparison === true) {
+            $number = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+            if ( $tokens[ $number ][ 'code' ] === T_LNUMBER || $tokens[ $number ][ 'code' ] === T_DNUMBER ) {
+                $previous = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+                if ( $previous !== false ) {
+                    $isAssignment = in_array( $tokens[ $previous ][ 'code' ], PHP_CodeSniffer_Tokens::$assignmentTokens );
+                    $isEquality   = in_array( $tokens[ $previous ][ 'code' ], PHP_CodeSniffer_Tokens::$equalityTokens );
+                    $isComparison = in_array( $tokens[ $previous ][ 'code' ], PHP_CodeSniffer_Tokens::$comparisonTokens );
+                    if ( $isAssignment === true || $isEquality === true || $isComparison === true ) {
                         // This is a negative assignment or comparison.
                         // We need to check that the minus and the number are
                         // adjacent.
-                        if (($number - $stackPtr) !== 1) {
+                        if ( ( $number - $stackPtr ) !== 1 ) {
                             $error = 'No space allowed between minus sign and number';
-                            $phpcsFile->addError($error, $stackPtr, 'SpacingAfterMinus');
+                            $phpcsFile->addError( $error, $stackPtr, 'SpacingAfterMinus' );
                         }
 
                         return;
@@ -109,8 +109,8 @@ 
             }
         }//end if
 
-        $previousToken = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true, null, true);
-        if ($previousToken !== false) {
+        $previousToken = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true, null, true );
+        if ( $previousToken !== false ) {
             // A list of tokens that indicate that the token is not
             // part of an arithmetic operation.
             $invalidTokens = array(
@@ -122,7 +122,7 @@ 
                               T_CASE,
                              );
 
-            if (in_array($tokens[$previousToken]['code'], $invalidTokens) === true) {
+            if ( in_array( $tokens[ $previousToken ][ 'code' ], $invalidTokens ) === true ) {
                 return;
             }
         }
@@ -147,67 +147,67 @@ 
         $allowed += PHP_CodeSniffer_Tokens::$operators;
 
         $lastBracket = false;
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $parenthesis = array_reverse($tokens[$stackPtr]['nested_parenthesis'], true);
-            foreach ($parenthesis as $bracket => $endBracket) {
-                $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($bracket - 1), null, true);
-                $prevCode  = $tokens[$prevToken]['code'];
+        if ( isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true ) {
+            $parenthesis = array_reverse( $tokens[ $stackPtr ][ 'nested_parenthesis' ], true );
+            foreach ( $parenthesis as $bracket => $endBracket ) {
+                $prevToken = $phpcsFile->findPrevious( T_WHITESPACE, ( $bracket - 1 ), null, true );
+                $prevCode  = $tokens[ $prevToken ][ 'code' ];
 
-                if ($prevCode === T_ISSET) {
+                if ( $prevCode === T_ISSET ) {
                     // This operation is inside an isset() call, but has
                     // no bracket of it's own.
                     break;
                 }
 
-                if ($prevCode === T_STRING || $prevCode === T_SWITCH) {
+                if ( $prevCode === T_STRING || $prevCode === T_SWITCH ) {
                     // We allow simple operations to not be bracketed.
                     // For example, ceil($one / $two).
-                    for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
-                        if (in_array($tokens[$prev]['code'], $allowed) === true) {
+                    for ( $prev = ( $stackPtr - 1 ); $prev > $bracket; $prev-- ) {
+                        if ( in_array( $tokens[ $prev ][ 'code' ], $allowed ) === true ) {
                             continue;
                         }
 
-                        if ($tokens[$prev]['code'] === T_CLOSE_PARENTHESIS) {
-                            $prev = $tokens[$prev]['parenthesis_opener'];
+                        if ( $tokens[ $prev ][ 'code' ] === T_CLOSE_PARENTHESIS ) {
+                            $prev = $tokens[ $prev ][ 'parenthesis_opener' ];
                         } else {
                             break;
                         }
                     }
 
-                    if ($prev !== $bracket) {
+                    if ( $prev !== $bracket ) {
                         break;
                     }
 
-                    for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
-                        if (in_array($tokens[$next]['code'], $allowed) === true) {
+                    for ( $next = ( $stackPtr + 1 ); $next < $endBracket; $next++ ) {
+                        if ( in_array( $tokens[ $next ][ 'code' ], $allowed ) === true ) {
                             continue;
                         }
 
-                        if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) {
-                            $next = $tokens[$next]['parenthesis_closer'];
+                        if ( $tokens[ $next ][ 'code' ] === T_OPEN_PARENTHESIS ) {
+                            $next = $tokens[ $next ][ 'parenthesis_closer' ];
                         } else {
                             break;
                         }
                     }
 
-                    if ($next !== $endBracket) {
+                    if ( $next !== $endBracket ) {
                         break;
                     }
                 }//end if
 
-                if (in_array($prevCode, PHP_CodeSniffer_Tokens::$scopeOpeners) === true) {
+                if ( in_array( $prevCode, PHP_CodeSniffer_Tokens::$scopeOpeners ) === true ) {
                     // This operation is inside a control structure like FOREACH
                     // or IF, but has no bracket of it's own.
                     // The only control structure allowed to do this is SWITCH.
-                    if ($prevCode !== T_SWITCH) {
+                    if ( $prevCode !== T_SWITCH ) {
                         break;
                     }
                 }
 
-                if ($prevCode === T_OPEN_PARENTHESIS) {
+                if ( $prevCode === T_OPEN_PARENTHESIS ) {
                     // These are two open parenthesis in a row. If the current
                     // one doesn't enclose the operator, go to the previous one.
-                    if ($endBracket < $stackPtr) {
+                    if ( $endBracket < $stackPtr ) {
                         continue;
                     }
                 }
@@ -217,13 +217,13 @@ 
             }//end foreach
         }//end if
 
-        if ($lastBracket === false) {
+        if ( $lastBracket === false ) {
             // It is not in a bracketed statement at all.
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
+            $this->addMissingBracketsError( $phpcsFile, $stackPtr );
             return;
-        } else if ($tokens[$lastBracket]['parenthesis_closer'] < $stackPtr) {
+        } else if ( $tokens[ $lastBracket ][ 'parenthesis_closer' ] < $stackPtr ) {
             // There are a set of brackets in front of it that don't include it.
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
+            $this->addMissingBracketsError( $phpcsFile, $stackPtr );
             return;
         } else {
             // We are enclosed in a set of bracket, so the last thing to
@@ -234,20 +234,20 @@ 
                          T_CLOSE_SQUARE_BRACKET,
                         );
 
-            $squareBracket = $phpcsFile->findPrevious($brackets, ($stackPtr - 1), $lastBracket);
-            if ($squareBracket !== false && $tokens[$squareBracket]['code'] === T_OPEN_SQUARE_BRACKET) {
-                $closeSquareBracket = $phpcsFile->findNext($brackets, ($stackPtr + 1));
-                if ($closeSquareBracket !== false && $tokens[$closeSquareBracket]['code'] === T_CLOSE_SQUARE_BRACKET) {
-                    $this->addMissingBracketsError($phpcsFile, $stackPtr);
+            $squareBracket = $phpcsFile->findPrevious( $brackets, ( $stackPtr - 1 ), $lastBracket );
+            if ( $squareBracket !== false && $tokens[ $squareBracket ][ 'code' ] === T_OPEN_SQUARE_BRACKET ) {
+                $closeSquareBracket = $phpcsFile->findNext( $brackets, ( $stackPtr + 1 ) );
+                if ( $closeSquareBracket !== false && $tokens[ $closeSquareBracket ][ 'code' ] === T_CLOSE_SQUARE_BRACKET ) {
+                    $this->addMissingBracketsError( $phpcsFile, $stackPtr );
                 }
             }
 
             return;
         }//end if
 
-        $lastAssignment = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$assignmentTokens, $stackPtr, null, false, null, true);
-        if ($lastAssignment !== false && $lastAssignment > $lastBracket) {
-            $this->addMissingBracketsError($phpcsFile, $stackPtr);
+        $lastAssignment = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$assignmentTokens, $stackPtr, null, false, null, true );
+        if ( $lastAssignment !== false && $lastAssignment > $lastBracket ) {
+            $this->addMissingBracketsError( $phpcsFile, $stackPtr );
         }
 
     }//end process()
@@ -262,12 +262,12 @@ 
      *
      * @return void
      */
-    public function addMissingBracketsError(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function addMissingBracketsError( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $error = 'Arithmetic operation must be bracketed';
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MissingBrackets');
+        $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'MissingBrackets' );
 
-        if ($fix === false || $phpcsFile->fixer->enabled === false) {
+        if ( $fix === false || $phpcsFile->fixer->enabled === false ) {
             return;
         }
 
@@ -290,72 +290,72 @@ 
                    );
 
         // Find the first token in the expression.
-        for ($before = ($stackPtr - 1); $before > 0; $before--) {
+        for ( $before = ( $stackPtr - 1 ); $before > 0; $before-- ) {
             // Special case for plus operators because we can't tell if they are used
             // for addition or string contact. So assume string concat to be safe.
-            if ($phpcsFile->tokenizerType === 'JS' && $tokens[$before]['code'] === T_PLUS) {
+            if ( $phpcsFile->tokenizerType === 'JS' && $tokens[ $before ][ 'code' ] === T_PLUS ) {
                 break;
             }
 
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$before]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$before]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$before]['code']]) === true
-                || isset($allowed[$tokens[$before]['code']]) === true
+            if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $tokens[ $before ][ 'code' ] ] ) === true
+                || isset( PHP_CodeSniffer_Tokens::$operators[ $tokens[ $before ][ 'code' ] ] ) === true
+                || isset( PHP_CodeSniffer_Tokens::$castTokens[ $tokens[ $before ][ 'code' ] ] ) === true
+                || isset( $allowed[ $tokens[ $before ][ 'code' ] ] ) === true
             ) {
                 continue;
             }
 
-            if ($tokens[$before]['code'] === T_CLOSE_PARENTHESIS) {
-                $before = $tokens[$before]['parenthesis_opener'];
+            if ( $tokens[ $before ][ 'code' ] === T_CLOSE_PARENTHESIS ) {
+                $before = $tokens[ $before ][ 'parenthesis_opener' ];
                 continue;
             }
 
-            if ($tokens[$before]['code'] === T_CLOSE_SQUARE_BRACKET) {
-                $before = $tokens[$before]['bracket_opener'];
+            if ( $tokens[ $before ][ 'code' ] === T_CLOSE_SQUARE_BRACKET ) {
+                $before = $tokens[ $before ][ 'bracket_opener' ];
                 continue;
             }
 
             break;
         }//end for
 
-        $before = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($before + 1), null, true);
+        $before = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $before + 1 ), null, true );
 
         // Find the last token in the expression.
-        for ($after = ($stackPtr + 1); $after < $phpcsFile->numTokens; $after++) {
+        for ( $after = ( $stackPtr + 1 ); $after < $phpcsFile->numTokens; $after++ ) {
             // Special case for plus operators because we can't tell if they are used
             // for addition or string contact. So assume string concat to be safe.
-            if ($phpcsFile->tokenizerType === 'JS' && $tokens[$after]['code'] === T_PLUS) {
+            if ( $phpcsFile->tokenizerType === 'JS' && $tokens[ $after ][ 'code' ] === T_PLUS ) {
                 break;
             }
 
-            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$after]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$operators[$tokens[$after]['code']]) === true
-                || isset(PHP_CodeSniffer_Tokens::$castTokens[$tokens[$after]['code']]) === true
-                || isset($allowed[$tokens[$after]['code']]) === true
+            if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $tokens[ $after ][ 'code' ] ] ) === true
+                || isset( PHP_CodeSniffer_Tokens::$operators[ $tokens[ $after ][ 'code' ] ] ) === true
+                || isset( PHP_CodeSniffer_Tokens::$castTokens[ $tokens[ $after ][ 'code' ] ] ) === true
+                || isset( $allowed[ $tokens[ $after ][ 'code' ] ] ) === true
             ) {
                 continue;
             }
 
-            if ($tokens[$after]['code'] === T_OPEN_PARENTHESIS) {
-                $after = $tokens[$after]['parenthesis_closer'];
+            if ( $tokens[ $after ][ 'code' ] === T_OPEN_PARENTHESIS ) {
+                $after = $tokens[ $after ][ 'parenthesis_closer' ];
                 continue;
             }
 
-            if ($tokens[$after]['code'] === T_OPEN_SQUARE_BRACKET) {
-                $after = $tokens[$after]['bracket_closer'];
+            if ( $tokens[ $after ][ 'code' ] === T_OPEN_SQUARE_BRACKET ) {
+                $after = $tokens[ $after ][ 'bracket_closer' ];
                 continue;
             }
 
             break;
         }//end for
 
-        $after = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($after - 1), null, true);
+        $after = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $after - 1 ), null, true );
 
         // Can only fix this error if both tokens are available for fixing.
         // Adding one bracket without the other will create parse errors.
         $phpcsFile->fixer->beginChangeset();
-        $phpcsFile->fixer->replaceToken($before, '('.$tokens[$before]['content']);
-        $phpcsFile->fixer->replaceToken($after, $tokens[$after]['content'].')');
+        $phpcsFile->fixer->replaceToken( $before, '(' . $tokens[ $before ][ 'content' ] );
+        $phpcsFile->fixer->replaceToken( $after, $tokens[ $after ][ 'content' ] . ')' );
         $phpcsFile->fixer->endChangeset();
 
     }//end addMissingBracketsError()

Braces +4 added lines, -8 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Formatting_OperatorBracketSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Formatting_OperatorBracketSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -46,8 +45,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return PHP_CodeSniffer_Tokens::$operators;
 
     }//end register()
@@ -62,8 +60,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if ($phpcsFile->tokenizerType === 'JS' && $tokens[$stackPtr]['code'] === T_PLUS) {
@@ -262,8 +259,7 @@ 
      *
      * @return void
      */
-    public function addMissingBracketsError(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function addMissingBracketsError(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $error = 'Arithmetic operation must be bracketed';
         $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'MissingBrackets');
 

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php

Indentation +37 added lines, -37 removed lines

@@ -31,51 +31,51 @@
 {
 
 
-    /**
-     * Registers the token types that this sniff wishes to listen to.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_NEW);
+	 /**
+	  * Registers the token types that this sniff wishes to listen to.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_NEW);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Process the tokens that this sniff is listening for.
-     *
-     * @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();
+	 /**
+	  * Process the tokens that this sniff is listening for.
+	  *
+	  * @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();
 
-        $allowedTokens   = PHP_CodeSniffer_Tokens::$emptyTokens;
-        $allowedTokens[] = T_BITWISE_AND;
+		  $allowedTokens   = PHP_CodeSniffer_Tokens::$emptyTokens;
+		  $allowedTokens[] = T_BITWISE_AND;
 
-        $prev = $phpcsFile->findPrevious($allowedTokens, ($stackPtr - 1), null, true);
+		  $prev = $phpcsFile->findPrevious($allowedTokens, ($stackPtr - 1), null, true);
 
-        $allowedTokens = array(
-                          T_EQUAL        => true,
-                          T_DOUBLE_ARROW => true,
-                          T_THROW        => true,
-                          T_RETURN       => true,
-                          T_INLINE_THEN  => true,
-                          T_INLINE_ELSE  => true,
-                         );
+		  $allowedTokens = array(
+								  T_EQUAL        => true,
+								  T_DOUBLE_ARROW => true,
+								  T_THROW        => true,
+								  T_RETURN       => true,
+								  T_INLINE_THEN  => true,
+								  T_INLINE_ELSE  => true,
+								 );
 
-        if (isset($allowedTokens[$tokens[$prev]['code']]) === false) {
-            $error = 'New objects must be assigned to a variable';
-            $phpcsFile->addError($error, $stackPtr, 'NotAssigned');
-        }
+		  if (isset($allowedTokens[$tokens[$prev]['code']]) === false) {
+				$error = 'New objects must be assigned to a variable';
+				$phpcsFile->addError($error, $stackPtr, 'NotAssigned');
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(T_NEW);
+        return array( T_NEW );
 
     }//end register()
 
@@ -52,14 +52,14 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         $allowedTokens   = PHP_CodeSniffer_Tokens::$emptyTokens;
-        $allowedTokens[] = T_BITWISE_AND;
+        $allowedTokens[ ] = T_BITWISE_AND;
 
-        $prev = $phpcsFile->findPrevious($allowedTokens, ($stackPtr - 1), null, true);
+        $prev = $phpcsFile->findPrevious( $allowedTokens, ( $stackPtr - 1 ), null, true );
 
         $allowedTokens = array(
                           T_EQUAL        => true,
@@ -70,9 +70,9 @@ 
                           T_INLINE_ELSE  => true,
                          );
 
-        if (isset($allowedTokens[$tokens[$prev]['code']]) === false) {
+        if ( isset( $allowedTokens[ $tokens[ $prev ][ 'code' ] ] ) === false ) {
             $error = 'New objects must be assigned to a variable';
-            $phpcsFile->addError($error, $stackPtr, 'NotAssigned');
+            $phpcsFile->addError( $error, $stackPtr, 'NotAssigned' );
         }
 
     }//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_Objects_ObjectInstantiationSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Objects_ObjectInstantiationSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_NEW);
 
     }//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();
 
         $allowedTokens   = PHP_CodeSniffer_Tokens::$emptyTokens;

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php

Indentation +39 added lines, -39 removed lines

@@ -31,53 +31,53 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_FUNCTION);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_FUNCTION);
 
-    }//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();
+	 /**
+	  * 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();
 
-        $function = $phpcsFile->getCondition($stackPtr, T_FUNCTION);
-        if ($function === false) {
-            // Not a nested function.
-            return;
-        }
+		  $function = $phpcsFile->getCondition($stackPtr, T_FUNCTION);
+		  if ($function === false) {
+				// Not a nested function.
+				return;
+		  }
 
-        $class = $phpcsFile->getCondition($stackPtr, T_ANON_CLASS);
-        if ($class !== false && $class > $function) {
-            // Ignore methods in anon classes.
-            return;
-        }
+		  $class = $phpcsFile->getCondition($stackPtr, T_ANON_CLASS);
+		  if ($class !== false && $class > $function) {
+				// Ignore methods in anon classes.
+				return;
+		  }
 
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_EQUAL) {
-            // Ignore closures.
-            return;
-        }
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($tokens[$prev]['code'] === T_EQUAL) {
+				// Ignore closures.
+				return;
+		  }
 
-        $error = 'The use of inner functions is forbidden';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
+		  $error = 'The use of inner functions is forbidden';
+		  $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(T_FUNCTION);
+        return array( T_FUNCTION );
 
     }//end register()
 
@@ -52,30 +52,30 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $function = $phpcsFile->getCondition($stackPtr, T_FUNCTION);
-        if ($function === false) {
+        $function = $phpcsFile->getCondition( $stackPtr, T_FUNCTION );
+        if ( $function === false ) {
             // Not a nested function.
             return;
         }
 
-        $class = $phpcsFile->getCondition($stackPtr, T_ANON_CLASS);
-        if ($class !== false && $class > $function) {
+        $class = $phpcsFile->getCondition( $stackPtr, T_ANON_CLASS );
+        if ( $class !== false && $class > $function ) {
             // Ignore methods in anon classes.
             return;
         }
 
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_EQUAL) {
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] === T_EQUAL ) {
             // Ignore closures.
             return;
         }
 
         $error = 'The use of inner functions is forbidden';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
+        $phpcsFile->addError( $error, $stackPtr, 'NotAllowed' );
 
     }//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_PHP_InnerFunctionsSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_PHP_InnerFunctionsSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_FUNCTION);
 
     }//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();
 
         $function = $phpcsFile->getCondition($stackPtr, T_FUNCTION);

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php

Indentation +26 added lines, -26 removed lines

@@ -31,36 +31,36 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_START_HEREDOC,
-                T_START_NOWDOC,
-               );
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_START_HEREDOC,
+					 T_START_NOWDOC,
+					);
 
-    }//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)
-    {
-        $error = 'Use of heredoc and nowdoc syntax ("<<<") is not allowed; use standard strings or inline HTML instead';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
+	 /**
+	  * 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)
+	 {
+		  $error = 'Use of heredoc and nowdoc syntax ("<<<") is not allowed; use standard strings or inline HTML instead';
+		  $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +2 added lines, -2 removed lines

@@ -55,10 +55,10 @@
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $error = 'Use of heredoc and nowdoc syntax ("<<<") is not allowed; use standard strings or inline HTML instead';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
+        $phpcsFile->addError( $error, $stackPtr, 'NotAllowed' );
 
     }//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_PHP_HeredocSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_PHP_HeredocSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_START_HEREDOC,
                 T_START_NOWDOC,
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $error = 'Use of heredoc and nowdoc syntax ("<<<") is not allowed; use standard strings or inline HTML instead';
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed');