eventespresso / event-espresso-core

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
+    public function getErrorList($testFile = 'FunctionCallSignatureUnitTest.inc')
     {
         if ($testFile === 'FunctionCallSignatureUnitTest.js') {
             return [

Indentation +129 added lines, -129 removed lines

@@ -15,140 +15,140 @@
 {
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @param string $testFile The name of the file being tested.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
-    {
-        if ($testFile === 'FunctionCallSignatureUnitTest.js') {
-            return [
-                5  => 1,
-                6  => 2,
-                7  => 1,
-                8  => 1,
-                9  => 2,
-                10 => 3,
-                17 => 1,
-                18 => 1,
-                21 => 1,
-                24 => 1,
-                28 => 2,
-                30 => 2,
-                35 => 1,
-                49 => 1,
-                51 => 1,
-                54 => 1,
-                70 => 1,
-                71 => 1,
-            ];
-        }//end if
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
+	{
+		if ($testFile === 'FunctionCallSignatureUnitTest.js') {
+			return [
+				5  => 1,
+				6  => 2,
+				7  => 1,
+				8  => 1,
+				9  => 2,
+				10 => 3,
+				17 => 1,
+				18 => 1,
+				21 => 1,
+				24 => 1,
+				28 => 2,
+				30 => 2,
+				35 => 1,
+				49 => 1,
+				51 => 1,
+				54 => 1,
+				70 => 1,
+				71 => 1,
+			];
+		}//end if
 
-        return [
-            5   => 1,
-            6   => 2,
-            7   => 1,
-            8   => 1,
-            9   => 2,
-            10  => 3,
-            17  => 1,
-            18  => 1,
-            31  => 1,
-            34  => 1,
-            43  => 2,
-            57  => 1,
-            59  => 1,
-            63  => 1,
-            64  => 1,
-            82  => 1,
-            93  => 1,
-            100 => 1,
-            106 => 2,
-            119 => 1,
-            120 => 1,
-            129 => 1,
-            137 => 1,
-            142 => 2,
-            171 => 1,
-            180 => 1,
-            181 => 1,
-            194 => 1,
-            213 => 2,
-            215 => 2,
-            217 => 2,
-            218 => 2,
-            277 => 1,
-            278 => 1,
-            303 => 1,
-            308 => 1,
-            321 => 1,
-            322 => 1,
-            329 => 1,
-            330 => 1,
-            337 => 1,
-            342 => 1,
-            343 => 1,
-            345 => 1,
-            346 => 2,
-            353 => 1,
-            354 => 1,
-            355 => 2,
-            377 => 1,
-            378 => 1,
-            379 => 1,
-            380 => 1,
-            385 => 1,
-            386 => 1,
-            387 => 1,
-            388 => 1,
-            393 => 1,
-            394 => 1,
-            395 => 1,
-            396 => 1,
-            411 => 1,
-            422 => 1,
-            424 => 1,
-            429 => 1,
-            432 => 1,
-            440 => 1,
-            441 => 1,
-            442 => 1,
-            464 => 1,
-            510 => 1,
-            513 => 1,
-            514 => 1,
-            523 => 1,
-            524 => 3,
-            527 => 2,
-            539 => 1,
-            540 => 1,
-            546 => 1,
-            547 => 1,
-            548 => 1,
-        ];
+		return [
+			5   => 1,
+			6   => 2,
+			7   => 1,
+			8   => 1,
+			9   => 2,
+			10  => 3,
+			17  => 1,
+			18  => 1,
+			31  => 1,
+			34  => 1,
+			43  => 2,
+			57  => 1,
+			59  => 1,
+			63  => 1,
+			64  => 1,
+			82  => 1,
+			93  => 1,
+			100 => 1,
+			106 => 2,
+			119 => 1,
+			120 => 1,
+			129 => 1,
+			137 => 1,
+			142 => 2,
+			171 => 1,
+			180 => 1,
+			181 => 1,
+			194 => 1,
+			213 => 2,
+			215 => 2,
+			217 => 2,
+			218 => 2,
+			277 => 1,
+			278 => 1,
+			303 => 1,
+			308 => 1,
+			321 => 1,
+			322 => 1,
+			329 => 1,
+			330 => 1,
+			337 => 1,
+			342 => 1,
+			343 => 1,
+			345 => 1,
+			346 => 2,
+			353 => 1,
+			354 => 1,
+			355 => 2,
+			377 => 1,
+			378 => 1,
+			379 => 1,
+			380 => 1,
+			385 => 1,
+			386 => 1,
+			387 => 1,
+			388 => 1,
+			393 => 1,
+			394 => 1,
+			395 => 1,
+			396 => 1,
+			411 => 1,
+			422 => 1,
+			424 => 1,
+			429 => 1,
+			432 => 1,
+			440 => 1,
+			441 => 1,
+			442 => 1,
+			464 => 1,
+			510 => 1,
+			513 => 1,
+			514 => 1,
+			523 => 1,
+			524 => 3,
+			527 => 2,
+			539 => 1,
+			540 => 1,
+			546 => 1,
+			547 => 1,
+			548 => 1,
+		];
 
-    }//end getErrorList()
+	}//end getErrorList()
 
 
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [];
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [];
 
-    }//end getWarningList()
+	}//end getWarningList()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.inc

Indentation +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
  */
 function test()
 {
-    // Some code goes here.
+	// Some code goes here.
 
-    # This comment is banned.
+	# This comment is banned.
 
 }//end test()
 

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php

Indentation +35 added lines, -35 removed lines

@@ -15,41 +15,41 @@
 {
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList()
-    {
-        return [
-            15 => 1,
-            24 => 1,
-            25 => 1,
-            27 => 1,
-            28 => 1,
-            29 => 1,
-        ];
-
-    }//end getErrorList()
-
-
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [];
-
-    }//end getWarningList()
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList()
+	{
+		return [
+			15 => 1,
+			24 => 1,
+			25 => 1,
+			27 => 1,
+			28 => 1,
+			29 => 1,
+		];
+
+	}//end getErrorList()
+
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [];
+
+	}//end getWarningList()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @return
      * @throws
      */
-    private function _functionCall($stackPtr, $depth=1, $index)
+    private function _functionCall($stackPtr, $depth = 1, $index)
     {
         return $stackPtr;
 

Indentation +222 added lines, -222 removed lines

@@ -2,148 +2,148 @@ 
 class PHP_CodeSniffer_File
 {
 
-    /**
-     * A simple function comment.
-     *
-     * long desc here
-     *
-     * @param int $stackPtr   The position in @ @unknown the stack of the token
-     *                        that opened the scope
-     * @param int $detph    How many scope levels down we are.
-     * @param int    $index    The index
-     * @return
-     * @throws
-     */
-    private function _functionCall($stackPtr, $depth=1, $index)
-    {
-        return $stackPtr;
-
-    }//end _functionCall()
-
-    //
-    // Sample function comment
-    //
-    //
-    //
-    public function invalidCommentStyle()
-    {
-
-    }//end invalidCommentStyle()
-
-
-    /**
-     *
-     *
-     * A simple function comment
-     *
-     *
-     * Long description with extra blank line before and after
-     *
-     *
-     * @return void
-     */
-    public function extraDescriptionNewlines()
-    {
-
-    }//end extraDescriptionNewlines()
-
-
-    /**
-     * A simple function comment
-     * @return void
-     */
-    public function missingNewlinesBeforeTags()
-    {
-
-    }//end missingNewlinesBeforeTags()
-
-
-    /**
-     * Access tag should not be treated as a long description
-     *
-     * @access public
-     * @return void
-     */
-    public function accessTag()
-    {
-
-    }//end accessTag()
-
-    /**
-     * Constructor
-     *
-     * No return tag
-     */
-    function PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor
-     *
-     * No return tag too
-     */
-    function _PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor PHP5
-     */
-    function __destruct()
-    {
-        return;
-    }
-
-
-    function missingComment()
-    {
-        return;
-    }
-
-
-    /**
-     * no return tag
-     *
-     */
-    public function noReturn($one)
-    {
-
-    }//end noReturn()
-
-
-    /**
-     * Param not immediate
-     *
-     * @return
-     * @param   int   $threeSpaces
-     * @param int     $superfluous
-     * @param missing
-     * @param
-     */
-    public function missingDescription($threeSpaces)
-    {
-
-    }//end missingDescription()
-
-
-    /**
-     * Param not immediate
-     *
-     * @param int      $one   comment
-     * @param int      $two   comment
-     * @param string   $three comment
-     *
-     * @return void
-     */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
-    {
-
-    }//end oneSpaceAfterLongestVar()
+	/**
+	 * A simple function comment.
+	 *
+	 * long desc here
+	 *
+	 * @param int $stackPtr   The position in @ @unknown the stack of the token
+	 *                        that opened the scope
+	 * @param int $detph    How many scope levels down we are.
+	 * @param int    $index    The index
+	 * @return
+	 * @throws
+	 */
+	private function _functionCall($stackPtr, $depth=1, $index)
+	{
+		return $stackPtr;
+
+	}//end _functionCall()
+
+	//
+	// Sample function comment
+	//
+	//
+	//
+	public function invalidCommentStyle()
+	{
+
+	}//end invalidCommentStyle()
+
+
+	/**
+	 *
+	 *
+	 * A simple function comment
+	 *
+	 *
+	 * Long description with extra blank line before and after
+	 *
+	 *
+	 * @return void
+	 */
+	public function extraDescriptionNewlines()
+	{
+
+	}//end extraDescriptionNewlines()
+
+
+	/**
+	 * A simple function comment
+	 * @return void
+	 */
+	public function missingNewlinesBeforeTags()
+	{
+
+	}//end missingNewlinesBeforeTags()
+
+
+	/**
+	 * Access tag should not be treated as a long description
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function accessTag()
+	{
+
+	}//end accessTag()
+
+	/**
+	 * Constructor
+	 *
+	 * No return tag
+	 */
+	function PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor
+	 *
+	 * No return tag too
+	 */
+	function _PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor PHP5
+	 */
+	function __destruct()
+	{
+		return;
+	}
+
+
+	function missingComment()
+	{
+		return;
+	}
+
+
+	/**
+	 * no return tag
+	 *
+	 */
+	public function noReturn($one)
+	{
+
+	}//end noReturn()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @return
+	 * @param   int   $threeSpaces
+	 * @param int     $superfluous
+	 * @param missing
+	 * @param
+	 */
+	public function missingDescription($threeSpaces)
+	{
+
+	}//end missingDescription()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @param int      $one   comment
+	 * @param int      $two   comment
+	 * @param string   $three comment
+	 *
+	 * @return void
+	 */
+	public function oneSpaceAfterLongestVar($one, $two, $three)
+	{
+
+	}//end oneSpaceAfterLongestVar()
 
 
 }//end class
@@ -159,19 +159,19 @@ 
  */
 function functionOutsideClass(&$str, &$foo)
 {
-    return;
+	return;
 }//end functionOutsideClass()
 
 function missingCommentOutsideClass()
 {
-    return;
+	return;
 }//end missingCommentOutsideClass()
 
 
 ?><?php
 function tagBeforeComment()
 {
-    return;
+	return;
 }//end tagBeforeComment()
 
 
@@ -244,12 +244,12 @@ 
 function myFunction() {}
 
 abstract class MyClass {
-    /**
-     * An abstract function.
-     *
-     * @return string[]
-     */
-    abstract protected function myFunction();
+	/**
+	 * An abstract function.
+	 *
+	 * @return string[]
+	 */
+	abstract protected function myFunction();
 }
 
 /**
@@ -271,18 +271,18 @@ 
  *
  */
 function _() {
-    return $foo;
+	return $foo;
 }
 
 class Baz {
-    /**
-     * The PHP5 constructor
-     *
-     * No return tag
-     */
-    public function __construct() {
-
-    }
+	/**
+	 * The PHP5 constructor
+	 *
+	 * No return tag
+	 */
+	public function __construct() {
+
+	}
 }
 
 /**
@@ -295,7 +295,7 @@ 
  * @return void
  */
 function completeStep($status, array $array = [Class1::class, 'test'], $note = '') {
-    echo 'foo';
+	echo 'foo';
 }
 
 /**
@@ -379,45 +379,45 @@ 
  */
 public function setTranslator($a, &$b): void
 {
-    $this->translator = $translator;
+	$this->translator = $translator;
 }
 
 // phpcs:set PEAR.Commenting.FunctionComment minimumVisibility protected
 private function setTranslator2($a, &$b): void
 {
-    $this->translator = $translator;
+	$this->translator = $translator;
 }
 
 // phpcs:set PEAR.Commenting.FunctionComment minimumVisibility public
 protected function setTranslator3($a, &$b): void
 {
-    $this->translator = $translator;
+	$this->translator = $translator;
 }
 
 private function setTranslator4($a, &$b): void
 {
-    $this->translator = $translator;
+	$this->translator = $translator;
 }
 
 class Bar {
-    /**
-     * The PHP5 constructor
-     *
-     * @return
-     */
-    public function __construct() {
-
-    }
+	/**
+	 * The PHP5 constructor
+	 *
+	 * @return
+	 */
+	public function __construct() {
+
+	}
 }
 
 // phpcs:set PEAR.Commenting.FunctionComment specialMethods[]
 class Bar {
-    /**
-     * The PHP5 constructor
-     */
-    public function __construct() {
+	/**
+	 * The PHP5 constructor
+	 */
+	public function __construct() {
 
-    }
+	}
 }
 
 // phpcs:set PEAR.Commenting.FunctionComment specialMethods[] ignored
@@ -431,48 +431,48 @@ 
 // phpcs:set PEAR.Commenting.FunctionComment specialMethods[] __construct,__destruct
 
 class Something implements JsonSerializable {
-    /**
-     * Single attribute.
-     *
-     * @return mixed
-     */
-    #[ReturnTypeWillChange]
-    public function jsonSerialize() {}
-
-    /**
-     * Multiple attributes.
-     *
-     * @return Something
-     */
-    #[AttributeA]
-    #[AttributeB]
-    public function methodName() {}
-
-    /**
-     * Blank line between docblock and attribute.
-     *
-     * @return mixed
-     */
-
-    #[ReturnTypeWillChange]
-    public function blankLineDetectionA() {}
-
-    /**
-     * Blank line between attribute and function declaration.
-     *
-     * @return mixed
-     */
-    #[ReturnTypeWillChange]
-
-    public function blankLineDetectionB() {}
-
-    /**
-     * Blank line between both docblock and attribute and attribute and function declaration.
-     *
-     * @return mixed
-     */
-
-    #[ReturnTypeWillChange]
-
-    public function blankLineDetectionC() {}
+	/**
+	 * Single attribute.
+	 *
+	 * @return mixed
+	 */
+	#[ReturnTypeWillChange]
+	public function jsonSerialize() {}
+
+	/**
+	 * Multiple attributes.
+	 *
+	 * @return Something
+	 */
+	#[AttributeA]
+	#[AttributeB]
+	public function methodName() {}
+
+	/**
+	 * Blank line between docblock and attribute.
+	 *
+	 * @return mixed
+	 */
+
+	#[ReturnTypeWillChange]
+	public function blankLineDetectionA() {}
+
+	/**
+	 * Blank line between attribute and function declaration.
+	 *
+	 * @return mixed
+	 */
+	#[ReturnTypeWillChange]
+
+	public function blankLineDetectionB() {}
+
+	/**
+	 * Blank line between both docblock and attribute and attribute and function declaration.
+	 *
+	 * @return mixed
+	 */
+
+	#[ReturnTypeWillChange]
+
+	public function blankLineDetectionC() {}
 }

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php

Indentation +158 added lines, -158 removed lines

@@ -16,164 +16,164 @@
 class ScopeClosingBraceSniff implements Sniff
 {
 
-    /**
-     * The number of spaces code should be indented.
-     *
-     * @var integer
-     */
-    public $indent = 4;
-
-
-     /**
-      * Returns an array of tokens this test wants to listen for.
-      *
-      * @return int[]
-      */
-    public function register()
-    {
-        return Tokens::$scopeOpeners;
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // If this is an inline condition (ie. there is no scope opener), then
-        // return, as this is not a new scope.
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
-
-        $scopeStart = $tokens[$stackPtr]['scope_opener'];
-        $scopeEnd   = $tokens[$stackPtr]['scope_closer'];
-
-        // If the scope closer doesn't think it belongs to this scope opener
-        // then the opener is sharing its closer with other tokens. We only
-        // want to process the closer once, so skip this one.
-        if (isset($tokens[$scopeEnd]['scope_condition']) === false
-            || $tokens[$scopeEnd]['scope_condition'] !== $stackPtr
-        ) {
-            return;
-        }
-
-        // We need to actually find the first piece of content on this line,
-        // because if this is a method with tokens before it (public, static etc)
-        // or an if with an else before it, then we need to start the scope
-        // checking from there, rather than the current token.
-        $lineStart = ($stackPtr - 1);
-        for ($lineStart; $lineStart > 0; $lineStart--) {
-            if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
-                break;
-            }
-        }
-
-        $lineStart++;
-
-        $startColumn = 1;
-        if ($tokens[$lineStart]['code'] === T_WHITESPACE) {
-            $startColumn = $tokens[($lineStart + 1)]['column'];
-        } else if ($tokens[$lineStart]['code'] === T_INLINE_HTML) {
-            $trimmed = ltrim($tokens[$lineStart]['content']);
-            if ($trimmed === '') {
-                $startColumn = $tokens[($lineStart + 1)]['column'];
-            } else {
-                $startColumn = (strlen($tokens[$lineStart]['content']) - strlen($trimmed));
-            }
-        }
-
-        // Check that the closing brace is on it's own line.
-        $lastContent = $phpcsFile->findPrevious(
-            [
-                T_WHITESPACE,
-                T_INLINE_HTML,
-                T_OPEN_TAG,
-            ],
-            ($scopeEnd - 1),
-            $scopeStart,
-            true
-        );
-
-        if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
-            $error = 'Closing brace must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Line');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewlineBefore($scopeEnd);
-            }
-
-            return;
-        }
-
-        // Check now that the closing brace is lined up correctly.
-        $lineStart = ($scopeEnd - 1);
-        for ($lineStart; $lineStart > 0; $lineStart--) {
-            if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
-                break;
-            }
-        }
-
-        $lineStart++;
-
-        $braceIndent = 0;
-        if ($tokens[$lineStart]['code'] === T_WHITESPACE) {
-            $braceIndent = ($tokens[($lineStart + 1)]['column'] - 1);
-        } else if ($tokens[$lineStart]['code'] === T_INLINE_HTML) {
-            $trimmed = ltrim($tokens[$lineStart]['content']);
-            if ($trimmed === '') {
-                $braceIndent = ($tokens[($lineStart + 1)]['column'] - 1);
-            } else {
-                $braceIndent = (strlen($tokens[$lineStart]['content']) - strlen($trimmed) - 1);
-            }
-        }
-
-        $fix = false;
-        if ($tokens[$stackPtr]['code'] === T_CASE
-            || $tokens[$stackPtr]['code'] === T_DEFAULT
-        ) {
-            // BREAK statements should be indented n spaces from the
-            // CASE or DEFAULT statement.
-            $expectedIndent = ($startColumn + $this->indent - 1);
-            if ($braceIndent !== $expectedIndent) {
-                $error = 'Case breaking statement indented incorrectly; expected %s spaces, found %s';
-                $data  = [
-                    $expectedIndent,
-                    $braceIndent,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
-            }
-        } else {
-            $expectedIndent = max(0, ($startColumn - 1));
-            if ($braceIndent !== $expectedIndent) {
-                $error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
-                $data  = [
-                    $expectedIndent,
-                    $braceIndent,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
-            }
-        }//end if
-
-        if ($fix === true) {
-            $spaces = str_repeat(' ', $expectedIndent);
-            if ($braceIndent === 0) {
-                $phpcsFile->fixer->addContentBefore($lineStart, $spaces);
-            } else {
-                $phpcsFile->fixer->replaceToken($lineStart, ltrim($tokens[$lineStart]['content']));
-                $phpcsFile->fixer->addContentBefore($lineStart, $spaces);
-            }
-        }
-
-    }//end process()
+	/**
+	 * The number of spaces code should be indented.
+	 *
+	 * @var integer
+	 */
+	public $indent = 4;
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return int[]
+	  */
+	public function register()
+	{
+		return Tokens::$scopeOpeners;
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// If this is an inline condition (ie. there is no scope opener), then
+		// return, as this is not a new scope.
+		if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+			return;
+		}
+
+		$scopeStart = $tokens[$stackPtr]['scope_opener'];
+		$scopeEnd   = $tokens[$stackPtr]['scope_closer'];
+
+		// If the scope closer doesn't think it belongs to this scope opener
+		// then the opener is sharing its closer with other tokens. We only
+		// want to process the closer once, so skip this one.
+		if (isset($tokens[$scopeEnd]['scope_condition']) === false
+			|| $tokens[$scopeEnd]['scope_condition'] !== $stackPtr
+		) {
+			return;
+		}
+
+		// We need to actually find the first piece of content on this line,
+		// because if this is a method with tokens before it (public, static etc)
+		// or an if with an else before it, then we need to start the scope
+		// checking from there, rather than the current token.
+		$lineStart = ($stackPtr - 1);
+		for ($lineStart; $lineStart > 0; $lineStart--) {
+			if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
+				break;
+			}
+		}
+
+		$lineStart++;
+
+		$startColumn = 1;
+		if ($tokens[$lineStart]['code'] === T_WHITESPACE) {
+			$startColumn = $tokens[($lineStart + 1)]['column'];
+		} else if ($tokens[$lineStart]['code'] === T_INLINE_HTML) {
+			$trimmed = ltrim($tokens[$lineStart]['content']);
+			if ($trimmed === '') {
+				$startColumn = $tokens[($lineStart + 1)]['column'];
+			} else {
+				$startColumn = (strlen($tokens[$lineStart]['content']) - strlen($trimmed));
+			}
+		}
+
+		// Check that the closing brace is on it's own line.
+		$lastContent = $phpcsFile->findPrevious(
+			[
+				T_WHITESPACE,
+				T_INLINE_HTML,
+				T_OPEN_TAG,
+			],
+			($scopeEnd - 1),
+			$scopeStart,
+			true
+		);
+
+		if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
+			$error = 'Closing brace must be on a line by itself';
+			$fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Line');
+			if ($fix === true) {
+				$phpcsFile->fixer->addNewlineBefore($scopeEnd);
+			}
+
+			return;
+		}
+
+		// Check now that the closing brace is lined up correctly.
+		$lineStart = ($scopeEnd - 1);
+		for ($lineStart; $lineStart > 0; $lineStart--) {
+			if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
+				break;
+			}
+		}
+
+		$lineStart++;
+
+		$braceIndent = 0;
+		if ($tokens[$lineStart]['code'] === T_WHITESPACE) {
+			$braceIndent = ($tokens[($lineStart + 1)]['column'] - 1);
+		} else if ($tokens[$lineStart]['code'] === T_INLINE_HTML) {
+			$trimmed = ltrim($tokens[$lineStart]['content']);
+			if ($trimmed === '') {
+				$braceIndent = ($tokens[($lineStart + 1)]['column'] - 1);
+			} else {
+				$braceIndent = (strlen($tokens[$lineStart]['content']) - strlen($trimmed) - 1);
+			}
+		}
+
+		$fix = false;
+		if ($tokens[$stackPtr]['code'] === T_CASE
+			|| $tokens[$stackPtr]['code'] === T_DEFAULT
+		) {
+			// BREAK statements should be indented n spaces from the
+			// CASE or DEFAULT statement.
+			$expectedIndent = ($startColumn + $this->indent - 1);
+			if ($braceIndent !== $expectedIndent) {
+				$error = 'Case breaking statement indented incorrectly; expected %s spaces, found %s';
+				$data  = [
+					$expectedIndent,
+					$braceIndent,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
+			}
+		} else {
+			$expectedIndent = max(0, ($startColumn - 1));
+			if ($braceIndent !== $expectedIndent) {
+				$error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
+				$data  = [
+					$expectedIndent,
+					$braceIndent,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
+			}
+		}//end if
+
+		if ($fix === true) {
+			$spaces = str_repeat(' ', $expectedIndent);
+			if ($braceIndent === 0) {
+				$phpcsFile->fixer->addContentBefore($lineStart, $spaces);
+			} else {
+				$phpcsFile->fixer->replaceToken($lineStart, ltrim($tokens[$lineStart]['content']));
+				$phpcsFile->fixer->addContentBefore($lineStart, $spaces);
+			}
+		}
+
+	}//end process()
 
 
 }//end class

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
                     $expectedIndent,
                     $braceIndent,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
+                $fix = $phpcsFile->addFixableError($error, $scopeEnd, 'BreakIndent', $data);
             }
         } else {
             $expectedIndent = max(0, ($startColumn - 1));
@@ -159,7 +159,7 @@ 
                     $expectedIndent,
                     $braceIndent,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
+                $fix = $phpcsFile->addFixableError($error, $scopeEnd, 'Indent', $data);
             }
         }//end if
 

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php

Indentation +6 added lines, -6 removed lines

@@ -14,11 +14,11 @@
 class ScopeIndentSniff extends GenericScopeIndentSniff
 {
 
-    /**
-     * Any scope openers that should not cause an indent.
-     *
-     * @var int[]
-     */
-    protected $nonIndentingScopes = [T_SWITCH];
+	/**
+	 * Any scope openers that should not cause an indent.
+	 *
+	 * @var int[]
+	 */
+	protected $nonIndentingScopes = [T_SWITCH];
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php

Indentation +112 added lines, -112 removed lines

@@ -19,118 +19,118 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_INCLUDE_ONCE,
-            T_REQUIRE_ONCE,
-            T_REQUIRE,
-            T_INCLUDE,
-        ];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\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(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($tokens[$nextToken]['code'] === T_OPEN_PARENTHESIS) {
-            $error = '"%s" is a statement not a function; no parentheses are required';
-            $data  = [$tokens[$stackPtr]['content']];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'BracketsNotRequired', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->replaceToken($tokens[$nextToken]['parenthesis_closer'], '');
-                if ($tokens[($nextToken - 1)]['code'] !== T_WHITESPACE) {
-                    $phpcsFile->fixer->replaceToken($nextToken, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken($nextToken, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-        }
-
-        if (count($tokens[$stackPtr]['conditions']) !== 0) {
-            $inCondition = true;
-        } else {
-            $inCondition = false;
-        }
-
-        // Check to see if this including statement is within the parenthesis
-        // of a condition. If that's the case then we need to process it as being
-        // within a condition, as they are checking the return value.
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            foreach ($tokens[$stackPtr]['nested_parenthesis'] as $left => $right) {
-                if (isset($tokens[$left]['parenthesis_owner']) === true) {
-                    $inCondition = true;
-                }
-            }
-        }
-
-        // Check to see if they are assigning the return value of this
-        // including call. If they are then they are probably checking it, so
-        // it's conditional.
-        $previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if (isset(Tokens::$assignmentTokens[$tokens[$previous]['code']]) === true) {
-            // The have assigned the return value to it, so its conditional.
-            $inCondition = true;
-        }
-
-        $tokenCode = $tokens[$stackPtr]['code'];
-        if ($inCondition === true) {
-            // We are inside a conditional statement. We need an include_once.
-            if ($tokenCode === T_REQUIRE_ONCE) {
-                $error  = 'File is being conditionally included; ';
-                $error .= 'use "include_once" instead';
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseIncludeOnce');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($stackPtr, 'include_once');
-                }
-            } else if ($tokenCode === T_REQUIRE) {
-                $error  = 'File is being conditionally included; ';
-                $error .= 'use "include" instead';
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseInclude');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($stackPtr, 'include');
-                }
-            }
-        } else {
-            // We are unconditionally including, we need a require_once.
-            if ($tokenCode === T_INCLUDE_ONCE) {
-                $error  = 'File is being unconditionally included; ';
-                $error .= 'use "require_once" instead';
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseRequireOnce');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($stackPtr, 'require_once');
-                }
-            } else if ($tokenCode === T_INCLUDE) {
-                $error  = 'File is being unconditionally included; ';
-                $error .= 'use "require" instead';
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseRequire');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($stackPtr, 'require');
-                }
-            }
-        }//end if
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_INCLUDE_ONCE,
+			T_REQUIRE_ONCE,
+			T_REQUIRE,
+			T_INCLUDE,
+		];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\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(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+		if ($tokens[$nextToken]['code'] === T_OPEN_PARENTHESIS) {
+			$error = '"%s" is a statement not a function; no parentheses are required';
+			$data  = [$tokens[$stackPtr]['content']];
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'BracketsNotRequired', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				$phpcsFile->fixer->replaceToken($tokens[$nextToken]['parenthesis_closer'], '');
+				if ($tokens[($nextToken - 1)]['code'] !== T_WHITESPACE) {
+					$phpcsFile->fixer->replaceToken($nextToken, ' ');
+				} else {
+					$phpcsFile->fixer->replaceToken($nextToken, '');
+				}
+
+				$phpcsFile->fixer->endChangeset();
+			}
+		}
+
+		if (count($tokens[$stackPtr]['conditions']) !== 0) {
+			$inCondition = true;
+		} else {
+			$inCondition = false;
+		}
+
+		// Check to see if this including statement is within the parenthesis
+		// of a condition. If that's the case then we need to process it as being
+		// within a condition, as they are checking the return value.
+		if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
+			foreach ($tokens[$stackPtr]['nested_parenthesis'] as $left => $right) {
+				if (isset($tokens[$left]['parenthesis_owner']) === true) {
+					$inCondition = true;
+				}
+			}
+		}
+
+		// Check to see if they are assigning the return value of this
+		// including call. If they are then they are probably checking it, so
+		// it's conditional.
+		$previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		if (isset(Tokens::$assignmentTokens[$tokens[$previous]['code']]) === true) {
+			// The have assigned the return value to it, so its conditional.
+			$inCondition = true;
+		}
+
+		$tokenCode = $tokens[$stackPtr]['code'];
+		if ($inCondition === true) {
+			// We are inside a conditional statement. We need an include_once.
+			if ($tokenCode === T_REQUIRE_ONCE) {
+				$error  = 'File is being conditionally included; ';
+				$error .= 'use "include_once" instead';
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseIncludeOnce');
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken($stackPtr, 'include_once');
+				}
+			} else if ($tokenCode === T_REQUIRE) {
+				$error  = 'File is being conditionally included; ';
+				$error .= 'use "include" instead';
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseInclude');
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken($stackPtr, 'include');
+				}
+			}
+		} else {
+			// We are unconditionally including, we need a require_once.
+			if ($tokenCode === T_INCLUDE_ONCE) {
+				$error  = 'File is being unconditionally included; ';
+				$error .= 'use "require_once" instead';
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseRequireOnce');
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken($stackPtr, 'require_once');
+				}
+			} else if ($tokenCode === T_INCLUDE) {
+				$error  = 'File is being unconditionally included; ';
+				$error .= 'use "require" instead';
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'UseRequire');
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken($stackPtr, 'require');
+				}
+			}
+		}//end if
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
                     $tokens[$stackPtr]['content'],
                     ($braceLine - $classLine - 1),
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceWrongLine', $data);
+                $fix = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceWrongLine', $data);
                 if ($fix === true) {
                     $phpcsFile->fixer->beginChangeset();
                     for ($i = ($curlyBrace - 1); $i > $lastContent; $i--) {

Indentation +129 added lines, -129 removed lines

@@ -16,135 +16,135 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_CLASS,
-            T_INTERFACE,
-            T_TRAIT,
-            T_ENUM,
-        ];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param integer                     $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens    = $phpcsFile->getTokens();
-        $errorData = [strtolower($tokens[$stackPtr]['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;
-        }
-
-        $curlyBrace  = $tokens[$stackPtr]['scope_opener'];
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($curlyBrace - 1), $stackPtr, true);
-        $classLine   = $tokens[$lastContent]['line'];
-        $braceLine   = $tokens[$curlyBrace]['line'];
-        if ($braceLine === $classLine) {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'same line');
-            $error = 'Opening brace of a %s must be on the line after the definition';
-            $fix   = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceNewLine', $errorData);
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                if ($tokens[($curlyBrace - 1)]['code'] === T_WHITESPACE) {
-                    $phpcsFile->fixer->replaceToken(($curlyBrace - 1), '');
-                }
-
-                $phpcsFile->fixer->addNewlineBefore($curlyBrace);
-                $phpcsFile->fixer->endChangeset();
-            }
-
-            return;
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'new line');
-
-            if ($braceLine > ($classLine + 1)) {
-                $error = 'Opening brace of a %s must be on the line following the %s declaration; found %s line(s)';
-                $data  = [
-                    $tokens[$stackPtr]['content'],
-                    $tokens[$stackPtr]['content'],
-                    ($braceLine - $classLine - 1),
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceWrongLine', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($curlyBrace - 1); $i > $lastContent; $i--) {
-                        if ($tokens[$i]['line'] === ($tokens[$curlyBrace]['line'] + 1)) {
-                            break;
-                        }
-
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-
-                return;
-            }//end if
-        }//end if
-
-        if ($tokens[($curlyBrace + 1)]['content'] !== $phpcsFile->eolChar) {
-            $error = 'Opening %s brace must be on a line by itself';
-
-            $nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($curlyBrace + 1), null, true);
-            if ($tokens[$nextNonWhitespace]['code'] === T_PHPCS_IGNORE) {
-                // Don't auto-fix if the next thing is a PHPCS ignore annotation.
-                $phpcsFile->addError($error, $curlyBrace, 'OpenBraceNotAlone', $errorData);
-            } else {
-                $fix = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceNotAlone', $errorData);
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($curlyBrace);
-                }
-            }
-        }
-
-        if ($tokens[($curlyBrace - 1)]['code'] === T_WHITESPACE) {
-            $prevContent = $tokens[($curlyBrace - 1)]['content'];
-            if ($prevContent === $phpcsFile->eolChar) {
-                $spaces = 0;
-            } else {
-                $spaces = $tokens[($curlyBrace - 1)]['length'];
-            }
-
-            $first    = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
-            $expected = ($tokens[$first]['column'] - 1);
-            if ($spaces !== $expected) {
-                $error = 'Expected %s spaces before opening brace; %s found';
-                $data  = [
-                    $expected,
-                    $spaces,
-                ];
-
-                $fix = $phpcsFile->addFixableError($error, $curlyBrace, 'SpaceBeforeBrace', $data);
-                if ($fix === true) {
-                    $indent = str_repeat(' ', $expected);
-                    if ($spaces === 0) {
-                        $phpcsFile->fixer->addContentBefore($curlyBrace, $indent);
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($curlyBrace - 1), $indent);
-                    }
-                }
-            }
-        }//end if
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_CLASS,
+			T_INTERFACE,
+			T_TRAIT,
+			T_ENUM,
+		];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param integer                     $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens    = $phpcsFile->getTokens();
+		$errorData = [strtolower($tokens[$stackPtr]['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;
+		}
+
+		$curlyBrace  = $tokens[$stackPtr]['scope_opener'];
+		$lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($curlyBrace - 1), $stackPtr, true);
+		$classLine   = $tokens[$lastContent]['line'];
+		$braceLine   = $tokens[$curlyBrace]['line'];
+		if ($braceLine === $classLine) {
+			$phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'same line');
+			$error = 'Opening brace of a %s must be on the line after the definition';
+			$fix   = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceNewLine', $errorData);
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				if ($tokens[($curlyBrace - 1)]['code'] === T_WHITESPACE) {
+					$phpcsFile->fixer->replaceToken(($curlyBrace - 1), '');
+				}
+
+				$phpcsFile->fixer->addNewlineBefore($curlyBrace);
+				$phpcsFile->fixer->endChangeset();
+			}
+
+			return;
+		} else {
+			$phpcsFile->recordMetric($stackPtr, 'Class opening brace placement', 'new line');
+
+			if ($braceLine > ($classLine + 1)) {
+				$error = 'Opening brace of a %s must be on the line following the %s declaration; found %s line(s)';
+				$data  = [
+					$tokens[$stackPtr]['content'],
+					$tokens[$stackPtr]['content'],
+					($braceLine - $classLine - 1),
+				];
+				$fix   = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceWrongLine', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->beginChangeset();
+					for ($i = ($curlyBrace - 1); $i > $lastContent; $i--) {
+						if ($tokens[$i]['line'] === ($tokens[$curlyBrace]['line'] + 1)) {
+							break;
+						}
+
+						$phpcsFile->fixer->replaceToken($i, '');
+					}
+
+					$phpcsFile->fixer->endChangeset();
+				}
+
+				return;
+			}//end if
+		}//end if
+
+		if ($tokens[($curlyBrace + 1)]['content'] !== $phpcsFile->eolChar) {
+			$error = 'Opening %s brace must be on a line by itself';
+
+			$nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($curlyBrace + 1), null, true);
+			if ($tokens[$nextNonWhitespace]['code'] === T_PHPCS_IGNORE) {
+				// Don't auto-fix if the next thing is a PHPCS ignore annotation.
+				$phpcsFile->addError($error, $curlyBrace, 'OpenBraceNotAlone', $errorData);
+			} else {
+				$fix = $phpcsFile->addFixableError($error, $curlyBrace, 'OpenBraceNotAlone', $errorData);
+				if ($fix === true) {
+					$phpcsFile->fixer->addNewline($curlyBrace);
+				}
+			}
+		}
+
+		if ($tokens[($curlyBrace - 1)]['code'] === T_WHITESPACE) {
+			$prevContent = $tokens[($curlyBrace - 1)]['content'];
+			if ($prevContent === $phpcsFile->eolChar) {
+				$spaces = 0;
+			} else {
+				$spaces = $tokens[($curlyBrace - 1)]['length'];
+			}
+
+			$first    = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
+			$expected = ($tokens[$first]['column'] - 1);
+			if ($spaces !== $expected) {
+				$error = 'Expected %s spaces before opening brace; %s found';
+				$data  = [
+					$expected,
+					$spaces,
+				];
+
+				$fix = $phpcsFile->addFixableError($error, $curlyBrace, 'SpaceBeforeBrace', $data);
+				if ($fix === true) {
+					$indent = str_repeat(' ', $expected);
+					if ($spaces === 0) {
+						$phpcsFile->fixer->addContentBefore($curlyBrace, $indent);
+					} else {
+						$phpcsFile->fixer->replaceToken(($curlyBrace - 1), $indent);
+					}
+				}
+			}
+		}//end if
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php

Indentation +36 added lines, -36 removed lines

@@ -15,42 +15,42 @@
 {
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList()
-    {
-        return [
-            8  => 1,
-            10 => 1,
-            12 => 1,
-            14 => 1,
-            19 => 1,
-            28 => 1,
-            30 => 1,
-        ];
-
-    }//end getErrorList()
-
-
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [];
-
-    }//end getWarningList()
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList()
+	{
+		return [
+			8  => 1,
+			10 => 1,
+			12 => 1,
+			14 => 1,
+			19 => 1,
+			28 => 1,
+			30 => 1,
+		];
+
+	}//end getErrorList()
+
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [];
+
+	}//end getWarningList()
 
 
 }//end class