eventespresso / event-espresso-core

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

Indentation +30 added lines, -30 removed lines

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

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
                     $i = $stackPtr;
                     do {
                         $i++;
-                    } while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
+                    }while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
 
                     $error = 'Blank line found at start of embedded PHP content';
                     $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
@@ -156,7 +156,7 @@ 
                         $indent,
                         $contentColumn,
                     ];
-                    $fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
+                    $fix = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
                     if ($fix === true) {
                         $padding = str_repeat(' ', $indent);
                         if ($contentColumn === 0) {
@@ -214,7 +214,7 @@ 
                     $expected,
                     $found,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
                 if ($fix === true) {
                     $phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
                 }
@@ -264,7 +264,7 @@ 
             $i = $closingTag;
             do {
                 $i--;
-            } while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
+            }while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
 
             $error = 'Blank line found at end of embedded PHP content';
             $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');

Indentation +380 added lines, -380 removed lines

@@ -17,386 +17,386 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_OPEN_TAG];
-
-    }//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();
-
-        // If the close php tag is on the same line as the opening
-        // then we have an inline embedded PHP block.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closeTag === false || $tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
-            $this->validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
-        } else {
-            $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
-        }
-
-    }//end process()
-
-
-    /**
-     * Validates embedded PHP that exists on multiple lines.
-     *
-     * @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
-     */
-    private function validateMultilineEmbeddedPhp($phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($prevTag === false) {
-            // This is the first open tag.
-            return;
-        }
-
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closingTag !== false) {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
-            if ($nextContent === false) {
-                // Final closing tag. It will be handled elsewhere.
-                return;
-            }
-
-            // We have an opening and a closing tag, that lie within other content.
-            if ($firstContent === $closingTag) {
-                $error = 'Empty embedded PHP tag found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = $stackPtr; $i <= $closingTag; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-
-                return;
-            }
-        }//end if
-
-        if ($tokens[$firstContent]['line'] === $tokens[$stackPtr]['line']) {
-            $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentAfterOpen');
-            if ($fix === true) {
-                $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
-                $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($stackPtr);
-                $phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
-                $phpcsFile->fixer->endChangeset();
-            }
-        } else {
-            // Check the indent of the first line, except if it is a scope closer.
-            if (isset($tokens[$firstContent]['scope_closer']) === false
-                || $tokens[$firstContent]['scope_closer'] !== $firstContent
-            ) {
-                // Check for a blank line at the top.
-                if ($tokens[$firstContent]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
-                    // Find a token on the blank line to throw the error on.
-                    $i = $stackPtr;
-                    do {
-                        $i++;
-                    } while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
-
-                    $error = 'Blank line found at start of embedded PHP content';
-                    $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
-                    if ($fix === true) {
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($stackPtr + 1); $i < $firstContent; $i++) {
-                            if ($tokens[$i]['line'] === $tokens[$firstContent]['line']
-                                || $tokens[$i]['line'] === $tokens[$stackPtr]['line']
-                            ) {
-                                continue;
-                            }
-
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->endChangeset();
-                    }
-                }//end if
-
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $indent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                } else {
-                    $indent = ($tokens[($first + 1)]['column'] - 1);
-                }
-
-                $contentColumn = ($tokens[$firstContent]['column'] - 1);
-                if ($contentColumn !== $indent) {
-                    $error = 'First line of embedded PHP code must be indented %s spaces; %s found';
-                    $data  = [
-                        $indent,
-                        $contentColumn,
-                    ];
-                    $fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
-                    if ($fix === true) {
-                        $padding = str_repeat(' ', $indent);
-                        if ($contentColumn === 0) {
-                            $phpcsFile->fixer->addContentBefore($firstContent, $padding);
-                        } else {
-                            $phpcsFile->fixer->replaceToken(($firstContent - 1), $padding);
-                        }
-                    }
-                }
-            }//end if
-        }//end if
-
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$lastContent]['line'] === $tokens[$stackPtr]['line']
-            && trim($tokens[$lastContent]['content']) !== ''
-        ) {
-            $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                } else {
-                    $padding = ($tokens[($first + 1)]['column'] - 1);
-                }
-
-                $phpcsFile->fixer->addContentBefore($stackPtr, $phpcsFile->eolChar.str_repeat(' ', $padding));
-            }
-        } else {
-            // Find the first token on the first non-empty line we find.
-            for ($first = ($stackPtr - 1); $first > 0; $first--) {
-                if ($tokens[$first]['line'] === $tokens[$stackPtr]['line']) {
-                    continue;
-                } else if (trim($tokens[$first]['content']) !== '') {
-                    $first = $phpcsFile->findFirstOnLine([], $first, true);
-                    break;
-                }
-            }
-
-            $expected = 0;
-            if ($tokens[$first]['code'] === T_INLINE_HTML
-                && trim($tokens[$first]['content']) !== ''
-            ) {
-                $expected = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-            } else if ($tokens[$first]['code'] === T_WHITESPACE) {
-                $expected = ($tokens[($first + 1)]['column'] - 1);
-            }
-
-            $expected += 4;
-            $found     = ($tokens[$stackPtr]['column'] - 1);
-            if ($found > $expected) {
-                $error = 'Opening PHP tag indent incorrect; expected no more than %s spaces but found %s';
-                $data  = [
-                    $expected,
-                    $found,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
-                }
-            }
-        }//end if
-
-        if ($closingTag === false) {
-            return;
-        }
-
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
-        $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
-
-        if ($tokens[$lastContent]['line'] === $tokens[$closingTag]['line']) {
-            $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
-                $phpcsFile->fixer->addNewlineBefore($closingTag);
-                $phpcsFile->fixer->endChangeset();
-            }
-        } else if ($tokens[$nextContent]['line'] === $tokens[$closingTag]['line']) {
-            $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($closingTag);
-                $phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-        $next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
-        if ($next === false) {
-            return;
-        }
-
-        // Check for a blank line at the bottom.
-        if ((isset($tokens[$lastContent]['scope_closer']) === false
-            || $tokens[$lastContent]['scope_closer'] !== $lastContent)
-            && $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
-        ) {
-            // Find a token on the blank line to throw the error on.
-            $i = $closingTag;
-            do {
-                $i--;
-            } while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
-
-            $error = 'Blank line found at end of embedded PHP content';
-            $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = ($lastContent + 1); $i < $closingTag; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$lastContent]['line']
-                        || $tokens[$i]['line'] === $tokens[$closingTag]['line']
-                    ) {
-                        continue;
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-    }//end validateMultilineEmbeddedPhp()
-
-
-    /**
-     * Validates embedded PHP that exists on one line.
-     *
-     * @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
-     */
-    private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We only want one line PHP sections, so return if the closing tag is
-        // on the next line.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
-        if ($tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
-            return;
-        }
-
-        // Check that there is one, and only one space at the start of the statement.
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $closeTag, true);
-
-        if ($firstContent === false) {
-            $error = 'Empty embedded PHP tag found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = $stackPtr; $i <= $closeTag; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-
-            return;
-        }
-
-        // The open tag token always contains a single space after it.
-        $leadingSpace = 1;
-        if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
-            $leadingSpace = ($tokens[($stackPtr + 1)]['length'] + 1);
-        }
-
-        if ($leadingSpace !== 1) {
-            $error = 'Expected 1 space after opening PHP tag; %s found';
-            $data  = [$leadingSpace];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-            }
-        }
-
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closeTag - 1), $stackPtr, true);
-        if ($prev !== $stackPtr) {
-            if ((isset($tokens[$prev]['scope_opener']) === false
-                || $tokens[$prev]['scope_opener'] !== $prev)
-                && (isset($tokens[$prev]['scope_closer']) === false
-                || $tokens[$prev]['scope_closer'] !== $prev)
-                && $tokens[$prev]['code'] !== T_SEMICOLON
-            ) {
-                $error = 'Inline PHP statement must end with a semicolon';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addContent($prev, ';');
-                }
-            } else if ($tokens[$prev]['code'] === T_SEMICOLON) {
-                $statementCount = 1;
-                for ($i = ($stackPtr + 1); $i < $prev; $i++) {
-                    if ($tokens[$i]['code'] === T_SEMICOLON) {
-                        $statementCount++;
-                    }
-                }
-
-                if ($statementCount > 1) {
-                    $error = 'Inline PHP statement must contain a single statement; %s found';
-                    $data  = [$statementCount];
-                    $phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
-                }
-            }
-        }//end if
-
-        $trailingSpace = 0;
-        if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
-            $trailingSpace = $tokens[($closeTag - 1)]['length'];
-        } else if (($tokens[($closeTag - 1)]['code'] === T_COMMENT
-            || isset(Tokens::$phpcsCommentTokens[$tokens[($closeTag - 1)]['code']]) === true)
-            && substr($tokens[($closeTag - 1)]['content'], -1) === ' '
-        ) {
-            $trailingSpace = (strlen($tokens[($closeTag - 1)]['content']) - strlen(rtrim($tokens[($closeTag - 1)]['content'])));
-        }
-
-        if ($trailingSpace !== 1) {
-            $error = 'Expected 1 space before closing PHP tag; %s found';
-            $data  = [$trailingSpace];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeClose', $data);
-            if ($fix === true) {
-                if ($trailingSpace === 0) {
-                    $phpcsFile->fixer->addContentBefore($closeTag, ' ');
-                } else if ($tokens[($closeTag - 1)]['code'] === T_COMMENT
-                    || isset(Tokens::$phpcsCommentTokens[$tokens[($closeTag - 1)]['code']]) === true
-                ) {
-                    $phpcsFile->fixer->replaceToken(($closeTag - 1), rtrim($tokens[($closeTag - 1)]['content']).' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
-                }
-            }
-        }
-
-    }//end validateInlineEmbeddedPhp()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_OPEN_TAG];
+
+	}//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();
+
+		// If the close php tag is on the same line as the opening
+		// then we have an inline embedded PHP block.
+		$closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
+		if ($closeTag === false || $tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
+			$this->validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
+		} else {
+			$this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
+		}
+
+	}//end process()
+
+
+	/**
+	 * Validates embedded PHP that exists on multiple lines.
+	 *
+	 * @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
+	 */
+	private function validateMultilineEmbeddedPhp($phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
+		if ($prevTag === false) {
+			// This is the first open tag.
+			return;
+		}
+
+		$firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		$closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
+		if ($closingTag !== false) {
+			$nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
+			if ($nextContent === false) {
+				// Final closing tag. It will be handled elsewhere.
+				return;
+			}
+
+			// We have an opening and a closing tag, that lie within other content.
+			if ($firstContent === $closingTag) {
+				$error = 'Empty embedded PHP tag found';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+				if ($fix === true) {
+					$phpcsFile->fixer->beginChangeset();
+					for ($i = $stackPtr; $i <= $closingTag; $i++) {
+						$phpcsFile->fixer->replaceToken($i, '');
+					}
+
+					$phpcsFile->fixer->endChangeset();
+				}
+
+				return;
+			}
+		}//end if
+
+		if ($tokens[$firstContent]['line'] === $tokens[$stackPtr]['line']) {
+			$error = 'Opening PHP tag must be on a line by itself';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentAfterOpen');
+			if ($fix === true) {
+				$first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
+				$padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+				$phpcsFile->fixer->beginChangeset();
+				$phpcsFile->fixer->addNewline($stackPtr);
+				$phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
+				$phpcsFile->fixer->endChangeset();
+			}
+		} else {
+			// Check the indent of the first line, except if it is a scope closer.
+			if (isset($tokens[$firstContent]['scope_closer']) === false
+				|| $tokens[$firstContent]['scope_closer'] !== $firstContent
+			) {
+				// Check for a blank line at the top.
+				if ($tokens[$firstContent]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
+					// Find a token on the blank line to throw the error on.
+					$i = $stackPtr;
+					do {
+						$i++;
+					} while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
+
+					$error = 'Blank line found at start of embedded PHP content';
+					$fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
+					if ($fix === true) {
+						$phpcsFile->fixer->beginChangeset();
+						for ($i = ($stackPtr + 1); $i < $firstContent; $i++) {
+							if ($tokens[$i]['line'] === $tokens[$firstContent]['line']
+								|| $tokens[$i]['line'] === $tokens[$stackPtr]['line']
+							) {
+								continue;
+							}
+
+							$phpcsFile->fixer->replaceToken($i, '');
+						}
+
+						$phpcsFile->fixer->endChangeset();
+					}
+				}//end if
+
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+				if ($first === false) {
+					$first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+					$indent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+				} else {
+					$indent = ($tokens[($first + 1)]['column'] - 1);
+				}
+
+				$contentColumn = ($tokens[$firstContent]['column'] - 1);
+				if ($contentColumn !== $indent) {
+					$error = 'First line of embedded PHP code must be indented %s spaces; %s found';
+					$data  = [
+						$indent,
+						$contentColumn,
+					];
+					$fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
+					if ($fix === true) {
+						$padding = str_repeat(' ', $indent);
+						if ($contentColumn === 0) {
+							$phpcsFile->fixer->addContentBefore($firstContent, $padding);
+						} else {
+							$phpcsFile->fixer->replaceToken(($firstContent - 1), $padding);
+						}
+					}
+				}
+			}//end if
+		}//end if
+
+		$lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		if ($tokens[$lastContent]['line'] === $tokens[$stackPtr]['line']
+			&& trim($tokens[$lastContent]['content']) !== ''
+		) {
+			$error = 'Opening PHP tag must be on a line by itself';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
+			if ($fix === true) {
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+				if ($first === false) {
+					$first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+					$padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+				} else {
+					$padding = ($tokens[($first + 1)]['column'] - 1);
+				}
+
+				$phpcsFile->fixer->addContentBefore($stackPtr, $phpcsFile->eolChar.str_repeat(' ', $padding));
+			}
+		} else {
+			// Find the first token on the first non-empty line we find.
+			for ($first = ($stackPtr - 1); $first > 0; $first--) {
+				if ($tokens[$first]['line'] === $tokens[$stackPtr]['line']) {
+					continue;
+				} else if (trim($tokens[$first]['content']) !== '') {
+					$first = $phpcsFile->findFirstOnLine([], $first, true);
+					break;
+				}
+			}
+
+			$expected = 0;
+			if ($tokens[$first]['code'] === T_INLINE_HTML
+				&& trim($tokens[$first]['content']) !== ''
+			) {
+				$expected = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+			} else if ($tokens[$first]['code'] === T_WHITESPACE) {
+				$expected = ($tokens[($first + 1)]['column'] - 1);
+			}
+
+			$expected += 4;
+			$found     = ($tokens[$stackPtr]['column'] - 1);
+			if ($found > $expected) {
+				$error = 'Opening PHP tag indent incorrect; expected no more than %s spaces but found %s';
+				$data  = [
+					$expected,
+					$found,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
+				}
+			}
+		}//end if
+
+		if ($closingTag === false) {
+			return;
+		}
+
+		$lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
+		$nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
+
+		if ($tokens[$lastContent]['line'] === $tokens[$closingTag]['line']) {
+			$error = 'Closing PHP tag must be on a line by itself';
+			$fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
+			if ($fix === true) {
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+				$phpcsFile->fixer->beginChangeset();
+				$phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
+				$phpcsFile->fixer->addNewlineBefore($closingTag);
+				$phpcsFile->fixer->endChangeset();
+			}
+		} else if ($tokens[$nextContent]['line'] === $tokens[$closingTag]['line']) {
+			$error = 'Closing PHP tag must be on a line by itself';
+			$fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
+			if ($fix === true) {
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+				$phpcsFile->fixer->beginChangeset();
+				$phpcsFile->fixer->addNewline($closingTag);
+				$phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
+				$phpcsFile->fixer->endChangeset();
+			}
+		}//end if
+
+		$next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
+		if ($next === false) {
+			return;
+		}
+
+		// Check for a blank line at the bottom.
+		if ((isset($tokens[$lastContent]['scope_closer']) === false
+			|| $tokens[$lastContent]['scope_closer'] !== $lastContent)
+			&& $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
+		) {
+			// Find a token on the blank line to throw the error on.
+			$i = $closingTag;
+			do {
+				$i--;
+			} while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
+
+			$error = 'Blank line found at end of embedded PHP content';
+			$fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				for ($i = ($lastContent + 1); $i < $closingTag; $i++) {
+					if ($tokens[$i]['line'] === $tokens[$lastContent]['line']
+						|| $tokens[$i]['line'] === $tokens[$closingTag]['line']
+					) {
+						continue;
+					}
+
+					$phpcsFile->fixer->replaceToken($i, '');
+				}
+
+				$phpcsFile->fixer->endChangeset();
+			}
+		}//end if
+
+	}//end validateMultilineEmbeddedPhp()
+
+
+	/**
+	 * Validates embedded PHP that exists on one line.
+	 *
+	 * @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
+	 */
+	private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// We only want one line PHP sections, so return if the closing tag is
+		// on the next line.
+		$closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
+		if ($tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
+			return;
+		}
+
+		// Check that there is one, and only one space at the start of the statement.
+		$firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $closeTag, true);
+
+		if ($firstContent === false) {
+			$error = 'Empty embedded PHP tag found';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				for ($i = $stackPtr; $i <= $closeTag; $i++) {
+					$phpcsFile->fixer->replaceToken($i, '');
+				}
+
+				$phpcsFile->fixer->endChangeset();
+			}
+
+			return;
+		}
+
+		// The open tag token always contains a single space after it.
+		$leadingSpace = 1;
+		if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
+			$leadingSpace = ($tokens[($stackPtr + 1)]['length'] + 1);
+		}
+
+		if ($leadingSpace !== 1) {
+			$error = 'Expected 1 space after opening PHP tag; %s found';
+			$data  = [$leadingSpace];
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+			}
+		}
+
+		$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closeTag - 1), $stackPtr, true);
+		if ($prev !== $stackPtr) {
+			if ((isset($tokens[$prev]['scope_opener']) === false
+				|| $tokens[$prev]['scope_opener'] !== $prev)
+				&& (isset($tokens[$prev]['scope_closer']) === false
+				|| $tokens[$prev]['scope_closer'] !== $prev)
+				&& $tokens[$prev]['code'] !== T_SEMICOLON
+			) {
+				$error = 'Inline PHP statement must end with a semicolon';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
+				if ($fix === true) {
+					$phpcsFile->fixer->addContent($prev, ';');
+				}
+			} else if ($tokens[$prev]['code'] === T_SEMICOLON) {
+				$statementCount = 1;
+				for ($i = ($stackPtr + 1); $i < $prev; $i++) {
+					if ($tokens[$i]['code'] === T_SEMICOLON) {
+						$statementCount++;
+					}
+				}
+
+				if ($statementCount > 1) {
+					$error = 'Inline PHP statement must contain a single statement; %s found';
+					$data  = [$statementCount];
+					$phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
+				}
+			}
+		}//end if
+
+		$trailingSpace = 0;
+		if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
+			$trailingSpace = $tokens[($closeTag - 1)]['length'];
+		} else if (($tokens[($closeTag - 1)]['code'] === T_COMMENT
+			|| isset(Tokens::$phpcsCommentTokens[$tokens[($closeTag - 1)]['code']]) === true)
+			&& substr($tokens[($closeTag - 1)]['content'], -1) === ' '
+		) {
+			$trailingSpace = (strlen($tokens[($closeTag - 1)]['content']) - strlen(rtrim($tokens[($closeTag - 1)]['content'])));
+		}
+
+		if ($trailingSpace !== 1) {
+			$error = 'Expected 1 space before closing PHP tag; %s found';
+			$data  = [$trailingSpace];
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeClose', $data);
+			if ($fix === true) {
+				if ($trailingSpace === 0) {
+					$phpcsFile->fixer->addContentBefore($closeTag, ' ');
+				} else if ($tokens[($closeTag - 1)]['code'] === T_COMMENT
+					|| isset(Tokens::$phpcsCommentTokens[$tokens[($closeTag - 1)]['code']]) === true
+				) {
+					$phpcsFile->fixer->replaceToken(($closeTag - 1), rtrim($tokens[($closeTag - 1)]['content']).' ');
+				} else {
+					$phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
+				}
+			}
+		}
+
+	}//end validateInlineEmbeddedPhp()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php

Indentation +27 added lines, -27 removed lines

@@ -16,33 +16,33 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_EVAL];
-
-    }//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)
-    {
-        $error = 'Use of eval() is discouraged';
-        $phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_EVAL];
+
+	}//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)
+	{
+		$error = 'Use of eval() is discouraged';
+		$phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php

Indentation +19 added lines, -19 removed lines

@@ -14,25 +14,25 @@
 class DiscouragedFunctionsSniff extends GenericForbiddenFunctionsSniff
 {
 
-    /**
-     * A list of forbidden functions with their alternatives.
-     *
-     * The value is NULL if no alternative exists. IE, the
-     * function should just not be used.
-     *
-     * @var array<string, string|null>
-     */
-    public $forbiddenFunctions = [
-        'error_log' => null,
-        'print_r'   => null,
-        'var_dump'  => null,
-    ];
+	/**
+	 * A list of forbidden functions with their alternatives.
+	 *
+	 * The value is NULL if no alternative exists. IE, the
+	 * function should just not be used.
+	 *
+	 * @var array<string, string|null>
+	 */
+	public $forbiddenFunctions = [
+		'error_log' => null,
+		'print_r'   => null,
+		'var_dump'  => null,
+	];
 
-    /**
-     * If true, an error will be thrown; otherwise a warning.
-     *
-     * @var boolean
-     */
-    public $error = false;
+	/**
+	 * If true, an error will be thrown; otherwise a warning.
+	 *
+	 * @var boolean
+	 */
+	public $error = false;
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php

Indentation +50 added lines, -50 removed lines

@@ -15,65 +15,65 @@
 class PropertyLabelSpacingSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['JS'];
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = ['JS'];
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_PROPERTY,
-            T_LABEL,
-        ];
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_PROPERTY,
+			T_LABEL,
+		];
 
-    }//end register()
+	}//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();
+	/**
+	 * 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();
 
-        $colon = $phpcsFile->findNext(T_COLON, ($stackPtr + 1));
+		$colon = $phpcsFile->findNext(T_COLON, ($stackPtr + 1));
 
-        if ($colon !== ($stackPtr + 1)) {
-            $error = 'There must be no space before the colon in a property/label declaration';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Before');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-            }
-        }
+		if ($colon !== ($stackPtr + 1)) {
+			$error = 'There must be no space before the colon in a property/label declaration';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Before');
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+			}
+		}
 
-        if ($tokens[($colon + 1)]['code'] !== T_WHITESPACE || $tokens[($colon + 1)]['content'] !== ' ') {
-            $error = 'There must be a single space after the colon in a property/label declaration';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'After');
-            if ($fix === true) {
-                if ($tokens[($colon + 1)]['code'] === T_WHITESPACE) {
-                    $phpcsFile->fixer->replaceToken(($colon + 1), ' ');
-                } else {
-                    $phpcsFile->fixer->addContent($colon, ' ');
-                }
-            }
-        }
+		if ($tokens[($colon + 1)]['code'] !== T_WHITESPACE || $tokens[($colon + 1)]['content'] !== ' ') {
+			$error = 'There must be a single space after the colon in a property/label declaration';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'After');
+			if ($fix === true) {
+				if ($tokens[($colon + 1)]['code'] === T_WHITESPACE) {
+					$phpcsFile->fixer->replaceToken(($colon + 1), ' ');
+				} else {
+					$phpcsFile->fixer->addContent($colon, ' ');
+				}
+			}
+		}
 
-    }//end process()
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php

Indentation +36 added lines, -36 removed lines

@@ -17,49 +17,49 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return Tokens::$castTokens;
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return Tokens::$castTokens;
 
-    }//end register()
+	}//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();
+	/**
+	 * 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();
 
-        $content  = $tokens[$stackPtr]['content'];
-        $expected = str_replace(' ', '', $content);
-        $expected = str_replace("\t", '', $expected);
+		$content  = $tokens[$stackPtr]['content'];
+		$expected = str_replace(' ', '', $content);
+		$expected = str_replace("\t", '', $expected);
 
-        if ($content !== $expected) {
-            $error = 'Cast statements must not contain whitespace; expected "%s" but found "%s"';
-            $data  = [
-                $expected,
-                $content,
-            ];
+		if ($content !== $expected) {
+			$error = 'Cast statements must not contain whitespace; expected "%s" but found "%s"';
+			$data  = [
+				$expected,
+				$content,
+			];
 
-            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'ContainsWhiteSpace', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($stackPtr, $expected);
-            }
-        }
+			$fix = $phpcsFile->addFixableError($error, $stackPtr, 'ContainsWhiteSpace', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken($stackPtr, $expected);
+			}
+		}
 
-    }//end process()
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
                 $tokens[$stackPtr]['content'].' '.$tokens[($stackPtr + 1)]['content'],
                 $tokens[$stackPtr]['content'].$tokens[($stackPtr + 1)]['content'],
             ];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
+            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
             if ($fix === true) {
                 $phpcsFile->fixer->addContent($stackPtr, ' ');
             }

Indentation +60 added lines, -60 removed lines

@@ -17,73 +17,73 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_ECHO,
-            T_PRINT,
-            T_RETURN,
-            T_INCLUDE,
-            T_INCLUDE_ONCE,
-            T_REQUIRE,
-            T_REQUIRE_ONCE,
-            T_NEW,
-        ];
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_ECHO,
+			T_PRINT,
+			T_RETURN,
+			T_INCLUDE,
+			T_INCLUDE_ONCE,
+			T_REQUIRE,
+			T_REQUIRE_ONCE,
+			T_NEW,
+		];
 
-    }//end register()
+	}//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();
+	/**
+	 * 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();
 
-        if (isset($tokens[($stackPtr + 1)]) === false) {
-            // Skip if there is no next token.
-            return;
-        }
+		if (isset($tokens[($stackPtr + 1)]) === false) {
+			// Skip if there is no next token.
+			return;
+		}
 
-        if ($tokens[($stackPtr + 1)]['code'] === T_SEMICOLON) {
-            // No content for this language construct.
-            return;
-        }
+		if ($tokens[($stackPtr + 1)]['code'] === T_SEMICOLON) {
+			// No content for this language construct.
+			return;
+		}
 
-        if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
-            $content = $tokens[($stackPtr + 1)]['content'];
-            if ($content !== ' ') {
-                $error = 'Language constructs must be followed by a single space; expected 1 space but found "%s"';
-                $data  = [Util\Common::prepareForOutput($content)];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'IncorrectSingle', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
-                }
-            }
-        } else if ($tokens[($stackPtr + 1)]['code'] !== T_OPEN_PARENTHESIS) {
-            $error = 'Language constructs must be followed by a single space; expected "%s" but found "%s"';
-            $data  = [
-                $tokens[$stackPtr]['content'].' '.$tokens[($stackPtr + 1)]['content'],
-                $tokens[$stackPtr]['content'].$tokens[($stackPtr + 1)]['content'],
-            ];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->addContent($stackPtr, ' ');
-            }
-        }//end if
+		if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
+			$content = $tokens[($stackPtr + 1)]['content'];
+			if ($content !== ' ') {
+				$error = 'Language constructs must be followed by a single space; expected 1 space but found "%s"';
+				$data  = [Util\Common::prepareForOutput($content)];
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'IncorrectSingle', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+				}
+			}
+		} else if ($tokens[($stackPtr + 1)]['code'] !== T_OPEN_PARENTHESIS) {
+			$error = 'Language constructs must be followed by a single space; expected "%s" but found "%s"';
+			$data  = [
+				$tokens[$stackPtr]['content'].' '.$tokens[($stackPtr + 1)]['content'],
+				$tokens[$stackPtr]['content'].$tokens[($stackPtr + 1)]['content'],
+			];
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->addContent($stackPtr, ' ');
+			}
+		}//end if
 
-    }//end process()
+	}//end process()
 
 
 }//end class

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

Indentation +67 added lines, -67 removed lines

@@ -17,80 +17,80 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_OPEN_SQUARE_BRACKET,
-            T_CLOSE_SQUARE_BRACKET,
-        ];
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_OPEN_SQUARE_BRACKET,
+			T_CLOSE_SQUARE_BRACKET,
+		];
 
-    }//end register()
+	}//end register()
 
 
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The current file being checked.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	/**
+	 * Processes this sniff, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The current file being checked.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
 
-        if (($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET
-            && isset($tokens[$stackPtr]['bracket_closer']) === false)
-            || ($tokens[$stackPtr]['code'] === T_CLOSE_SQUARE_BRACKET
-            && isset($tokens[$stackPtr]['bracket_opener']) === false)
-        ) {
-            // Bow out for parse error/during live coding.
-            return;
-        }
+		if (($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET
+			&& isset($tokens[$stackPtr]['bracket_closer']) === false)
+			|| ($tokens[$stackPtr]['code'] === T_CLOSE_SQUARE_BRACKET
+			&& isset($tokens[$stackPtr]['bracket_opener']) === false)
+		) {
+			// Bow out for parse error/during live coding.
+			return;
+		}
 
-        // Square brackets can not have a space before them.
-        $prevType = $tokens[($stackPtr - 1)]['code'];
-        if ($prevType === T_WHITESPACE) {
-            $nonSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 2), null, true);
-            $expected = $tokens[$nonSpace]['content'].$tokens[$stackPtr]['content'];
-            $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).$tokens[$stackPtr]['content'];
-            $error    = 'Space found before square bracket; expected "%s" but found "%s"';
-            $data     = [
-                $expected,
-                $found,
-            ];
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
-            }
-        }
+		// Square brackets can not have a space before them.
+		$prevType = $tokens[($stackPtr - 1)]['code'];
+		if ($prevType === T_WHITESPACE) {
+			$nonSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 2), null, true);
+			$expected = $tokens[$nonSpace]['content'].$tokens[$stackPtr]['content'];
+			$found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).$tokens[$stackPtr]['content'];
+			$error    = 'Space found before square bracket; expected "%s" but found "%s"';
+			$data     = [
+				$expected,
+				$found,
+			];
+			$fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
+			}
+		}
 
-        // Open square brackets can't ever have spaces after them.
-        if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
-            $nextType = $tokens[($stackPtr + 1)]['code'];
-            if ($nextType === T_WHITESPACE) {
-                $nonSpace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
-                $expected = $tokens[$stackPtr]['content'].$tokens[$nonSpace]['content'];
-                $found    = $phpcsFile->getTokensAsString($stackPtr, ($nonSpace - $stackPtr + 1));
-                $error    = 'Space found after square bracket; expected "%s" but found "%s"';
-                $data     = [
-                    $expected,
-                    $found,
-                ];
-                $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-                }
-            }
-        }
+		// Open square brackets can't ever have spaces after them.
+		if ($tokens[$stackPtr]['code'] === T_OPEN_SQUARE_BRACKET) {
+			$nextType = $tokens[($stackPtr + 1)]['code'];
+			if ($nextType === T_WHITESPACE) {
+				$nonSpace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 2), null, true);
+				$expected = $tokens[$stackPtr]['content'].$tokens[$nonSpace]['content'];
+				$found    = $phpcsFile->getTokensAsString($stackPtr, ($nonSpace - $stackPtr + 1));
+				$error    = 'Space found after square bracket; expected "%s" but found "%s"';
+				$data     = [
+					$expected,
+					$found,
+				];
+				$fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+				}
+			}
+		}
 
-    }//end process()
+	}//end process()
 
 
 }//end class

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
                 $expected,
                 $found,
             ];
-            $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
+            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeBracket', $data);
             if ($fix === true) {
                 $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
             }
@@ -83,7 +83,7 @@ 
                     $expected,
                     $found,
                 ];
-                $fix      = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterBracket', $data);
                 if ($fix === true) {
                     $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
                 }

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php

Indentation +123 added lines, -123 removed lines

@@ -16,129 +16,129 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_CONSTANT_ENCAPSED_STRING,
-            T_DOUBLE_QUOTED_STRING,
-        ];
-
-    }//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();
-
-        // If tabs are being converted to spaces by the tokeniser, the
-        // original content should be used instead of the converted content.
-        if (isset($tokens[$stackPtr]['orig_content']) === true) {
-            $workingString = $tokens[$stackPtr]['orig_content'];
-        } else {
-            $workingString = $tokens[$stackPtr]['content'];
-        }
-
-        $lastStringToken = $stackPtr;
-
-        $i = ($stackPtr + 1);
-        if (isset($tokens[$i]) === true) {
-            while ($i < $phpcsFile->numTokens
-                && $tokens[$i]['code'] === $tokens[$stackPtr]['code']
-            ) {
-                if (isset($tokens[$i]['orig_content']) === true) {
-                    $workingString .= $tokens[$i]['orig_content'];
-                } else {
-                    $workingString .= $tokens[$i]['content'];
-                }
-
-                $lastStringToken = $i;
-                $i++;
-            }
-        }
-
-        $skipTo = ($lastStringToken + 1);
-
-        // Check if it's a double quoted string.
-        if ($workingString[0] !== '"' || substr($workingString, -1) !== '"') {
-            return $skipTo;
-        }
-
-        // The use of variables in double quoted strings is not allowed.
-        if ($tokens[$stackPtr]['code'] === T_DOUBLE_QUOTED_STRING) {
-            $stringTokens = token_get_all('<?php '.$workingString);
-            foreach ($stringTokens as $token) {
-                if (is_array($token) === true && $token[0] === T_VARIABLE) {
-                    $error = 'Variable "%s" not allowed in double quoted string; use concatenation instead';
-                    $data  = [$token[1]];
-                    $phpcsFile->addError($error, $stackPtr, 'ContainsVar', $data);
-                }
-            }
-
-            return $skipTo;
-        }//end if
-
-        $allowedChars = [
-            '\0',
-            '\1',
-            '\2',
-            '\3',
-            '\4',
-            '\5',
-            '\6',
-            '\7',
-            '\n',
-            '\r',
-            '\f',
-            '\t',
-            '\v',
-            '\x',
-            '\b',
-            '\e',
-            '\u',
-            '\'',
-        ];
-
-        foreach ($allowedChars as $testChar) {
-            if (strpos($workingString, $testChar) !== false) {
-                return $skipTo;
-            }
-        }
-
-        $error = 'String %s does not require double quotes; use single quotes instead';
-        $data  = [str_replace(["\r", "\n"], ['\r', '\n'], $workingString)];
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotRequired', $data);
-
-        if ($fix === true) {
-            $phpcsFile->fixer->beginChangeset();
-            $innerContent = substr($workingString, 1, -1);
-            $innerContent = str_replace('\"', '"', $innerContent);
-            $innerContent = str_replace('\\$', '$', $innerContent);
-            $phpcsFile->fixer->replaceToken($stackPtr, "'$innerContent'");
-            while ($lastStringToken !== $stackPtr) {
-                $phpcsFile->fixer->replaceToken($lastStringToken, '');
-                $lastStringToken--;
-            }
-
-            $phpcsFile->fixer->endChangeset();
-        }
-
-        return $skipTo;
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_CONSTANT_ENCAPSED_STRING,
+			T_DOUBLE_QUOTED_STRING,
+		];
+
+	}//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();
+
+		// If tabs are being converted to spaces by the tokeniser, the
+		// original content should be used instead of the converted content.
+		if (isset($tokens[$stackPtr]['orig_content']) === true) {
+			$workingString = $tokens[$stackPtr]['orig_content'];
+		} else {
+			$workingString = $tokens[$stackPtr]['content'];
+		}
+
+		$lastStringToken = $stackPtr;
+
+		$i = ($stackPtr + 1);
+		if (isset($tokens[$i]) === true) {
+			while ($i < $phpcsFile->numTokens
+				&& $tokens[$i]['code'] === $tokens[$stackPtr]['code']
+			) {
+				if (isset($tokens[$i]['orig_content']) === true) {
+					$workingString .= $tokens[$i]['orig_content'];
+				} else {
+					$workingString .= $tokens[$i]['content'];
+				}
+
+				$lastStringToken = $i;
+				$i++;
+			}
+		}
+
+		$skipTo = ($lastStringToken + 1);
+
+		// Check if it's a double quoted string.
+		if ($workingString[0] !== '"' || substr($workingString, -1) !== '"') {
+			return $skipTo;
+		}
+
+		// The use of variables in double quoted strings is not allowed.
+		if ($tokens[$stackPtr]['code'] === T_DOUBLE_QUOTED_STRING) {
+			$stringTokens = token_get_all('<?php '.$workingString);
+			foreach ($stringTokens as $token) {
+				if (is_array($token) === true && $token[0] === T_VARIABLE) {
+					$error = 'Variable "%s" not allowed in double quoted string; use concatenation instead';
+					$data  = [$token[1]];
+					$phpcsFile->addError($error, $stackPtr, 'ContainsVar', $data);
+				}
+			}
+
+			return $skipTo;
+		}//end if
+
+		$allowedChars = [
+			'\0',
+			'\1',
+			'\2',
+			'\3',
+			'\4',
+			'\5',
+			'\6',
+			'\7',
+			'\n',
+			'\r',
+			'\f',
+			'\t',
+			'\v',
+			'\x',
+			'\b',
+			'\e',
+			'\u',
+			'\'',
+		];
+
+		foreach ($allowedChars as $testChar) {
+			if (strpos($workingString, $testChar) !== false) {
+				return $skipTo;
+			}
+		}
+
+		$error = 'String %s does not require double quotes; use single quotes instead';
+		$data  = [str_replace(["\r", "\n"], ['\r', '\n'], $workingString)];
+		$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotRequired', $data);
+
+		if ($fix === true) {
+			$phpcsFile->fixer->beginChangeset();
+			$innerContent = substr($workingString, 1, -1);
+			$innerContent = str_replace('\"', '"', $innerContent);
+			$innerContent = str_replace('\\$', '$', $innerContent);
+			$phpcsFile->fixer->replaceToken($stackPtr, "'$innerContent'");
+			while ($lastStringToken !== $stackPtr) {
+				$phpcsFile->fixer->replaceToken($lastStringToken, '');
+				$lastStringToken--;
+			}
+
+			$phpcsFile->fixer->endChangeset();
+		}
+
+		return $skipTo;
+
+	}//end process()
 
 
 }//end class