diff --git a/autoload.php b/autoload.php index 6f38c75d96..3ad938ffd8 100644 --- a/autoload.php +++ b/autoload.php @@ -140,8 +140,7 @@ public static function load(string $className) } return false; - - }//end load() + } /** @@ -183,8 +182,7 @@ public static function loadFile(string $path) self::$loadedClasses[$path] = $className; self::$loadedFiles[$className] = $path; return self::$loadedClasses[$path]; - - }//end loadFile() + } /** @@ -244,8 +242,7 @@ static function ($remaining, $current) { } return $className; - - }//end determineLoadedClass() + } /** @@ -259,8 +256,7 @@ static function ($remaining, $current) { public static function addSearchPath(string $path, string $nsPrefix = '') { self::$searchPaths[$path] = rtrim(trim((string) $nsPrefix), '\\'); - - }//end addSearchPath() + } /** @@ -271,8 +267,7 @@ public static function addSearchPath(string $path, string $nsPrefix = '') public static function getSearchPaths() { return self::$searchPaths; - - }//end getSearchPaths() + } /** @@ -290,8 +285,7 @@ public static function getLoadedClassName(string $path) } return self::$loadedClasses[$path]; - - }//end getLoadedClassName() + } /** @@ -309,8 +303,7 @@ public static function getLoadedFileName(string $className) } return self::$loadedFiles[$className]; - - }//end getLoadedFileName() + } /** @@ -321,8 +314,7 @@ public static function getLoadedFileName(string $className) public static function getLoadedClasses() { return self::$loadedClasses; - - }//end getLoadedClasses() + } /** @@ -333,11 +325,8 @@ public static function getLoadedClasses() public static function getLoadedFiles() { return self::$loadedFiles; - - }//end getLoadedFiles() - - - }//end class + } + } // Register the autoloader before any existing autoloaders to ensure // it gets a chance to hear about every autoload request, and record diff --git a/phpcs.xml.dist b/phpcs.xml.dist index ea5d632a1e..d16d85f967 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -37,7 +37,7 @@ - + @@ -64,8 +64,15 @@ - - + + + + + + + + + diff --git a/requirements.php b/requirements.php index 2558b8fa50..72db52ea98 100644 --- a/requirements.php +++ b/requirements.php @@ -69,5 +69,4 @@ function checkRequirements() fwrite(STDERR, sprintf($error, $required, $missing)); exit($exitCode); } - -}//end checkRequirements() +} diff --git a/scripts/BuildRequirementsCheckMatrix.php b/scripts/BuildRequirementsCheckMatrix.php index f7b395a7f5..d86294160e 100644 --- a/scripts/BuildRequirementsCheckMatrix.php +++ b/scripts/BuildRequirementsCheckMatrix.php @@ -71,8 +71,7 @@ public function getBuilds() ); return $builds; - - }//end getBuilds() + } /** @@ -105,8 +104,7 @@ private function getValidBuilds() } return $builds; - - }//end getValidBuilds() + } /** @@ -137,8 +135,7 @@ private function getInvalidPHPBuilds() } return $builds; - - }//end getInvalidPHPBuilds() + } /** @@ -181,8 +178,5 @@ private function getMissingExtensionsBuilds() }//end foreach return $builds; - - }//end getMissingExtensionsBuilds() - - -}//end class + } +} diff --git a/scripts/build-phar.php b/scripts/build-phar.php index 545f97e9ae..c07707df57 100644 --- a/scripts/build-phar.php +++ b/scripts/build-phar.php @@ -75,8 +75,7 @@ function stripWhitespaceAndComments(string $fullpath, Config $config) } return $stripped; - -}//end stripWhitespaceAndComments() +} Timing::startTiming(); diff --git a/src/Config.php b/src/Config.php index 0594770f01..13a108612f 100644 --- a/src/Config.php +++ b/src/Config.php @@ -275,8 +275,7 @@ public function __get(string $name) } return $this->settings[$name]; - - }//end __get() + } /** @@ -348,8 +347,7 @@ public function __set(string $name, $value) }//end switch $this->settings[$name] = $value; - - }//end __set() + } /** @@ -362,8 +360,7 @@ public function __set(string $name, $value) public function __isset(string $name) { return isset($this->settings[$name]); - - }//end __isset() + } /** @@ -376,8 +373,7 @@ public function __isset(string $name) public function __unset(string $name) { $this->settings[$name] = null; - - }//end __unset() + } /** @@ -388,8 +384,7 @@ public function __unset(string $name) public function getSettings() { return $this->settings; - - }//end getSettings() + } /** @@ -402,8 +397,7 @@ public function getSettings() public function setSettings(array $settings) { $this->settings = $settings; - - }//end setSettings() + } /** @@ -487,8 +481,7 @@ public function __construct(array $cliArgs = [], bool $dieOnUnknownArg = true) }//end if fclose($handle); - - }//end __construct() + } /** @@ -538,8 +531,7 @@ public function setCommandLineValues(array $args) $this->processUnknownArgument($arg, $i); }//end if }//end for - - }//end setCommandLineValues() + } /** @@ -662,8 +654,7 @@ public function restoreDefaults() if ($parallel !== null) { $this->parallel = max((int) $parallel, 1); } - - }//end restoreDefaults() + } /** @@ -774,8 +765,7 @@ public function processShortArgument(string $arg, int $pos) $this->processUnknownArgument('-' . $arg, $pos); } }//end switch - - }//end processShortArgument() + } /** @@ -1306,8 +1296,7 @@ public function processLongArgument(string $arg, int $pos) }//end if break; }//end switch - - }//end processLongArgument() + } /** @@ -1393,8 +1382,7 @@ static function ($carry, $item) { } return $sniffs; - - }//end parseSniffCodes() + } /** @@ -1422,8 +1410,7 @@ public function processUnknownArgument(string $arg, int $pos) } $this->processFilePath($arg); - - }//end processUnknownArgument() + } /** @@ -1458,8 +1445,7 @@ public function processFilePath(string $path) $this->files = $files; $this->overriddenDefaults['files'] = true; } - - }//end processFilePath() + } /** @@ -1478,8 +1464,7 @@ public function printUsage() } echo PHP_EOL; - - }//end printUsage() + } /** @@ -1505,8 +1490,7 @@ public function printShortUsage(bool $returnOutput = false) } echo $usage; - - }//end printShortUsage() + } /** @@ -1531,8 +1515,7 @@ public function printPHPCSUsage() $shortOptions = Help::DEFAULT_SHORT_OPTIONS . 'aems'; (new Help($this, $longOptions, $shortOptions))->display(); - - }//end printPHPCSUsage() + } /** @@ -1547,8 +1530,7 @@ public function printPHPCBFUsage() $shortOptions = Help::DEFAULT_SHORT_OPTIONS; (new Help($this, $longOptions, $shortOptions))->display(); - - }//end printPHPCBFUsage() + } /** @@ -1573,8 +1555,7 @@ public static function getConfigData(string $key) } return $phpCodeSnifferConfig[$key]; - - }//end getConfigData() + } /** @@ -1614,8 +1595,7 @@ public static function getExecutablePath(string $name) self::$executablePaths[$name] = $result; return $result; - - }//end getExecutablePath() + } /** @@ -1696,8 +1676,7 @@ public function setConfigData(string $key, ?string $value, bool $temp = false) } return true; - - }//end setConfigData() + } /** @@ -1738,8 +1717,7 @@ public static function getAllConfigData() self::$configDataFile = $configFile; self::$configData = $phpCodeSnifferConfig; return self::$configData; - - }//end getAllConfigData() + } /** @@ -1773,8 +1751,7 @@ public function prepareConfigDataForDisplay(array $data) } return $output; - - }//end prepareConfigDataForDisplay() + } /** @@ -1789,8 +1766,5 @@ public function prepareConfigDataForDisplay(array $data) public function printConfigData(array $data) { echo $this->prepareConfigDataForDisplay($data); - - }//end printConfigData() - - -}//end class + } +} diff --git a/src/Exceptions/DeepExitException.php b/src/Exceptions/DeepExitException.php index 4b81305cc6..a3d637224c 100644 --- a/src/Exceptions/DeepExitException.php +++ b/src/Exceptions/DeepExitException.php @@ -22,4 +22,4 @@ class DeepExitException extends Exception { -}//end class +} diff --git a/src/Exceptions/GeneratorException.php b/src/Exceptions/GeneratorException.php index 0921f08f22..2a840b2d86 100644 --- a/src/Exceptions/GeneratorException.php +++ b/src/Exceptions/GeneratorException.php @@ -15,4 +15,4 @@ class GeneratorException extends DomainException { -}//end class +} diff --git a/src/Exceptions/RuntimeException.php b/src/Exceptions/RuntimeException.php index 25eacd0b18..b162836636 100644 --- a/src/Exceptions/RuntimeException.php +++ b/src/Exceptions/RuntimeException.php @@ -14,4 +14,4 @@ class RuntimeException extends PHPRuntimeException { -}//end class +} diff --git a/src/Exceptions/TokenizerException.php b/src/Exceptions/TokenizerException.php index 1cf53d6237..587aed660c 100644 --- a/src/Exceptions/TokenizerException.php +++ b/src/Exceptions/TokenizerException.php @@ -14,4 +14,4 @@ class TokenizerException extends Exception { -}//end class +} diff --git a/src/Files/DummyFile.php b/src/Files/DummyFile.php index f7ba62f46f..666b75f900 100644 --- a/src/Files/DummyFile.php +++ b/src/Files/DummyFile.php @@ -55,8 +55,7 @@ public function __construct(string $content, Ruleset $ruleset, Config $config) } parent::__construct($path, $ruleset, $config); - - }//end __construct() + } /** @@ -85,8 +84,5 @@ public function setErrorCounts( $this->fixableWarningCount = $fixableWarningCount; $this->fixedErrorCount = $fixedErrorCount; $this->fixedWarningCount = $fixedWarningCount; - - }//end setErrorCounts() - - -}//end class + } +} diff --git a/src/Files/File.php b/src/Files/File.php index 180ee4f3aa..e9ea5f2bfd 100644 --- a/src/Files/File.php +++ b/src/Files/File.php @@ -283,8 +283,7 @@ public function __construct(string $path, Ruleset $ruleset, Config $config) $this->configCache['trackTime'] = $this->config->trackTime; $this->configCache['ignorePatterns'] = $this->ruleset->ignorePatterns; $this->configCache['includePatterns'] = $this->ruleset->includePatterns; - - }//end __construct() + } /** @@ -307,8 +306,7 @@ public function setContent(string $content) $this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings'); return; } - - }//end setContent() + } /** @@ -321,8 +319,7 @@ public function setContent(string $content) */ public function reloadContent() { - - }//end reloadContent() + } /** @@ -333,8 +330,7 @@ public function reloadContent() public function disableCaching() { $this->configCache['cache'] = false; - - }//end disableCaching() + } /** @@ -558,8 +554,7 @@ public function process() $this->fixedCount += $this->fixer->getFixCount(); $this->fixedErrorCount = ($this->firstRunCounts['fixableError'] - $this->fixableErrorCount); $this->fixedWarningCount = ($this->firstRunCounts['fixableWarning'] - $this->fixableWarningCount); - - }//end process() + } /** @@ -622,8 +617,7 @@ public function parse() StatusWriter::write("[$this->numTokens tokens in $numLines lines]... ", 0, $newlines); } - - }//end parse() + } /** @@ -634,8 +628,7 @@ public function parse() public function getTokens() { return $this->tokens; - - }//end getTokens() + } /** @@ -653,8 +646,7 @@ public function cleanUp() $this->fixer = null; $this->config = null; $this->ruleset = null; - - }//end cleanUp() + } /** @@ -687,8 +679,7 @@ public function addError( } return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable); - - }//end addError() + } /** @@ -721,8 +712,7 @@ public function addWarning( } return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable); - - }//end addWarning() + } /** @@ -745,8 +735,7 @@ public function addErrorOnLine( int $severity = 0 ) { return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false); - - }//end addErrorOnLine() + } /** @@ -769,8 +758,7 @@ public function addWarningOnLine( int $severity = 0 ) { return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false); - - }//end addWarningOnLine() + } /** @@ -800,8 +788,7 @@ public function addFixableError( } return false; - - }//end addFixableError() + } /** @@ -831,8 +818,7 @@ public function addFixableWarning( } return false; - - }//end addFixableWarning() + } /** @@ -1092,8 +1078,7 @@ protected function addMessage( } return true; - - }//end addMessage() + } /** @@ -1120,8 +1105,7 @@ public function recordMetric(int $stackPtr, string $metric, string $value) } return true; - - }//end recordMetric() + } /** @@ -1132,8 +1116,7 @@ public function recordMetric(int $stackPtr, string $metric, string $value) public function getErrorCount() { return $this->errorCount; - - }//end getErrorCount() + } /** @@ -1144,8 +1127,7 @@ public function getErrorCount() public function getWarningCount() { return $this->warningCount; - - }//end getWarningCount() + } /** @@ -1156,8 +1138,7 @@ public function getWarningCount() public function getFixableCount() { return ($this->fixableErrorCount + $this->fixableWarningCount); - - }//end getFixableCount() + } /** @@ -1168,8 +1149,7 @@ public function getFixableCount() public function getFixableErrorCount() { return $this->fixableErrorCount; - - }//end getFixableErrorCount() + } /** @@ -1180,8 +1160,7 @@ public function getFixableErrorCount() public function getFixableWarningCount() { return $this->fixableWarningCount; - - }//end getFixableWarningCount() + } /** @@ -1192,8 +1171,7 @@ public function getFixableWarningCount() public function getFixedCount() { return $this->fixedCount; - - }//end getFixedCount() + } /** @@ -1204,8 +1182,7 @@ public function getFixedCount() public function getFixedErrorCount() { return $this->fixedErrorCount; - - }//end getFixedErrorCount() + } /** @@ -1216,8 +1193,7 @@ public function getFixedErrorCount() public function getFixedWarningCount() { return $this->fixedWarningCount; - - }//end getFixedWarningCount() + } /** @@ -1232,8 +1208,7 @@ public function getFixedWarningCount() public function getFirstRunCount(string $type): int { return $this->firstRunCounts[$type]; - - }//end getFirstRunCount() + } /** @@ -1244,8 +1219,7 @@ public function getFirstRunCount(string $type): int public function getIgnoredLines() { return $this->tokenizer->ignoredLines; - - }//end getIgnoredLines() + } /** @@ -1256,8 +1230,7 @@ public function getIgnoredLines() public function getErrors() { return $this->errors; - - }//end getErrors() + } /** @@ -1268,8 +1241,7 @@ public function getErrors() public function getWarnings() { return $this->warnings; - - }//end getWarnings() + } /** @@ -1280,8 +1252,7 @@ public function getWarnings() public function getMetrics() { return $this->metrics; - - }//end getMetrics() + } /** @@ -1292,8 +1263,7 @@ public function getMetrics() public function getListenerTimes() { return $this->listenerTimes; - - }//end getListenerTimes() + } /** @@ -1304,8 +1274,7 @@ public function getListenerTimes() public function getFilename() { return $this->path; - - }//end getFilename() + } /** @@ -1350,8 +1319,7 @@ public function getDeclarationName(int $stackPtr) } return $content; - - }//end getDeclarationName() + } /** @@ -1688,8 +1656,7 @@ public function getMethodParameters(int $stackPtr) }//end for return $vars; - - }//end getMethodParameters() + } /** @@ -1871,8 +1838,7 @@ public function getMethodProperties(int $stackPtr) 'is_static' => $isStatic, 'has_body' => $hasBody, ]; - - }//end getMethodProperties() + } /** @@ -2071,8 +2037,7 @@ public function getMemberProperties(int $stackPtr) 'type_end_token' => $typeEndToken, 'nullable_type' => $nullableType, ]; - - }//end getMemberProperties() + } /** @@ -2137,8 +2102,7 @@ public function getClassProperties(int $stackPtr) 'is_final' => $isFinal, 'is_readonly' => $isReadonly, ]; - - }//end getClassProperties() + } /** @@ -2248,8 +2212,7 @@ public function isReference(int $stackPtr) }//end if return false; - - }//end isReference() + } /** @@ -2291,8 +2254,7 @@ public function getTokensAsString($start, $length, bool $origContent = false) } return $str; - - }//end getTokensAsString() + } /** @@ -2372,8 +2334,7 @@ public function findPrevious( }//end for return false; - - }//end findPrevious() + } /** @@ -2439,8 +2400,7 @@ public function findNext( }//end for return false; - - }//end findNext() + } /** @@ -2630,8 +2590,7 @@ public function findStartOfStatement(int $start, $ignore = null) }//end for return 0; - - }//end findStartOfStatement() + } /** @@ -2745,8 +2704,7 @@ public function findEndOfStatement(int $start, $ignore = null) }//end for return ($this->numTokens - 1); - - }//end findEndOfStatement() + } /** @@ -2807,8 +2765,7 @@ public function findFirstOnLine($types, int $start, bool $exclude = false, ?stri }//end for return $foundToken; - - }//end findFirstOnLine() + } /** @@ -2842,8 +2799,7 @@ public function hasCondition(int $stackPtr, $types) } return false; - - }//end hasCondition() + } /** @@ -2884,8 +2840,7 @@ public function getCondition(int $stackPtr, $type, bool $first = true) } return false; - - }//end getCondition() + } /** @@ -2934,8 +2889,7 @@ public function findExtendedClassName(int $stackPtr) } return $name; - - }//end findExtendedClassName() + } /** @@ -2986,8 +2940,5 @@ public function findImplementedInterfaceNames(int $stackPtr) $names = array_map('trim', $names); return $names; } - - }//end findImplementedInterfaceNames() - - -}//end class + } +} diff --git a/src/Files/FileList.php b/src/Files/FileList.php index a7b856a460..32c5a9ecd0 100644 --- a/src/Files/FileList.php +++ b/src/Files/FileList.php @@ -102,8 +102,7 @@ public function __construct(Config $config, Ruleset $ruleset) reset($this->files); $this->numFiles = count($this->files); - - }//end __construct() + } /** @@ -142,8 +141,7 @@ public function addFile(string $path, ?File $file = null) $this->files[$path] = $file; $this->numFiles++; } - - }//end addFile() + } /** @@ -174,8 +172,7 @@ private function getFilterClass() } return $filterClass; - - }//end getFilterClass() + } /** @@ -187,8 +184,7 @@ private function getFilterClass() public function rewind() { reset($this->files); - - }//end rewind() + } /** @@ -205,8 +201,7 @@ public function current() } return $this->files[$path]; - - }//end current() + } /** @@ -218,8 +213,7 @@ public function current() public function key() { return key($this->files); - - }//end key() + } /** @@ -231,8 +225,7 @@ public function key() public function next() { next($this->files); - - }//end next() + } /** @@ -248,8 +241,7 @@ public function valid() } return true; - - }//end valid() + } /** @@ -261,8 +253,5 @@ public function valid() public function count() { return $this->numFiles; - - }//end count() - - -}//end class + } +} diff --git a/src/Files/LocalFile.php b/src/Files/LocalFile.php index 907298e207..e1bf7d7ae4 100644 --- a/src/Files/LocalFile.php +++ b/src/Files/LocalFile.php @@ -60,8 +60,7 @@ public function __construct(string $path, Ruleset $ruleset, Config $config) $this->reloadContent(); parent::__construct($this->path, $ruleset, $config); - - }//end __construct() + } /** @@ -72,8 +71,7 @@ public function __construct(string $path, Ruleset $ruleset, Config $config) public function reloadContent() { $this->setContent(file_get_contents($this->path)); - - }//end reloadContent() + } /** @@ -150,8 +148,7 @@ public function process() $this->replayErrors($this->errors, $this->warnings); $this->configCache['cache'] = true; } - - }//end process() + } /** @@ -214,8 +211,5 @@ private function replayErrors(array $errors, array $warnings) } $this->replayingErrors = false; - - }//end replayErrors() - - -}//end class + } +} diff --git a/src/Filters/ExactMatch.php b/src/Filters/ExactMatch.php index 782ec99e02..c9305b6447 100644 --- a/src/Filters/ExactMatch.php +++ b/src/Filters/ExactMatch.php @@ -67,8 +67,7 @@ public function accept() } return isset($this->allowedFiles[$filePath]); - - }//end accept() + } /** @@ -85,8 +84,7 @@ public function getChildren() $children->disallowedFiles = $this->disallowedFiles; $children->allowedFiles = $this->allowedFiles; return $children; - - }//end getChildren() + } /** @@ -107,6 +105,4 @@ abstract protected function getDisallowedFiles(); * @return array */ abstract protected function getAllowedFiles(); - - -}//end class +} diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php index 4795a9e06a..5985bf8648 100644 --- a/src/Filters/Filter.php +++ b/src/Filters/Filter.php @@ -95,8 +95,7 @@ public function __construct(RecursiveIterator $iterator, string $basedir, Config if (is_dir($basedir) === true || Common::isPharFile($basedir) === true) { $this->isBasedirDir = true; } - - }//end __construct() + } /** @@ -137,8 +136,7 @@ public function accept() $this->acceptedPaths[$realPath] = true; return true; - - }//end accept() + } /** @@ -165,8 +163,7 @@ public function getChildren() $children->ignoreFilePatterns = $this->ignoreFilePatterns; $children->acceptedPaths = $this->acceptedPaths; return $children; - - }//end getChildren() + } /** @@ -214,8 +211,7 @@ protected function shouldProcessFile(string $path) } return true; - - }//end shouldProcessFile() + } /** @@ -298,8 +294,5 @@ protected function shouldIgnorePath(string $path) }//end foreach return false; - - }//end shouldIgnorePath() - - -}//end class + } +} diff --git a/src/Filters/GitModified.php b/src/Filters/GitModified.php index b5cd7d5e3b..6465f5cd13 100644 --- a/src/Filters/GitModified.php +++ b/src/Filters/GitModified.php @@ -25,8 +25,7 @@ class GitModified extends ExactMatch protected function getDisallowedFiles() { return []; - - }//end getDisallowedFiles() + } /** @@ -62,8 +61,7 @@ protected function getAllowedFiles() } return $modified; - - }//end getAllowedFiles() + } /** @@ -85,8 +83,5 @@ protected function exec(string $cmd) } return $output; - - }//end exec() - - -}//end class + } +} diff --git a/src/Filters/GitStaged.php b/src/Filters/GitStaged.php index b51337119c..27d133cc6d 100644 --- a/src/Filters/GitStaged.php +++ b/src/Filters/GitStaged.php @@ -27,8 +27,7 @@ class GitStaged extends ExactMatch protected function getDisallowedFiles() { return []; - - }//end getDisallowedFiles() + } /** @@ -64,8 +63,7 @@ protected function getAllowedFiles() } return $modified; - - }//end getAllowedFiles() + } /** @@ -87,8 +85,5 @@ protected function exec(string $cmd) } return $output; - - }//end exec() - - -}//end class + } +} diff --git a/src/Fixer.php b/src/Fixer.php index 7b73c8a33c..74cdb05359 100644 --- a/src/Fixer.php +++ b/src/Fixer.php @@ -136,8 +136,7 @@ public function startFile(File $phpcsFile) $this->tokens[$index] = $token['content']; } } - - }//end startFile() + } /** @@ -219,8 +218,7 @@ public function fixFile() } return true; - - }//end fixFile() + } /** @@ -336,8 +334,7 @@ public function generateDiff(?string $filePath = null, bool $colors = true) $diff = implode(PHP_EOL, $diff); return $diff; - - }//end generateDiff() + } /** @@ -351,8 +348,7 @@ public function generateDiff(?string $filePath = null, bool $colors = true) public function getFixCount() { return $this->numFixes; - - }//end getFixCount() + } /** @@ -364,8 +360,7 @@ public function getContents() { $contents = implode($this->tokens); return $contents; - - }//end getContents() + } /** @@ -387,8 +382,7 @@ public function getTokenContent(int $stackPtr) } else { return $this->tokens[$stackPtr]; } - - }//end getTokenContent() + } /** @@ -417,8 +411,7 @@ public function beginChangeset() $this->changeset = []; $this->inChangeset = true; - - }//end beginChangeset() + } /** @@ -461,8 +454,7 @@ public function endChangeset() $this->changeset = []; return true; - - }//end endChangeset() + } /** @@ -496,8 +488,7 @@ public function rollbackChangeset() $this->changeset = []; }//end if - - }//end rollbackChangeset() + } /** @@ -617,8 +608,7 @@ public function replaceToken(int $stackPtr, string $content) } return true; - - }//end replaceToken() + } /** @@ -675,8 +665,7 @@ public function revertToken(int $stackPtr) } return true; - - }//end revertToken() + } /** @@ -700,8 +689,7 @@ public function substrToken(int $stackPtr, int $start, ?int $length = null) } return $this->replaceToken($stackPtr, $newContent); - - }//end substrToken() + } /** @@ -715,8 +703,7 @@ public function addNewline(int $stackPtr) { $current = $this->getTokenContent($stackPtr); return $this->replaceToken($stackPtr, $current . $this->currentFile->eolChar); - - }//end addNewline() + } /** @@ -730,8 +717,7 @@ public function addNewlineBefore(int $stackPtr) { $current = $this->getTokenContent($stackPtr); return $this->replaceToken($stackPtr, $this->currentFile->eolChar . $current); - - }//end addNewlineBefore() + } /** @@ -746,8 +732,7 @@ public function addContent(int $stackPtr, string $content) { $current = $this->getTokenContent($stackPtr); return $this->replaceToken($stackPtr, $current . $content); - - }//end addContent() + } /** @@ -762,8 +747,7 @@ public function addContentBefore(int $stackPtr, string $content) { $current = $this->getTokenContent($stackPtr); return $this->replaceToken($stackPtr, $content . $current); - - }//end addContentBefore() + } /** @@ -824,8 +808,7 @@ public function changeCodeBlockIndent(int $start, int $end, int $change) if ($useChangeset === true) { $this->endChangeset(); } - - }//end changeCodeBlockIndent() + } /** @@ -844,8 +827,5 @@ private function getSniffCodeForDebug(string $className) // Sniff code could not be determined. This may be an abstract sniff class or a helper class. return $className; } - - }//end getSniffCodeForDebug() - - -}//end class + } +} diff --git a/src/Generators/Generator.php b/src/Generators/Generator.php index 0fac2e0969..d8200f730b 100644 --- a/src/Generators/Generator.php +++ b/src/Generators/Generator.php @@ -70,8 +70,7 @@ public function __construct(Ruleset $ruleset) // Always present the docs in a consistent alphabetical order. sort($this->docFiles, (SORT_NATURAL | SORT_FLAG_CASE)); - - }//end __construct() + } /** @@ -101,8 +100,7 @@ protected function getTitle(DOMElement $doc) } return $title; - - }//end getTitle() + } /** @@ -132,8 +130,7 @@ public function generate() $this->processSniff($documentation); } - - }//end generate() + } /** @@ -149,6 +146,4 @@ public function generate() * @see generate() */ abstract protected function processSniff(DOMElement $doc); - - -}//end class +} diff --git a/src/Generators/HTML.php b/src/Generators/HTML.php index e91b92f7f3..14b2c69fa3 100644 --- a/src/Generators/HTML.php +++ b/src/Generators/HTML.php @@ -161,8 +161,7 @@ public function generate() echo $content; echo $this->getFormattedFooter(); } - - }//end generate() + } /** @@ -190,8 +189,7 @@ protected function getFormattedHeader() // Use the correct line endings based on the OS. return str_replace("\n", PHP_EOL, $output) . PHP_EOL; - - }//end getFormattedHeader() + } /** @@ -227,8 +225,7 @@ protected function getFormattedToc() $output .= ' ' . PHP_EOL; return $output; - - }//end getFormattedToc() + } /** @@ -255,8 +252,7 @@ protected function getFormattedFooter() // Use the correct line endings based on the OS. return str_replace("\n", PHP_EOL, $output) . PHP_EOL; - - }//end getFormattedFooter() + } /** @@ -288,8 +284,7 @@ public function processSniff(DOMElement $doc) ); echo $content; } - - }//end processSniff() + } /** @@ -317,8 +312,7 @@ private function titleToAnchor(string $title) $this->seenAnchors[$title] = true; return $title; - - }//end titleToAnchor() + } /** @@ -370,8 +364,7 @@ protected function getFormattedTextBlock(DOMNode $node) } return '

' . implode('', $lines) . '

' . PHP_EOL; - - }//end getFormattedTextBlock() + } /** @@ -426,8 +419,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node) } return $output; - - }//end getFormattedCodeComparisonBlock() + } /** @@ -443,8 +435,7 @@ private function formatCodeTitle(DOMElement $codeElm) { $title = trim($codeElm->getAttribute('title')); return str_replace(' ', '  ', $title); - - }//end formatCodeTitle() + } /** @@ -465,8 +456,5 @@ private function formatCodeSample(DOMElement $codeElm) $code = str_replace(['', ''], ['', ''], $code); return $code; - - }//end formatCodeSample() - - -}//end class + } +} diff --git a/src/Generators/Markdown.php b/src/Generators/Markdown.php index 71fe0b85b8..4a82910743 100644 --- a/src/Generators/Markdown.php +++ b/src/Generators/Markdown.php @@ -54,8 +54,7 @@ public function generate() echo $content; echo $this->getFormattedFooter(); } - - }//end generate() + } /** @@ -71,8 +70,7 @@ protected function getFormattedHeader() $standard = $this->ruleset->name; return "# $standard Coding Standard" . PHP_EOL; - - }//end getFormattedHeader() + } /** @@ -93,8 +91,7 @@ protected function getFormattedFooter() error_reporting($errorLevel); return $output; - - }//end getFormattedFooter() + } /** @@ -122,8 +119,7 @@ protected function processSniff(DOMElement $doc) echo PHP_EOL . "## $title" . PHP_EOL . PHP_EOL; echo $content; } - - }//end processSniff() + } /** @@ -173,8 +169,7 @@ protected function getFormattedTextBlock(DOMNode $node) } return implode(PHP_EOL, $lines) . PHP_EOL; - - }//end getFormattedTextBlock() + } /** @@ -233,8 +228,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node) } return $output; - - }//end getFormattedCodeComparisonBlock() + } /** @@ -250,8 +244,7 @@ private function formatCodeTitle(DOMElement $codeElm) { $title = trim($codeElm->getAttribute('title')); return str_replace(' ', '  ', $title); - - }//end formatCodeTitle() + } /** @@ -271,8 +264,5 @@ private function formatCodeSample(DOMElement $codeElm) $code = str_replace(['', ''], '', $code); return $code; - - }//end formatCodeSample() - - -}//end class + } +} diff --git a/src/Generators/Text.php b/src/Generators/Text.php index 412995f9b8..9ed32c3e0d 100644 --- a/src/Generators/Text.php +++ b/src/Generators/Text.php @@ -43,8 +43,7 @@ public function processSniff(DOMElement $doc) if (trim($content) !== '') { echo $this->getFormattedTitle($doc), $content; } - - }//end processSniff() + } /** @@ -73,8 +72,7 @@ protected function getFormattedTitle(DOMElement $doc) $output .= PHP_EOL . PHP_EOL; return $output; - - }//end getFormattedTitle() + } /** @@ -102,8 +100,7 @@ protected function getFormattedTextBlock(DOMNode $node) $text = implode(PHP_EOL, $nodeLines); return wordwrap($text, 100, PHP_EOL) . PHP_EOL . PHP_EOL; - - }//end getFormattedTextBlock() + } /** @@ -155,8 +152,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node) } return $output; - - }//end getFormattedCodeComparisonBlock() + } /** @@ -178,8 +174,7 @@ private function codeTitleToLines(DOMElement $codeElm) $title = wordwrap($title, 46, "\n"); return explode("\n", $title); - - }//end codeTitleToLines() + } /** @@ -200,8 +195,7 @@ private function codeToLines(DOMElement $codeElm) $code = str_replace(['', ''], '', $code); return explode("\n", $code); - - }//end codeToLines() + } /** @@ -231,8 +225,5 @@ private function linesToTableRows(array $column1Lines, array $column2Lines) }//end for return $rows; - - }//end linesToTableRows() - - -}//end class + } +} diff --git a/src/Reporter.php b/src/Reporter.php index fe995605f2..c219a582f7 100644 --- a/src/Reporter.php +++ b/src/Reporter.php @@ -176,8 +176,7 @@ public function __construct(Config $config) file_put_contents($output, ''); } }//end foreach - - }//end __construct() + } /** @@ -190,8 +189,7 @@ public function __construct(Config $config) public function __isset(string $name) { return ($name === 'totalFixable' || $name === 'totalFixed'); - - }//end __isset() + } /** @@ -218,8 +216,7 @@ public function __get(string $name) } throw new RuntimeException("ERROR: access requested to unknown property \"Reporter::\${$name}\""); - - }//end __get() + } /** @@ -235,8 +232,7 @@ public function __get(string $name) public function __set(string $name, $value) { throw new RuntimeException("ERROR: setting property \"Reporter::\${$name}\" is not allowed"); - - }//end __set() + } /** @@ -251,8 +247,7 @@ public function __set(string $name, $value) public function __unset(string $name) { throw new RuntimeException("ERROR: unsetting property \"Reporter::\${$name}\" is not allowed"); - - }//end __unset() + } /** @@ -275,8 +270,7 @@ public function printReports() } return $toScreen; - - }//end printReports() + } /** @@ -341,8 +335,7 @@ public function printReport(string $report) unset($this->tmpFiles[$report]); } } - - }//end printReport() + } /** @@ -407,8 +400,7 @@ public function cacheFileReport(File $phpcsFile) $this->totalFixedErrors += $phpcsFile->getFixedErrorCount(); $this->totalFixedWarnings += $phpcsFile->getFixedWarningCount(); } - - }//end cacheFileReport() + } /** @@ -525,8 +517,5 @@ public function prepareFileReport(File $phpcsFile) ksort($errors); $report['messages'] = $errors; return $report; - - }//end prepareFileReport() - - -}//end class + } +} diff --git a/src/Reports/Cbf.php b/src/Reports/Cbf.php index 2d64007b13..1468bd2018 100644 --- a/src/Reports/Cbf.php +++ b/src/Reports/Cbf.php @@ -113,8 +113,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo $report['filename'] . ">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount" . PHP_EOL; return $fixed; - - }//end generateFileReport() + } /** @@ -249,8 +248,7 @@ public function generate( } echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL; - - }//end generate() + } /** @@ -270,9 +268,7 @@ private function createReporterInstance(File $phpcsFile) */ public function __construct() { - }//end __construct() - - + } }; $reporter->totalFiles = 1; @@ -284,8 +280,5 @@ public function __construct() $reporter->totalFixedWarnings = $phpcsFile->getFixedWarningCount(); return $reporter; - - }//end createReporterInstance() - - -}//end class + } +} diff --git a/src/Reports/Checkstyle.php b/src/Reports/Checkstyle.php index 861411a82a..33926eb703 100644 --- a/src/Reports/Checkstyle.php +++ b/src/Reports/Checkstyle.php @@ -69,8 +69,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo $out->flush(); return true; - - }//end generateFileReport() + } /** @@ -104,8 +103,5 @@ public function generate( echo '' . PHP_EOL; echo $cachedData; echo '' . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Code.php b/src/Reports/Code.php index e825f6f1df..a1e1c9b018 100644 --- a/src/Reports/Code.php +++ b/src/Reports/Code.php @@ -314,8 +314,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -350,8 +349,5 @@ public function generate( } echo $cachedData; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Csv.php b/src/Reports/Csv.php index 71b7a30b57..8086356eca 100644 --- a/src/Reports/Csv.php +++ b/src/Reports/Csv.php @@ -52,8 +52,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -85,8 +84,5 @@ public function generate( ) { echo 'File,Line,Column,Type,Message,Source,Severity,Fixable' . PHP_EOL; echo $cachedData; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Diff.php b/src/Reports/Diff.php index 4d6d75a095..862b39f5ec 100644 --- a/src/Reports/Diff.php +++ b/src/Reports/Diff.php @@ -80,8 +80,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo $diff . PHP_EOL; return true; - - }//end generateFileReport() + } /** @@ -115,8 +114,5 @@ public function generate( if ($toScreen === true && $cachedData !== '') { echo PHP_EOL; } - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Emacs.php b/src/Reports/Emacs.php index 11a722a93b..64ebf3d980 100644 --- a/src/Reports/Emacs.php +++ b/src/Reports/Emacs.php @@ -52,8 +52,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -84,8 +83,5 @@ public function generate( bool $toScreen = true ) { echo $cachedData; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Full.php b/src/Reports/Full.php index 897a6fd8eb..bd5f6becf5 100644 --- a/src/Reports/Full.php +++ b/src/Reports/Full.php @@ -212,8 +212,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo PHP_EOL; return true; - - }//end generateFileReport() + } /** @@ -248,8 +247,5 @@ public function generate( } echo $cachedData; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Gitblame.php b/src/Reports/Gitblame.php index 87c0dee254..46d80308e9 100644 --- a/src/Reports/Gitblame.php +++ b/src/Reports/Gitblame.php @@ -54,8 +54,7 @@ protected function getAuthor(string $line) $parts = array_slice($parts, 0, (count($parts) - 2)); $author = preg_replace('|\(|', '', implode(' ', $parts)); return $author; - - }//end getAuthor() + } /** @@ -85,8 +84,5 @@ protected function getBlameContent(string $filename) chdir($cwd); return $blames; - - }//end getBlameContent() - - -}//end class + } +} diff --git a/src/Reports/Hgblame.php b/src/Reports/Hgblame.php index 1ac1fc36a3..841d05e3e4 100644 --- a/src/Reports/Hgblame.php +++ b/src/Reports/Hgblame.php @@ -55,8 +55,7 @@ protected function getAuthor(string $line) $parts = array_slice($parts, 0, (count($parts) - 6)); return trim(preg_replace('|<.+>|', '', implode(' ', $parts))); - - }//end getAuthor() + } /** @@ -104,8 +103,5 @@ protected function getBlameContent(string $filename) chdir($cwd); return $blames; - - }//end getBlameContent() - - -}//end class + } +} diff --git a/src/Reports/Info.php b/src/Reports/Info.php index 5f29b739d0..104b15cd9b 100644 --- a/src/Reports/Info.php +++ b/src/Reports/Info.php @@ -40,8 +40,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -161,8 +160,5 @@ public function generate( }//end foreach echo str_repeat('-', 70) . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Json.php b/src/Reports/Json.php index 4d48f457ff..9c954278a4 100644 --- a/src/Reports/Json.php +++ b/src/Reports/Json.php @@ -66,8 +66,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo ']},'; return true; - - }//end generateFileReport() + } /** @@ -100,8 +99,5 @@ public function generate( echo '{"totals":{"errors":' . $totalErrors . ',"warnings":' . $totalWarnings . ',"fixable":' . $totalFixable . '},"files":{'; echo rtrim($cachedData, ','); echo '}}' . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Junit.php b/src/Reports/Junit.php index 0f40e28e4c..26a44b9ecd 100644 --- a/src/Reports/Junit.php +++ b/src/Reports/Junit.php @@ -80,8 +80,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou $out->endElement(); echo $out->flush(); return true; - - }//end generateFileReport() + } /** @@ -126,8 +125,5 @@ public function generate( echo '' . PHP_EOL; echo $cachedData; echo '' . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php index 5025a296c4..ec3435940b 100644 --- a/src/Reports/Notifysend.php +++ b/src/Reports/Notifysend.php @@ -77,8 +77,7 @@ public function __construct() '', exec($this->path . ' --version') ); - - }//end __construct() + } /** @@ -103,8 +102,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou // We want this file counted in the total number // of checked files even if it has no errors. return true; - - }//end generateFileReport() + } /** @@ -144,8 +142,7 @@ public function generate( } else { $this->notifyErrors($msg); } - - }//end generate() + } /** @@ -182,8 +179,7 @@ protected function generateMessage(array $checkedFiles, int $totalErrors, int $t } return $msg; - - }//end generateMessage() + } /** @@ -198,8 +194,7 @@ protected function notifyAllFine() $cmd .= ' "PHP CodeSniffer: Ok"'; $cmd .= ' "All fine"'; exec($cmd); - - }//end notifyAllFine() + } /** @@ -216,8 +211,7 @@ protected function notifyErrors(string $msg) $cmd .= ' "PHP CodeSniffer: Error"'; $cmd .= ' ' . escapeshellarg(trim($msg)); exec($cmd); - - }//end notifyErrors() + } /** @@ -236,8 +230,5 @@ protected function getBasicCommand() } return $cmd; - - }//end getBasicCommand() - - -}//end class + } +} diff --git a/src/Reports/Performance.php b/src/Reports/Performance.php index 00aae4cf4e..a8c36efdd2 100644 --- a/src/Reports/Performance.php +++ b/src/Reports/Performance.php @@ -40,8 +40,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -154,8 +153,5 @@ public function generate( echo str_repeat('-', $width) . PHP_EOL; printf($formatBold, 'TOTAL RUN TIME', $runTime, 100); echo str_repeat('-', $width) . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Report.php b/src/Reports/Report.php index f1407a76c2..f7c3ebdb91 100644 --- a/src/Reports/Report.php +++ b/src/Reports/Report.php @@ -82,6 +82,4 @@ public function generate( bool $interactive = false, bool $toScreen = true ); - - -}//end interface +} diff --git a/src/Reports/Source.php b/src/Reports/Source.php index e9ccd18bfb..cd30130a6f 100644 --- a/src/Reports/Source.php +++ b/src/Reports/Source.php @@ -60,8 +60,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -264,8 +263,7 @@ public function generate( } echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL; - - }//end generate() + } /** @@ -325,8 +323,5 @@ public function makeFriendlyName(string $name) $friendlyName[0] = strtoupper($friendlyName[0]); return $friendlyName; - - }//end makeFriendlyName() - - -}//end class + } +} diff --git a/src/Reports/Summary.php b/src/Reports/Summary.php index 90bb5f988c..08640aa4f4 100644 --- a/src/Reports/Summary.php +++ b/src/Reports/Summary.php @@ -42,8 +42,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo $report['filename'] . '>>' . $report['errors'] . '>>' . $report['warnings'] . PHP_EOL; return true; - - }//end generateFileReport() + } /** @@ -172,8 +171,5 @@ static function ($keyA, $keyB) { } echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Reports/Svnblame.php b/src/Reports/Svnblame.php index 2478ac2bbd..37ac06cdd1 100644 --- a/src/Reports/Svnblame.php +++ b/src/Reports/Svnblame.php @@ -40,8 +40,7 @@ protected function getAuthor(string $line) } return $blameParts[2]; - - }//end getAuthor() + } /** @@ -67,8 +66,5 @@ protected function getBlameContent(string $filename) $blames = explode("\n", $rawContent); return $blames; - - }//end getBlameContent() - - -}//end class + } +} diff --git a/src/Reports/VersionControl.php b/src/Reports/VersionControl.php index ea72719fd8..a80b9a6b11 100644 --- a/src/Reports/VersionControl.php +++ b/src/Reports/VersionControl.php @@ -127,8 +127,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou } return true; - - }//end generateFileReport() + } /** @@ -345,8 +344,7 @@ public function generate( } echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL; - - }//end generate() + } /** @@ -367,6 +365,4 @@ abstract protected function getAuthor(string $line); * @return array */ abstract protected function getBlameContent(string $filename); - - -}//end class +} diff --git a/src/Reports/Xml.php b/src/Reports/Xml.php index a606a8a283..4bf894bc63 100644 --- a/src/Reports/Xml.php +++ b/src/Reports/Xml.php @@ -86,8 +86,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou echo $content; return true; - - }//end generateFileReport() + } /** @@ -121,8 +120,5 @@ public function generate( echo '' . PHP_EOL; echo $cachedData; echo '' . PHP_EOL; - - }//end generate() - - -}//end class + } +} diff --git a/src/Ruleset.php b/src/Ruleset.php index 4585e6d3e8..45ba3fcc5b 100644 --- a/src/Ruleset.php +++ b/src/Ruleset.php @@ -265,8 +265,7 @@ public function __construct(Config $config) } $this->displayCachedMessages(); - - }//end __construct() + } /** @@ -340,8 +339,7 @@ public function explain() if (count($this->deprecatedSniffs) > 0) { echo PHP_EOL . '* Sniffs marked with an asterisk are deprecated.' . PHP_EOL; } - - }//end explain() + } /** @@ -352,8 +350,7 @@ public function explain() public function hasSniffDeprecations() { return (count($this->deprecatedSniffs) > 0); - - }//end hasSniffDeprecations() + } /** @@ -482,8 +479,7 @@ public function showSniffDeprecations() $closer = wordwrap('Deprecated sniffs are still run, but will stop working at some point in the future.', $reportWidth, PHP_EOL); StatusWriter::writeNewline(2); StatusWriter::write($closer, 0, 2); - - }//end showSniffDeprecations() + } /** @@ -511,8 +507,7 @@ private function displayCachedMessages() } $this->msgCache->display(); - - }//end displayCachedMessages() + } /** @@ -883,8 +878,7 @@ public function processRuleset(string $rulesetPath, int $depth = 0) } return $files; - - }//end processRuleset() + } /** @@ -942,8 +936,7 @@ private function expandSniffDirectory(string $directory, int $depth = 0) }//end foreach return $sniffs; - - }//end expandSniffDirectory() + } /** @@ -1125,8 +1118,7 @@ private function expandRulesetReference(string $ref, string $rulesetDir, int $de return $this->processRuleset($ref, ($depth + 2)); } }//end if - - }//end expandRulesetReference() + } /** @@ -1380,8 +1372,7 @@ private function processRule(SimpleXMLElement $rule, array $newSniffs, int $dept } }//end foreach }//end foreach - - }//end processRule() + } /** @@ -1415,8 +1406,7 @@ private function shouldProcessElement(SimpleXMLElement $element) } return false; - - }//end shouldProcessElement() + } /** @@ -1509,8 +1499,7 @@ public function registerSniffs(array $files, array $restrictions, array $exclusi }//end foreach $this->sniffs = $listeners; - - }//end registerSniffs() + } /** @@ -1598,8 +1587,7 @@ public function populateTokenListeners() } } }//end foreach - - }//end populateTokenListeners() + } /** @@ -1679,8 +1667,7 @@ public function setSniffProperty(string $sniffClass, string $name, array $settin } else { $sniffObject->$propertyName = $value; } - - }//end setSniffProperty() + } /** @@ -1723,8 +1710,7 @@ private function getRealPropertyValue($value) }//end if return $value; - - }//end getRealPropertyValue() + } /** @@ -1749,8 +1735,7 @@ public function getIgnorePatterns(?string $listener = null) } return []; - - }//end getIgnorePatterns() + } /** @@ -1775,8 +1760,5 @@ public function getIncludePatterns(?string $listener = null) } return []; - - }//end getIncludePatterns() - - -}//end class + } +} diff --git a/src/Runner.php b/src/Runner.php index f6d6574837..0e98d6ca78 100644 --- a/src/Runner.php +++ b/src/Runner.php @@ -141,8 +141,7 @@ public function runPHPCS() }//end try return ExitCode::calculate($this->reporter); - - }//end runPHPCS() + } /** @@ -227,8 +226,7 @@ public function runPHPCBF() }//end try return ExitCode::calculate($this->reporter); - - }//end runPHPCBF() + } /** @@ -286,8 +284,7 @@ public function init() $error .= $this->config->printShortUsage(true); throw new DeepExitException($error, ExitCode::PROCESS_ERROR); } - - }//end init() + } /** @@ -517,8 +514,7 @@ private function run() if ($this->config->cache === true) { Cache::save(); } - - }//end run() + } /** @@ -544,8 +540,7 @@ public function handleErrors(int $code, string $message, string $file, int $line } throw new RuntimeException("$message in $file on line $line"); - - }//end handleErrors() + } /** @@ -672,8 +667,7 @@ public function processFile(File $file) // Clean up the file to save (a lot of) memory. $file->cleanUp(); - - }//end processFile() + } /** @@ -757,8 +751,7 @@ private function processChildProcs(array $childProcs) }//end while return $success; - - }//end processChildProcs() + } /** @@ -863,8 +856,7 @@ public function printProgress(File $file, int $numFiles, int $numProcessed) } StatusWriter::write(str_repeat(' ', $padding) . " $numProcessed / $numFiles ($percent%)"); - - }//end printProgress() + } /** @@ -901,8 +893,5 @@ static function () use ( } } ); - - }//end registerOutOfMemoryShutdownMessage() - - -}//end class + } +} diff --git a/src/Sniffs/AbstractArraySniff.php b/src/Sniffs/AbstractArraySniff.php index 9d051f38a0..c6afbd2b7f 100644 --- a/src/Sniffs/AbstractArraySniff.php +++ b/src/Sniffs/AbstractArraySniff.php @@ -27,8 +27,7 @@ final public function register() T_ARRAY, T_OPEN_SHORT_ARRAY, ]; - - }//end register() + } /** @@ -97,8 +96,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd, $indices); } - - }//end process() + } /** @@ -133,8 +131,7 @@ private function getNext(File $phpcsFile, int $ptr, int $arrayEnd) } return $ptr; - - }//end getNext() + } /** @@ -167,6 +164,4 @@ abstract protected function processSingleLineArray(File $phpcsFile, int $stackPt * @return void */ abstract protected function processMultiLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices); - - -}//end class +} diff --git a/src/Sniffs/AbstractPatternSniff.php b/src/Sniffs/AbstractPatternSniff.php index 8869dc623d..6735c903a6 100644 --- a/src/Sniffs/AbstractPatternSniff.php +++ b/src/Sniffs/AbstractPatternSniff.php @@ -62,8 +62,7 @@ abstract class AbstractPatternSniff implements Sniff public function __construct() { $this->supplementaryTokens = $this->registerSupplementary(); - - }//end __construct() + } /** @@ -103,8 +102,7 @@ final public function register() }//end foreach return array_unique(array_merge($listenTypes, $this->supplementaryTokens)); - - }//end register() + } /** @@ -135,8 +133,7 @@ private function getPatternTokenTypes(array $pattern) } return $tokenTypes; - - }//end getPatternTokenTypes() + } /** @@ -162,8 +159,7 @@ private function getListenerTokenPos(array $pattern) } return $tokenTypes[$token]; - - }//end getListenerTokenPos() + } /** @@ -228,8 +224,7 @@ final public function process(File $phpcsFile, int $stackPtr) foreach ($allErrors as $stackPtr => $error) { $phpcsFile->addError($error, $stackPtr, 'Found'); } - - }//end process() + } /** @@ -685,8 +680,7 @@ protected function processPattern(array $patternInfo, File $phpcsFile, int $stac } return $errors; - - }//end processPattern() + } /** @@ -709,8 +703,7 @@ protected function prepareError(string $found, string $patternCode) $error = "Expected \"$expected\"; found \"$found\""; return $error; - - }//end prepareError() + } /** @@ -734,8 +727,7 @@ abstract protected function getPatterns(); protected function registerSupplementary() { return []; - - }//end registerSupplementary() + } /** @@ -751,8 +743,7 @@ protected function registerSupplementary() */ protected function processSupplementary(File $phpcsFile, int $stackPtr) { - - }//end processSupplementary() + } /** @@ -841,8 +832,7 @@ private function parse(string $pattern) }//end for return $patterns; - - }//end parse() + } /** @@ -895,8 +885,7 @@ private function createSkipPattern(string $pattern, int $from) } return $skip; - - }//end createSkipPattern() + } /** @@ -932,8 +921,5 @@ private function createTokenPattern(string $str) } return $patterns; - - }//end createTokenPattern() - - -}//end class + } +} diff --git a/src/Sniffs/AbstractScopeSniff.php b/src/Sniffs/AbstractScopeSniff.php index 637c2c3e86..a9ae992c64 100644 --- a/src/Sniffs/AbstractScopeSniff.php +++ b/src/Sniffs/AbstractScopeSniff.php @@ -93,8 +93,7 @@ public function __construct( $this->listenOutside = $listenOutside; $this->scopeTokens = array_flip($scopeTokens); $this->tokens = $tokens; - - }//end __construct() + } /** @@ -110,8 +109,7 @@ public function __construct( final public function register() { return $this->tokens; - - }//end register() + } /** @@ -147,8 +145,7 @@ final public function process(File $phpcsFile, int $stackPtr) if (empty($skipTokens) === false) { return min($skipTokens); } - - }//end process() + } /** @@ -184,6 +181,4 @@ abstract protected function processTokenWithinScope(File $phpcsFile, int $stackP * the rest of the file. */ abstract protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr); - - -}//end class +} diff --git a/src/Sniffs/AbstractVariableSniff.php b/src/Sniffs/AbstractVariableSniff.php index 3e99f2cfa7..4824e6626f 100644 --- a/src/Sniffs/AbstractVariableSniff.php +++ b/src/Sniffs/AbstractVariableSniff.php @@ -67,8 +67,7 @@ public function __construct() ]; parent::__construct($scopes, $listen, true); - - }//end __construct() + } /** @@ -146,8 +145,7 @@ final protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, } else { return $this->processMemberVar($phpcsFile, $stackPtr); } - - }//end processTokenWithinScope() + } /** @@ -177,8 +175,7 @@ final protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr return $this->processVariableInString($phpcsFile, $stackPtr); } } - - }//end processTokenOutsideScope() + } /** @@ -228,6 +225,4 @@ abstract protected function processVariable(File $phpcsFile, int $stackPtr); * the rest of the file. */ abstract protected function processVariableInString(File $phpcsFile, int $stackPtr); - - -}//end class +} diff --git a/src/Sniffs/DeprecatedSniff.php b/src/Sniffs/DeprecatedSniff.php index 4f4d9fc025..e542babab2 100644 --- a/src/Sniffs/DeprecatedSniff.php +++ b/src/Sniffs/DeprecatedSniff.php @@ -58,6 +58,4 @@ public function getRemovalVersion(); * @return string */ public function getDeprecationMessage(); - - -}//end interface +} diff --git a/src/Sniffs/Sniff.php b/src/Sniffs/Sniff.php index 0708b5bb0c..f3c1e68c7d 100644 --- a/src/Sniffs/Sniff.php +++ b/src/Sniffs/Sniff.php @@ -75,6 +75,4 @@ public function register(); * the rest of the file. */ public function process(File $phpcsFile, int $stackPtr); - - -}//end interface +} diff --git a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php index 095e687f23..3276800551 100644 --- a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php +++ b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php @@ -39,8 +39,7 @@ class ArrayIndentSniff extends AbstractArraySniff */ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices) { - - }//end processSingleLineArray() + } /** @@ -187,8 +186,5 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array } else { $phpcsFile->fixer->replaceToken(($arrayEnd - 1), $padding); } - - }//end processMultiLineArray() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php index 531e1baa93..f21a0147b2 100644 --- a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php +++ b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php @@ -24,8 +24,7 @@ class DisallowLongArraySyntaxSniff implements Sniff public function register() { return [T_ARRAY]; - - }//end register() + } /** @@ -65,8 +64,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php index ebbb53506f..4ccbfe9ef9 100644 --- a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php +++ b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php @@ -24,8 +24,7 @@ class DisallowShortArraySyntaxSniff implements Sniff public function register() { return [T_OPEN_SHORT_ARRAY]; - - }//end register() + } /** @@ -54,8 +53,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($closer, ')'); $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php index dd67962fe3..4389156197 100644 --- a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php +++ b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php @@ -32,8 +32,7 @@ class DuplicateClassNameSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -111,8 +110,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end while return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php index a003273cbf..3f9afb0a77 100644 --- a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php +++ b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php @@ -29,8 +29,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -116,8 +115,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php index de415aff5f..f2859aaf13 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php @@ -62,8 +62,7 @@ public function register() T_WHILE, T_MATCH, ]; - - }//end register() + } /** @@ -164,8 +163,5 @@ public function process(File $phpcsFile, int $stackPtr) $startPos = $hasAssignment; } while ($startPos < $closer); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php index aaba609eec..94aa7edfd5 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php @@ -31,8 +31,7 @@ public function register() T_SEMICOLON, T_CLOSE_TAG, ]; - - }//end register() + } /** @@ -53,8 +52,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processCloseTag($phpcsFile, $stackPtr); } - - }//end process() + } /** @@ -133,8 +131,7 @@ private function processSemicolon(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); }//end if - - }//end processSemicolon() + } /** @@ -172,8 +169,5 @@ private function processCloseTag(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end processCloseTag() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php index 618939d7f5..792d72cdde 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php @@ -52,8 +52,7 @@ public function register() T_WHILE, T_MATCH, ]; - - }//end register() + } /** @@ -90,8 +89,5 @@ public function process(File $phpcsFile, int $stackPtr) $name = strtoupper($token['content']); $error = 'Empty %s statement detected'; $phpcsFile->addError($error, $stackPtr, 'Detected' . ucfirst(strtolower($name)), [$name]); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php index 95b5a9d4a0..6a7788f220 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php @@ -38,8 +38,7 @@ class ForLoopShouldBeWhileLoopSniff implements Sniff public function register() { return [T_FOR]; - - }//end register() + } /** @@ -84,8 +83,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'This FOR loop can be simplified to a WHILE loop'; $phpcsFile->addWarning($error, $stackPtr, 'CanSimplify'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php index d68269af9f..42e45b10a0 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php @@ -42,8 +42,7 @@ class ForLoopWithTestFunctionCallSniff implements Sniff public function register() { return [T_FOR]; - - }//end register() + } /** @@ -94,8 +93,5 @@ public function process(File $phpcsFile, int $stackPtr) break; } }//end for - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php index 28eb7c0157..1d7d3fd7de 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php @@ -44,8 +44,7 @@ class JumbledIncrementerSniff implements Sniff public function register() { return [T_FOR]; - - }//end register() + } /** @@ -93,8 +92,7 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addWarning($error, $stackPtr, 'Found', $data); } } - - }//end process() + } /** @@ -127,8 +125,5 @@ protected function findIncrementers(array $tokens, array $token) } return $incrementers; - - }//end findIncrementers() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php index c8d8630e1e..e6a47e44d7 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php @@ -58,8 +58,7 @@ public function register() $this->searchTargets[T_INLINE_ELSE] = T_INLINE_ELSE; return Tokens::BOOLEAN_OPERATORS; - - }//end register() + } /** @@ -105,8 +104,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Mixing different binary boolean operators within an expression'; $error .= ' without using parentheses to clarify precedence is not allowed.'; $phpcsFile->addError($error, $stackPtr, 'MissingParentheses'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php index 9f8a61891c..d39ab57e5a 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php @@ -45,8 +45,7 @@ public function register() T_IF, T_ELSEIF, ]; - - }//end register() + } /** @@ -86,8 +85,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Avoid IF statements that are always true or false'; $phpcsFile->addWarning($error, $stackPtr, 'Found'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php index ac0e8b8112..a7e3c6d60f 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php @@ -37,8 +37,7 @@ class UnnecessaryFinalModifierSniff implements Sniff public function register() { return [T_CLASS]; - - }//end register() + } /** @@ -81,8 +80,5 @@ public function process(File $phpcsFile, int $stackPtr) $next = $tokens[$next]['scope_closer']; } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php index 6c0fc7731c..cb5b2d1b10 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php @@ -69,8 +69,7 @@ public function register() T_CLOSURE, T_FN, ]; - - }//end register() + } /** @@ -298,8 +297,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php index 8aca01a338..f61f6f2e94 100644 --- a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php +++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php @@ -48,8 +48,7 @@ class UselessOverridingMethodSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -177,8 +176,5 @@ public function process(File $phpcsFile, int $stackPtr) if (count($parameters) === count($signature) && $parameters === $signature) { $phpcsFile->addWarning('Possible useless method overriding detected', $stackPtr, 'Found'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php index f430863cba..ad1b76dbb8 100644 --- a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php +++ b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php @@ -25,8 +25,7 @@ class DocCommentSniff implements Sniff public function register() { return [T_DOC_COMMENT_OPEN_TAG]; - - }//end register() + } /** @@ -340,8 +339,5 @@ public function process(File $phpcsFile, int $stackPtr) $foundTags[$tagName] = true; } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php index ea205e86e3..b1c44637e2 100644 --- a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php +++ b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php @@ -26,8 +26,7 @@ class FixmeSniff implements Sniff public function register() { return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS); - - }//end register() + } /** @@ -61,8 +60,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $stackPtr, $type, $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php index ab7915210f..9ae0b8a702 100644 --- a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php +++ b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php @@ -25,8 +25,7 @@ class TodoSniff implements Sniff public function register() { return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS); - - }//end register() + } /** @@ -60,8 +59,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addWarning($error, $stackPtr, $type, $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php index 4ba92d0444..0daa92b4c5 100644 --- a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php +++ b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php @@ -29,8 +29,7 @@ public function register() unset($tokens[T_COALESCE]); return $tokens; - - }//end register() + } /** @@ -122,8 +121,7 @@ public function process(File $phpcsFile, int $stackPtr) $stackPtr, 'Found' ); - - }//end process() + } /** @@ -179,8 +177,5 @@ public function isArrayStatic(File $phpcsFile, int $arrayToken) } return true; - - }//end isArrayStatic() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php index aad0c68d6b..283e2598f8 100644 --- a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php +++ b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php @@ -40,8 +40,7 @@ public function register() T_DO, T_FOR, ]; - - }//end register() + } /** @@ -317,8 +316,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if $phpcsFile->fixer->endChangeset(); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php index 39522a58dd..e0d03f989f 100644 --- a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php +++ b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php @@ -47,8 +47,7 @@ class ByteOrderMarkSniff implements Sniff public function register() { return [T_INLINE_HTML]; - - }//end register() + } /** @@ -84,8 +83,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->recordMetric($stackPtr, 'Using byte order mark', 'no'); return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php index e38f2af1fb..66c62a074c 100644 --- a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php +++ b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -66,8 +65,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php index 84d767f8e3..7791c7939b 100644 --- a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php +++ b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -73,8 +72,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php index aa6fc2fe06..60164f1e92 100644 --- a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php +++ b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -55,8 +54,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php index 5abccac0fd..c08c200039 100644 --- a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php +++ b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php @@ -46,8 +46,7 @@ class InlineHTMLSniff implements Sniff public function register() { return [T_INLINE_HTML]; - - }//end register() + } /** @@ -81,8 +80,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $stackPtr, 'Found'); return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php index e2cd86f12a..faf02453c7 100644 --- a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php +++ b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php @@ -34,8 +34,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -125,8 +124,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php index f74eb030ad..56ceeed79c 100644 --- a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php +++ b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php @@ -55,8 +55,7 @@ class LineLengthSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -81,8 +80,7 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -194,8 +192,5 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr $warning = 'Line exceeds %s characters; contains %s characters'; $phpcsFile->addWarning($warning, $stackPtr, 'TooLong', $data); } - - }//end checkLineLength() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php index 7cd762b262..4a33fd0641 100644 --- a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php +++ b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -63,8 +62,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php index 6424af1169..96fccbc622 100644 --- a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php +++ b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php @@ -24,8 +24,7 @@ class OneClassPerFileSniff implements Sniff public function register() { return [T_CLASS]; - - }//end register() + } /** @@ -50,8 +49,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Only one class is allowed in a file'; $phpcsFile->addError($error, $nextClass, 'MultipleFound'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php index 6110581244..7ad79ae334 100644 --- a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php +++ b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php @@ -24,8 +24,7 @@ class OneInterfacePerFileSniff implements Sniff public function register() { return [T_INTERFACE]; - - }//end register() + } /** @@ -50,8 +49,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Only one interface is allowed in a file'; $phpcsFile->addError($error, $nextInterface, 'MultipleFound'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php index a061038398..9104f93106 100644 --- a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php +++ b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php @@ -29,8 +29,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -55,8 +54,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Only one object structure is allowed in a file'; $phpcsFile->addError($error, $nextClass, 'MultipleFound'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php index aa353bfc39..219ccb4250 100644 --- a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php +++ b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php @@ -24,8 +24,7 @@ class OneTraitPerFileSniff implements Sniff public function register() { return [T_TRAIT]; - - }//end register() + } /** @@ -50,8 +49,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Only one trait is allowed in a file'; $phpcsFile->addError($error, $nextClass, 'MultipleFound'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php index 6240f30c8d..22851c2d4d 100644 --- a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php +++ b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php @@ -24,8 +24,7 @@ class DisallowMultipleStatementsSniff implements Sniff public function register() { return [T_SEMICOLON]; - - }//end register() + } /** @@ -98,8 +97,5 @@ public function process(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'Multiple statements on same line', 'no'); }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php index 46e8d582fe..b2025f46c7 100644 --- a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php +++ b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php @@ -48,8 +48,7 @@ public function register() $tokens = Tokens::ASSIGNMENT_TOKENS; unset($tokens[T_DOUBLE_ARROW]); return $tokens; - - }//end register() + } /** @@ -65,8 +64,7 @@ public function process(File $phpcsFile, int $stackPtr) { $lastAssign = $this->checkAlignment($phpcsFile, $stackPtr); return ($lastAssign + 1); - - }//end process() + } /** @@ -397,8 +395,5 @@ public function checkAlignment(File $phpcsFile, int $stackPtr, ?int $end = null) } else { return $assign; } - - }//end checkAlignment() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php index 9bd3218629..e3df3dbfd5 100644 --- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php +++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php @@ -39,8 +39,7 @@ class SpaceAfterCastSniff implements Sniff public function register() { return Tokens::CAST_TOKENS; - - }//end register() + } /** @@ -154,8 +153,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php index 901680f56f..255d4254cd 100644 --- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php +++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php @@ -39,8 +39,7 @@ class SpaceAfterNotSniff implements Sniff public function register() { return [T_BOOLEAN_NOT]; - - }//end register() + } /** @@ -126,8 +125,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php index 8c608cb537..bff5ce0d3a 100644 --- a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php +++ b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php @@ -25,8 +25,7 @@ class SpaceBeforeCastSniff implements Sniff public function register() { return Tokens::CAST_TOKENS; - - }//end register() + } /** @@ -66,8 +65,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' '); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php index 8a425621ac..47529a2681 100644 --- a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php @@ -35,8 +35,7 @@ public function register() $targets[] = T_CLOSE_PARENTHESIS; return $targets; - - }//end register() + } /** @@ -84,8 +83,7 @@ public function process(File $phpcsFile, int $stackPtr) } $this->checkSpacing($phpcsFile, $stackPtr, $openBracket); - - }//end process() + } /** @@ -190,8 +188,5 @@ public function checkSpacing(File $phpcsFile, int $stackPtr, int $openBracket) }//end if }//end if }//end while - - }//end checkSpacing() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php index 1b9d0accf0..f72188c84e 100644 --- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php +++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php @@ -42,8 +42,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -217,8 +216,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if $phpcsFile->recordMetric($stackPtr, "$metricType opening brace placement", 'new line'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php index 3f018d5945..e1ce5b7994 100644 --- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php +++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php @@ -42,8 +42,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -170,8 +169,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php index 457e06835a..38d7467434 100644 --- a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php +++ b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php @@ -64,8 +64,7 @@ class CyclomaticComplexitySniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -114,8 +113,5 @@ public function process(File $phpcsFile, int $stackPtr) ]; $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php index 871f5ead85..d07883fc63 100644 --- a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php +++ b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php @@ -39,8 +39,7 @@ class NestingLevelSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -93,8 +92,5 @@ public function process(File $phpcsFile, int $stackPtr) ]; $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php index 24cc4bc1c4..6ee7b96ef4 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php @@ -23,8 +23,7 @@ class AbstractClassNamePrefixSniff implements Sniff public function register() { return [T_CLASS]; - - }//end register() + } /** @@ -53,8 +52,5 @@ public function process(File $phpcsFile, int $stackPtr) if (strtolower($prefix) !== 'abstract') { $phpcsFile->addError('Abstract class names must be prefixed with "Abstract"; found "%s"', $stackPtr, 'Missing', [$className]); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php index ac2048f605..3113ba923b 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php @@ -112,8 +112,7 @@ class CamelCapsFunctionNameSniff extends AbstractScopeSniff public function __construct() { parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true); - - }//end __construct() + } /** @@ -198,8 +197,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ } else { $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes'); } - - }//end processTokenWithinScope() + } /** @@ -242,8 +240,5 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes'); } - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php index b04532d806..fd9fcf23cf 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php @@ -41,8 +41,7 @@ class ConstructorNameSniff extends AbstractScopeSniff public function __construct() { parent::__construct([T_CLASS, T_ANON_CLASS], [T_FUNCTION], true); - - }//end __construct() + } /** @@ -130,8 +129,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ $startIndex = $nextNonEmpty; }//end while - - }//end processTokenWithinScope() + } /** @@ -146,8 +144,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() + } /** @@ -181,8 +178,5 @@ protected function loadFunctionNamesInScope(File $phpcsFile, int $currScope) $i = $tokens[$i]['scope_closer']; } } - - }//end loadFunctionNamesInScope() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php index 21f771cce6..779bdaafee 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php @@ -23,8 +23,7 @@ class InterfaceNameSuffixSniff implements Sniff public function register() { return [T_INTERFACE]; - - }//end register() + } /** @@ -48,8 +47,5 @@ public function process(File $phpcsFile, int $stackPtr) if (strtolower($suffix) !== 'interface') { $phpcsFile->addError('Interface names must be suffixed with "Interface"; found "%s"', $stackPtr, 'Missing', [$interfaceName]); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php index a9350e7ee8..211f62b029 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php @@ -23,8 +23,7 @@ class TraitNameSuffixSniff implements Sniff public function register() { return [T_TRAIT]; - - }//end register() + } /** @@ -48,8 +47,5 @@ public function process(File $phpcsFile, int $stackPtr) if (strtolower($suffix) !== 'trait') { $phpcsFile->addError('Trait names must be suffixed with "Trait"; found "%s"', $stackPtr, 'Missing', [$traitName]); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php index b6e053ca27..6c3ca2b5bb 100644 --- a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php +++ b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php @@ -29,8 +29,7 @@ public function register() T_NAME_FULLY_QUALIFIED, T_CONST, ]; - - }//end register() + } /** @@ -145,8 +144,5 @@ public function process(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($constPtr, 'Constant name case', 'upper'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php index 28805aa820..f392a89458 100644 --- a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php @@ -24,8 +24,7 @@ class BacktickOperatorSniff implements Sniff public function register() { return [T_BACKTICK]; - - }//end register() + } /** @@ -41,8 +40,5 @@ public function process(File $phpcsFile, int $stackPtr) { $error = 'Use of the backtick operator is forbidden'; $phpcsFile->addError($error, $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php index 6e9b6cea02..d27bc9b3ad 100644 --- a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php @@ -46,8 +46,7 @@ class CharacterBeforePHPOpeningTagSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -88,8 +87,5 @@ public function process(File $phpcsFile, int $stackPtr) // Skip the rest of the file so we don't pick up additional // open tags, typically embedded in HTML. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php index 5f7d4ac028..4e07ca11fc 100644 --- a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -47,8 +46,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'The PHP open tag does not have a corresponding PHP close tag'; $phpcsFile->addError($error, $stackPtr, 'NotFound'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php index 6e4e6d3eab..f1ea23b76d 100644 --- a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php @@ -43,8 +43,7 @@ public function __construct() $this->forbiddenFunctions[$functionName] = null; } } - - }//end __construct() + } /** @@ -69,8 +68,5 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName } else { $phpcsFile->addWarning($error, $stackPtr, $type, $data); } - - }//end addError() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php index 06a05829ac..de275f342e 100644 --- a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php @@ -26,8 +26,7 @@ class DisallowAlternativePHPTagsSniff implements Sniff public function register() { return [T_INLINE_HTML]; - - }//end register() + } /** @@ -73,8 +72,7 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data); } - - }//end process() + } /** @@ -103,8 +101,5 @@ protected function getSnippet(string $content, string $start = '', int $length = } return $snippet; - - }//end getSnippet() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php index 6ea4334bf8..dc975b25d5 100644 --- a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php @@ -24,8 +24,7 @@ class DisallowRequestSuperglobalSniff implements Sniff public function register() { return [T_VARIABLE]; - - }//end register() + } /** @@ -48,8 +47,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'The $_REQUEST superglobal should not be used; use $_GET, $_POST, or $_COOKIE instead'; $phpcsFile->addError($error, $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php index 809b1f401d..e1c56735dd 100644 --- a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php @@ -35,8 +35,7 @@ public function register() } return $targets; - - }//end register() + } /** @@ -133,8 +132,7 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() + } /** @@ -163,8 +161,5 @@ protected function getSnippet(string $content, string $start = '', int $length = } return $snippet; - - }//end getSnippet() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php index c7abc69e4c..b11c787b0c 100644 --- a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php @@ -27,8 +27,7 @@ public function register() T_GOTO, T_GOTO_LABEL, ]; - - }//end register() + } /** @@ -43,8 +42,5 @@ public function register() public function process(File $phpcsFile, int $stackPtr) { $phpcsFile->addWarning('Use of the GOTO language construct is discouraged', $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php index e08a29fa37..62043ba7d1 100644 --- a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php @@ -109,8 +109,7 @@ public function register() $targets[] = T_NAME_FULLY_QUALIFIED; return $targets; - - }//end register() + } /** @@ -195,8 +194,7 @@ public function process(File $phpcsFile, int $stackPtr) }//end if $this->addError($phpcsFile, $stackPtr, $function, $pattern); - - }//end process() + } /** @@ -237,8 +235,5 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName } else { $phpcsFile->addWarning($error, $stackPtr, $type, $data); } - - }//end addError() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php index 7449642a07..739d95d882 100644 --- a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php @@ -73,8 +73,7 @@ public function register() $targets[] = T_CONST; return $targets; - - }//end register() + } /** @@ -188,8 +187,7 @@ public function process(File $phpcsFile, int $stackPtr) // Handle everything else. $this->processConstant($phpcsFile, $stackPtr); - - }//end process() + } /** @@ -227,8 +225,5 @@ protected function processConstant(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'lower'); } - - }//end processConstant() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php index be47356af3..acdaa701b5 100644 --- a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php @@ -39,8 +39,7 @@ public function register() ]; return $targets; - - }//end register() + } /** @@ -78,8 +77,5 @@ public function process(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'PHP keyword case', 'lower'); }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php index 3c9bef6ede..8c52af4349 100644 --- a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php @@ -56,8 +56,7 @@ public function register() $tokens[] = T_CLOSURE; $tokens[] = T_FN; return $tokens; - - }//end register() + } /** @@ -249,8 +248,7 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end foreach - - }//end process() + } /** @@ -313,8 +311,7 @@ protected function processUnionType(File $phpcsFile, int $typeDeclStart, int $ty ) { $this->processType($phpcsFile, $typeStart, $type, $error, $errorCode); } - - }//end processUnionType() + } /** @@ -352,8 +349,5 @@ protected function processType(File $phpcsFile, int $stackPtr, string $type, str if ($fix === true) { $phpcsFile->fixer->replaceToken($stackPtr, $typeLower); } - - }//end processType() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php index 291a8c9437..b44a238d6f 100644 --- a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php @@ -38,8 +38,7 @@ class NoSilencedErrorsSniff implements Sniff public function register() { return [T_ASPERAND]; - - }//end register() + } /** @@ -70,8 +69,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Silencing errors is discouraged; found: %s'; $phpcsFile->addWarning($error, $stackPtr, 'Discouraged', [$found]); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php index 459f55eea3..a6f40bd5cf 100644 --- a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php @@ -25,8 +25,7 @@ class RequireStrictTypesSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -101,8 +100,5 @@ public function process(File $phpcsFile, int $stackPtr) // Skip the rest of the file so we don't pick up additional // open tags, typically embedded in HTML. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php index 3f68328f3a..18cbb3107e 100644 --- a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php @@ -27,8 +27,7 @@ public function register() T_STRING, T_NAME_FULLY_QUALIFIED, ]; - - }//end register() + } /** @@ -65,8 +64,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Use the PHP_SAPI constant instead of calling php_sapi_name()'; $phpcsFile->addError($error, $stackPtr, 'FunctionFound'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php index f552561a4f..4123739f56 100644 --- a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php @@ -37,8 +37,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -67,8 +66,7 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -97,8 +95,5 @@ private function getPhpLintCommand(File $phpcsFile) Common::escapeshellcmd($this->phpPath), $fileName ); - - }//end getPhpLintCommand() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php index 130297c8a7..520856c6df 100644 --- a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php +++ b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php @@ -50,8 +50,5 @@ protected function processConstant(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'upper'); } - - }//end processConstant() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php index f4f2f0c946..1d14793b7d 100644 --- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php +++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php @@ -53,8 +53,7 @@ class UnnecessaryHeredocSniff implements Sniff public function register() { return [T_START_HEREDOC]; - - }//end register() + } /** @@ -138,8 +137,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php index 4a0d8dfdb0..beb3865aa9 100644 --- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php +++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php @@ -35,8 +35,7 @@ class UnnecessaryStringConcatSniff implements Sniff public function register() { return [T_STRING_CONCAT]; - - }//end register() + } /** @@ -88,8 +87,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'String concat is not required here; use a single string instead'; $phpcsFile->addError($error, $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php index 210c77a481..287bb7f77b 100644 --- a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php +++ b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -124,8 +123,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php index dba2568975..6de75b982d 100644 --- a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php +++ b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php @@ -48,8 +48,7 @@ class SubversionPropertiesSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -111,8 +110,7 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -188,8 +186,5 @@ protected function getProperties(string $path) } return $properties; - - }//end getProperties() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php index 77e5b7d6e0..08d7a18070 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php @@ -63,8 +63,7 @@ public function register() T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS, ]; - - }//end register() + } /** @@ -228,8 +227,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if }//end if }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php index 5be75cf911..7e3fe732c0 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php @@ -48,8 +48,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -219,8 +218,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php index 99474c990f..595cbacfdb 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php @@ -50,8 +50,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -189,8 +188,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php index 1545c1767a..4ab6323886 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php @@ -25,8 +25,7 @@ class GotoTargetSpacingSniff implements Sniff public function register() { return [T_GOTO_LABEL]; - - }//end register() + } /** @@ -79,8 +78,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php index b1e548a3b9..78c0914d64 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php @@ -27,8 +27,7 @@ public function register() T_START_HEREDOC, T_START_NOWDOC, ]; - - }//end register() + } /** @@ -62,8 +61,5 @@ public function process(File $phpcsFile, int $stackPtr) $replacement = str_replace([' ', "\t"], '', $tokens[$stackPtr]['content']); $phpcsFile->fixer->replaceToken($stackPtr, $replacement); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php index fbe25778f9..acd95214b0 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php @@ -28,8 +28,7 @@ public function register() T_DEC, T_INC, ]; - - }//end register() + } /** @@ -154,8 +153,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php index 1d18b2493f..4358cff786 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php @@ -41,8 +41,7 @@ public function register() T_USE, T_GOTO, ]; - - }//end register() + } /** @@ -157,8 +156,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->addContent($stackPtr, ' '); } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php index e4833c5ac5..72816b33c2 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php @@ -98,8 +98,7 @@ class ScopeIndentSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -1307,8 +1306,7 @@ public function process(File $phpcsFile, int $stackPtr) // Don't process the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -1394,8 +1392,5 @@ protected function adjustIndent(File $phpcsFile, int $stackPtr, int $length, int }//end if return true; - - }//end adjustIndent() - - -}//end class + } +} diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php index 16cc739021..9e57e53faf 100644 --- a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php +++ b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php @@ -39,8 +39,7 @@ class SpreadOperatorSpacingAfterSniff implements Sniff public function register() { return [T_ELLIPSIS]; - - }//end register() + } /** @@ -152,8 +151,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php index a9ed88b4a5..625f6b999a 100644 --- a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php +++ b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php @@ -59,8 +59,7 @@ public function getErrorList() 143 => 1, 149 => 1, ]; - - }//end getErrorList() + } /** @@ -74,8 +73,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php index 422f7901fc..43244b57c9 100644 --- a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php +++ b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php @@ -53,8 +53,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -68,8 +67,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php index 9d70894267..202cca8cf4 100644 --- a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php +++ b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 7 => 1, 8 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php index 157132ffa5..3aa5a8e7e1 100644 --- a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php +++ b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php @@ -31,8 +31,7 @@ final class DuplicateClassNameUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -91,8 +90,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php index 86534caca2..fc9acabcd3 100644 --- a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php +++ b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php @@ -46,8 +46,7 @@ public function getErrorList() 94 => 1, 100 => 1, ]; - - }//end getErrorList() + } /** @@ -61,8 +60,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php index d3386f78f8..e605ef1b78 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php @@ -31,8 +31,7 @@ final class AssignmentInConditionUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -89,8 +88,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php index 92ed67f2d8..d368465530 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php @@ -37,8 +37,7 @@ protected function getTestFiles(string $testFileBase) } return $testFiles; - - }//end getTestFiles() + } /** @@ -52,8 +51,7 @@ protected function getTestFiles(string $testFileBase) public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -104,8 +102,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php index b65133f3dd..d863530234 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php @@ -46,8 +46,7 @@ public function getErrorList() 72 => 2, 74 => 1, ]; - - }//end getErrorList() + } /** @@ -61,8 +60,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php index fb1e704fae..e36a993e08 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php @@ -31,8 +31,7 @@ final class ForLoopShouldBeWhileLoopUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php index b96bf2755a..31a25eb4e8 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php @@ -31,8 +31,7 @@ final class ForLoopWithTestFunctionCallUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -71,8 +70,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php index 457a4d1951..9f40ded175 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php @@ -31,8 +31,7 @@ final class JumbledIncrementerUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php index eb6933ad37..bc9186780c 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php @@ -69,8 +69,7 @@ public function getErrorList() 103 => 1, 116 => 1, ]; - - }//end getErrorList() + } /** @@ -84,8 +83,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php index d101bcb715..902eb80dfe 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php @@ -31,8 +31,7 @@ final class UnconditionalIfStatementUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php index 83d943e7b5..10b127ce8b 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php @@ -31,8 +31,7 @@ final class UnnecessaryFinalModifierUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -64,8 +63,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php index 3ef125ebf6..4b097072a1 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php @@ -31,8 +31,7 @@ final class UnusedFunctionParameterUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -71,8 +70,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php index ca784850c2..bac42c4bd0 100644 --- a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php +++ b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php @@ -31,8 +31,7 @@ final class UselessOverridingMethodUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php index afdcbbb408..8a96b59191 100644 --- a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php +++ b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php @@ -32,8 +32,7 @@ final class DocCommentUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -105,8 +104,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -120,8 +118,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php index c11b82333f..893920796b 100644 --- a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php +++ b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php @@ -41,8 +41,7 @@ public function getErrorList() 18 => 1, 21 => 1, ]; - - }//end getErrorList() + } /** @@ -56,8 +55,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php index f75c4a82d9..514417f068 100644 --- a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php +++ b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php @@ -31,8 +31,7 @@ final class TodoUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -55,8 +54,5 @@ public function getWarningList() 18 => 1, 21 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php index ff5761fae2..273a574a04 100644 --- a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php +++ b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php @@ -80,8 +80,7 @@ public function getErrorList() 202 => 2, 205 => 1, ]; - - }//end getErrorList() + } /** @@ -95,8 +94,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php index 6efc8f4864..43e8247a94 100644 --- a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php +++ b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php @@ -87,8 +87,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -102,8 +101,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php index 0fce83b468..c1059fd087 100644 --- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php +++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php @@ -41,8 +41,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -70,8 +69,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php index 1069ccd106..1fb85eb0c0 100644 --- a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php +++ b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php index fe58aaa355..c4d86e9926 100644 --- a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php +++ b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -61,8 +60,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php index 421972384a..3a47b27643 100644 --- a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php +++ b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php @@ -29,8 +29,7 @@ protected function shouldSkipTest() { // Skip on Windows which doesn't have the concept of executable files. return PHP_OS_FAMILY === 'Windows'; - - }//end shouldSkipTest() + } /** @@ -52,8 +51,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -69,8 +67,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php index 1d153e5565..ef198742ef 100644 --- a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php +++ b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -62,8 +61,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php index 8f65ea193f..924d034165 100644 --- a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php +++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php @@ -32,8 +32,7 @@ final class LineEndingsUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -47,8 +46,7 @@ public function setCliValues(string $testFile, Config $config) public function getErrorList() { return [1 => 1]; - - }//end getErrorList() + } /** @@ -62,8 +60,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php index ee285995cd..f26c0082c8 100644 --- a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php +++ b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php @@ -32,8 +32,7 @@ final class LineLengthUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -64,8 +63,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -108,8 +106,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php index 8bb160dadb..0306fddb2b 100644 --- a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php +++ b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php @@ -37,8 +37,7 @@ protected function getTestFiles(string $testFileBase) $testFiles[] = $testFileDir . DIRECTORY_SEPARATOR . 'lowercased_filename_unit_test.inc'; return $testFiles; - - }//end getTestFiles() + } /** @@ -60,8 +59,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -75,8 +73,7 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() + } /** @@ -99,8 +96,5 @@ public function testStdIn() $this->assertSame(0, $file->getErrorCount()); $this->assertSame(0, $file->getWarningCount()); $this->assertCount(0, $file->getErrors()); - - }//end testStdIn() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php index 4d2d5f87dd..84a0351b62 100644 --- a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php +++ b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 6 => 1, 10 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php index a9a74ef972..db0c8434ba 100644 --- a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php +++ b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 6 => 1, 10 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php index 7ac544ef22..45062b49d4 100644 --- a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php +++ b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php @@ -37,8 +37,7 @@ public function getErrorList() 18 => 1, 22 => 1, ]; - - }//end getErrorList() + } /** @@ -52,8 +51,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php index ec27c9900e..e7350ced16 100644 --- a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php +++ b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 6 => 1, 10 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php index dd78c22bea..2a4358f2d8 100644 --- a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php +++ b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php @@ -37,8 +37,7 @@ public function getErrorList() 8 => 2, 16 => 2, ]; - - }//end getErrorList() + } /** @@ -52,8 +51,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php index 39ed6757a7..9d0097cd0f 100644 --- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php +++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php @@ -31,8 +31,7 @@ final class MultipleStatementAlignmentUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -123,8 +122,5 @@ public function getWarningList() 499 => 1, 500 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php index 2c3b02f8c4..ae97c5fc5b 100644 --- a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php +++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php @@ -81,8 +81,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -96,8 +95,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php index 5c985ae75f..adacfc1878 100644 --- a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php +++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php @@ -67,8 +67,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -82,8 +81,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php index e8d87875d7..6fc96d35fa 100644 --- a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php +++ b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php @@ -61,8 +61,7 @@ public function getErrorList() 55 => 1, 56 => 1, ]; - - }//end getErrorList() + } /** @@ -76,8 +75,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php index ccdf95b3d8..9dba4a86fb 100644 --- a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php @@ -77,8 +77,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -92,8 +91,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php index 64dbe1132b..72052a0d20 100644 --- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php +++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php @@ -69,8 +69,7 @@ public function getErrorList() 268 => 1, 270 => 1, ]; - - }//end getErrorList() + } /** @@ -84,8 +83,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php index 73d10bbdfd..40b0ca5d32 100644 --- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php +++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php @@ -34,8 +34,7 @@ public function setCliValues(string $testFile, Config $config) if ($testFile === 'OpeningFunctionBraceKernighanRitchieUnitTest.2.inc') { $config->tabWidth = 4; } - - }//end setCliValues() + } /** @@ -95,8 +94,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -110,8 +108,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php index ff5b3c947f..db0453758b 100644 --- a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php +++ b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -70,8 +69,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php index 913b346bcf..d02953a1b2 100644 --- a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php +++ b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -63,8 +62,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php index a356e9691e..af12b143c4 100644 --- a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php index bdbc5a8110..294c61f79a 100644 --- a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php @@ -83,8 +83,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -98,8 +97,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php index 93e849186d..3ac4cd4ecc 100644 --- a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php index bf25bd5298..95f3f6b397 100644 --- a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php @@ -40,8 +40,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -55,8 +54,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php index 0ba548732e..69b45f9b37 100644 --- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php @@ -41,8 +41,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -56,8 +55,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php index ad31a5fe12..4fe2a7d084 100644 --- a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php +++ b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php @@ -54,8 +54,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -69,8 +68,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php index c7e863c298..5dcc5c6ce5 100644 --- a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php @@ -33,8 +33,7 @@ public function getErrorList() return [ 2 => 2, ]; - - }//end getErrorList() + } /** @@ -48,8 +47,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php index 9a40b4dba6..9873a3785b 100644 --- a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php @@ -39,8 +39,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -54,8 +53,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php index 7581e7e933..75ba4c163f 100644 --- a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php index c5e1f616ce..c35a9fef50 100644 --- a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList() } return $errors; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php index bf5d6ebbf9..cf4e75d6a1 100644 --- a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -78,8 +77,5 @@ public function getWarningList($testFile = '') } return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php index 332e8d4317..c582501179 100644 --- a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php @@ -34,8 +34,7 @@ protected function getErrorList() 12 => 1, 13 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ protected function getErrorList() protected function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php index f9ff9c408d..592e8055ce 100644 --- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php @@ -40,8 +40,7 @@ protected function getTestFiles(string $testFileBase) } return $testFiles; - - }//end getTestFiles() + } /** @@ -74,8 +73,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -108,8 +106,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php index 92cfaadccb..0b6a3e4b5b 100644 --- a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php @@ -31,8 +31,7 @@ final class DiscourageGotoUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getWarningList() 11 => 1, 16 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php index 5b6dfb36f5..25425132c9 100644 --- a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() ]; return $errors; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php index 4f8b15f1cf..bb3d1f3e35 100644 --- a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php @@ -78,8 +78,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -93,8 +92,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php index dee90514fb..8581342ea2 100644 --- a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php @@ -61,8 +61,7 @@ public function getErrorList() 71 => 1, 72 => 1, ]; - - }//end getErrorList() + } /** @@ -76,8 +75,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php index eee067d3a0..694dcd111a 100644 --- a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php @@ -103,8 +103,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -118,8 +117,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php index 6f58988652..faf541b28f 100644 --- a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php @@ -31,8 +31,7 @@ final class NoSilencedErrorsUnitTest extends AbstractSniffTestCase public function getErrorList() { return [13 => 1]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getWarningList() 10 => 1, 16 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php index 67bfbcb7f0..e5bf1bb3a2 100644 --- a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php index 31b0d31e1e..a23633759b 100644 --- a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 2 => 1, 6 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php index 6d314be51a..0cb614d07a 100644 --- a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -59,8 +58,7 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() + } /** @@ -103,8 +101,7 @@ public function testStdIn($content, $errorCount, $expectedErrors) $file->getErrors(), 'Error list does not match expected errors' ); - - }//end testStdIn() + } /** @@ -163,8 +160,5 @@ public static function dataStdIn() ], ], ]; - - }//end dataStdIn() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php index 5d71f77923..e8d6697c37 100644 --- a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php +++ b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php @@ -59,8 +59,7 @@ public function getErrorList() 117 => 1, 118 => 1, ]; - - }//end getErrorList() + } /** @@ -74,8 +73,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php index da26368471..f338d600ab 100644 --- a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php +++ b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php @@ -31,8 +31,7 @@ final class UnnecessaryHeredocUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -67,8 +66,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php index 185c081b56..43b3249c6c 100644 --- a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php +++ b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php @@ -46,8 +46,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -61,8 +60,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php index 6ec7049b92..9774cb8aea 100644 --- a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php +++ b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php @@ -117,8 +117,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -132,8 +131,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php index 30735a1441..0e6e4056d4 100644 --- a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php +++ b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php @@ -29,8 +29,7 @@ protected function shouldSkipTest() { // This sniff cannot be tested as no SVN version control directory is available. return true; - - }//end shouldSkipTest() + } /** @@ -44,8 +43,7 @@ protected function shouldSkipTest() public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -59,8 +57,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php index d0a8d40096..e5a17a24e0 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php @@ -73,8 +73,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -99,8 +98,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php index ba6c1a78c4..fc5c2dc3ac 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php @@ -36,8 +36,7 @@ public function setCliValues(string $testFile, Config $config) } $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -118,8 +117,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -133,8 +131,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php index 4f628f7d88..0d29bb2272 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php @@ -32,8 +32,7 @@ final class DisallowTabIndentUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -119,8 +118,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -134,8 +132,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php index 0ca4cd6b4e..0e86a2f110 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 24 => 1, 34 => 1, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php index e47266a823..006a3f59b1 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 19 => 1, 23 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php index e5890e3273..3bc6bf7045 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php @@ -56,8 +56,7 @@ public function getErrorList() 56 => 1, 58 => 1, ]; - - }//end getErrorList() + } /** @@ -71,8 +70,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php index ac1c38647f..58e771aa3a 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php @@ -80,8 +80,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -95,8 +94,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php index 51fd0576e5..f1c672c307 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php @@ -39,8 +39,7 @@ public function setCliValues(string $testFile, Config $config) } else { $config->tabWidth = 0; } - - }//end setCliValues() + } /** @@ -174,8 +173,7 @@ public function getErrorList($testFile = '') 1633 => 1, 1634 => 1, ]; - - }//end getErrorList() + } /** @@ -189,8 +187,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php index 6bc5a24f83..e8b35bf561 100644 --- a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php +++ b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php @@ -50,8 +50,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php index 346bb19b47..ace6e1a013 100644 --- a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php +++ b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php @@ -29,8 +29,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -142,8 +141,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php index daf4267e16..b89a50a940 100644 --- a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php +++ b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php @@ -28,8 +28,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -87,8 +86,7 @@ public function process(File $phpcsFile, int $stackPtr) // Check each tag. $this->processTags($phpcsFile, $stackPtr, $tokens[$commentEnd]['comment_opener']); - - }//end process() + } /** @@ -115,8 +113,5 @@ protected function processVersion(File $phpcsFile, array $tags) $phpcsFile->addWarning($error, $tag, 'InvalidVersion', $data); } } - - }//end processVersion() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php index bf8b52bf90..70c1490bb1 100644 --- a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php +++ b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php @@ -86,8 +86,7 @@ class FileCommentSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -214,8 +213,7 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -313,8 +311,7 @@ protected function processTags(File $phpcsFile, int $stackPtr, int $commentStart $pos++; } }//end foreach - - }//end processTags() + } /** @@ -355,8 +352,7 @@ protected function processCategory(File $phpcsFile, array $tags) $phpcsFile->addError($error, $tag, 'InvalidCategory', $data); } }//end foreach - - }//end processCategory() + } /** @@ -408,8 +404,7 @@ protected function processPackage(File $phpcsFile, array $tags) $phpcsFile->addError($error, $tag, 'InvalidPackage', $data); }//end if }//end foreach - - }//end processPackage() + } /** @@ -452,8 +447,7 @@ protected function processSubpackage(File $phpcsFile, array $tags) ]; $phpcsFile->addError($error, $tag, 'InvalidSubpackage', $data); }//end foreach - - }//end processSubpackage() + } /** @@ -482,8 +476,7 @@ protected function processAuthor(File $phpcsFile, array $tags) $phpcsFile->addError($error, $tag, 'InvalidAuthors'); } } - - }//end processAuthor() + } /** @@ -523,8 +516,7 @@ protected function processCopyright(File $phpcsFile, array $tags) $phpcsFile->addError($error, $tag, 'IncompleteCopyright'); } }//end foreach - - }//end processCopyright() + } /** @@ -552,8 +544,7 @@ protected function processLicense(File $phpcsFile, array $tags) $phpcsFile->addError($error, $tag, 'IncompleteLicense'); } } - - }//end processLicense() + } /** @@ -584,8 +575,5 @@ protected function processVersion(File $phpcsFile, array $tags) $phpcsFile->addWarning($error, $tag, 'InvalidVersion', $data); } } - - }//end processVersion() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php index b49d159f32..ce74ddee43 100644 --- a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php +++ b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php @@ -44,8 +44,7 @@ class FunctionCommentSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -175,8 +174,7 @@ public function process(File $phpcsFile, int $stackPtr) $this->processReturn($phpcsFile, $stackPtr, $commentStart); $this->processThrows($phpcsFile, $stackPtr, $commentStart); $this->processParams($phpcsFile, $stackPtr, $commentStart); - - }//end process() + } /** @@ -224,8 +222,7 @@ protected function processReturn(File $phpcsFile, int $stackPtr, int $commentSta $error = 'Missing @return tag in function comment'; $phpcsFile->addError($error, $tokens[$commentStart]['comment_closer'], 'MissingReturn'); }//end if - - }//end processReturn() + } /** @@ -259,8 +256,7 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta $phpcsFile->addError($error, $tag, 'InvalidThrows'); } }//end foreach - - }//end processThrows() + } /** @@ -543,8 +539,5 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta $data = [$neededParam]; $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data); } - - }//end processParams() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php index 20101018c7..63a1cf81dd 100644 --- a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php +++ b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php @@ -24,8 +24,7 @@ class InlineCommentSniff implements Sniff public function register() { return [T_COMMENT]; - - }//end register() + } /** @@ -61,8 +60,5 @@ public function process(File $phpcsFile, int $stackPtr) ) { $phpcsFile->recordMetric($stackPtr, 'Inline comment style', '/* ... */'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php index 4ca5451b36..b7c821d29d 100644 --- a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php +++ b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php @@ -41,8 +41,5 @@ protected function getPatterns() 'do {EOL', 'match (...) {EOL', ]; - - }//end getPatterns() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php index f46a86a3df..616e25f963 100644 --- a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php +++ b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php @@ -35,8 +35,7 @@ public function register() T_IF, T_ELSEIF, ]; - - }//end register() + } /** @@ -266,8 +265,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken(($closeBracket + 1), ' '); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php index 3c8d8a1f4f..2c711812c7 100644 --- a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php +++ b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php @@ -32,8 +32,7 @@ public function register() T_REQUIRE, T_INCLUDE, ]; - - }//end register() + } /** @@ -129,8 +128,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php index 111c3cc0e1..6c82651f0f 100644 --- a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php +++ b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php @@ -31,8 +31,7 @@ class MultiLineAssignmentSniff implements Sniff public function register() { return [T_EQUAL]; - - }//end register() + } /** @@ -99,8 +98,5 @@ public function process(File $phpcsFile, int $stackPtr) ]; $phpcsFile->addError($error, $stackPtr, 'Indent', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php index eaabb1be4e..cbedac50f4 100644 --- a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php +++ b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php @@ -60,8 +60,7 @@ public function register() $tokens[] = T_CLOSE_PARENTHESIS; return $tokens; - - }//end register() + } /** @@ -154,8 +153,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processSingleLineCall($phpcsFile, $stackPtr, $openBracket, $tokens); } - - }//end process() + } /** @@ -179,8 +177,7 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket } return false; - - }//end isMultiLineCall() + } /** @@ -309,8 +306,7 @@ public function processSingleLineCall(File $phpcsFile, int $stackPtr, int $openB }//end if }//end if }//end if - - }//end processSingleLineCall() + } /** @@ -619,8 +615,5 @@ public function processMultiLineCall(File $phpcsFile, int $stackPtr, int $openBr $argEnd = $phpcsFile->findEndOfStatement($next, [T_COLON]); }//end if }//end for - - }//end processMultiLineCall() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php index fd2c05b97b..53dfa7c3dc 100644 --- a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php +++ b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php @@ -37,8 +37,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -193,8 +192,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens); } - - }//end process() + } /** @@ -230,8 +228,7 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open } return false; - - }//end isMultiLineDeclaration() + } /** @@ -257,8 +254,7 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr $sniff->checkClosures = true; $sniff->process($phpcsFile, $stackPtr); - - }//end processSingleLineDeclaration() + } /** @@ -355,8 +351,7 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra } } } - - }//end processMultiLineDeclaration() + } /** @@ -529,8 +524,5 @@ public function processArgumentList(File $phpcsFile, int $stackPtr, int $indent, continue; } }//end for - - }//end processArgumentList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php index 4e2255c3e9..dee42547f9 100644 --- a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php +++ b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php @@ -28,8 +28,7 @@ public function register() T_CLOSURE, T_FN, ]; - - }//end register() + } /** @@ -74,8 +73,5 @@ public function process(File $phpcsFile, int $stackPtr) return; } }//end foreach - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php index 4cbe3c4b6b..126be891e1 100644 --- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php +++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php @@ -29,8 +29,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -91,8 +90,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $stackPtr, 'Invalid', $data); } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php index f7dc41509e..a8ddb42350 100644 --- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php +++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php @@ -74,8 +74,7 @@ class ValidFunctionNameSniff extends AbstractScopeSniff public function __construct() { parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true); - - }//end __construct() + } /** @@ -183,8 +182,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData); } } - - }//end processTokenWithinScope() + } /** @@ -290,8 +288,5 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) $data[] = $newName; $phpcsFile->addError($error, $stackPtr, 'FunctionNameInvalid', $data); } - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php index 4146bf8301..694dd60dcb 100644 --- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -25,8 +25,7 @@ class ValidVariableNameSniff extends AbstractVariableSniff public function __construct() { AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false); - - }//end __construct() + } /** @@ -80,8 +79,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $stackPtr, 'PublicUnderscore', $data); return; } - - }//end processMemberVar() + } /** @@ -94,11 +92,8 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) */ protected function processVariable(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariable() + // We don't care about normal variables. + } /** @@ -111,11 +106,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr) */ protected function processVariableInString(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariableInString() - - -}//end class + // We don't care about normal variables. + } +} diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php index 716b571a8b..510b0b648f 100644 --- a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php +++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php @@ -48,8 +48,7 @@ class ObjectOperatorIndentSniff implements Sniff public function register() { return self::TARGET_TOKENS; - - }//end register() + } /** @@ -194,8 +193,5 @@ public function process(File $phpcsFile, int $stackPtr) $end ); }//end while - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php index 808b83da4b..c50032ae1f 100644 --- a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php +++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php @@ -32,8 +32,7 @@ class ScopeClosingBraceSniff implements Sniff public function register() { return Tokens::SCOPE_OPENERS; - - }//end register() + } /** @@ -175,8 +174,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->addContentBefore($lineStart, $spaces); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php index e95dc8bda1..16b4979ff2 100644 --- a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php +++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php @@ -21,4 +21,4 @@ class ScopeIndentSniff extends GenericScopeIndentSniff */ protected $nonIndentingScopes = [T_SWITCH]; -}//end class +} diff --git a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php index 752ba931dd..76f7bed5fd 100644 --- a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php +++ b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php @@ -36,8 +36,7 @@ public function setCliValues(string $testFile, Config $config) } $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -73,8 +72,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -90,8 +88,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return[]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php index d7074da6e8..f409dfb858 100644 --- a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php +++ b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php @@ -66,8 +66,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -92,8 +91,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php index ef528eaf0c..ad1c003af1 100644 --- a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php +++ b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php @@ -60,8 +60,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -88,8 +87,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php index 5768399e19..5c5d738410 100644 --- a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php +++ b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php @@ -104,8 +104,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -119,8 +118,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php index 23974f152f..d5569027d1 100644 --- a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php +++ b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php @@ -39,8 +39,7 @@ public function getErrorList() 29 => 1, 31 => 1, ]; - - }//end getErrorList() + } /** @@ -54,8 +53,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php index 736858db37..e5e204708e 100644 --- a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php +++ b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php @@ -55,8 +55,7 @@ public function getErrorList() 157 => 1, 165 => 1, ]; - - }//end getErrorList() + } /** @@ -70,8 +69,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php index b76067ee62..dca5fd073c 100644 --- a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php +++ b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php @@ -67,8 +67,7 @@ public function getErrorList() 240 => 2, 248 => 2, ]; - - }//end getErrorList() + } /** @@ -82,8 +81,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php index 2e27075073..ef51f88154 100644 --- a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php +++ b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php @@ -50,8 +50,7 @@ public function getErrorList() 98 => 1, 99 => 2, ]; - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php index ad23051c12..8c1a17c083 100644 --- a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php +++ b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 6 => 1, 8 => 1, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php index 2def5fe808..6780b35359 100644 --- a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php +++ b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php @@ -129,8 +129,7 @@ public function getErrorList() 604 => 1, 605 => 2, ]; - - }//end getErrorList() + } /** @@ -144,8 +143,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php index f1a0918488..ca18221af0 100644 --- a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php +++ b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php @@ -118,8 +118,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -133,8 +132,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php index ecfe37e850..13551b5cb7 100644 --- a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php +++ b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php @@ -52,8 +52,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -67,8 +66,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php index 7c8f43c38f..c89547e1cf 100644 --- a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php +++ b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php @@ -56,8 +56,7 @@ public function getErrorList() 88 => 2, 90 => 1, ]; - - }//end getErrorList() + } /** @@ -71,8 +70,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php index 67aa58b01b..87282cb5d3 100644 --- a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php +++ b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php @@ -140,8 +140,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -155,8 +154,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php index 05c45b3d7f..1c6d8a5ba4 100644 --- a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php +++ b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php index 9e0b398ba4..eff18e0650 100644 --- a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php +++ b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php @@ -58,8 +58,7 @@ public function getErrorList() 142 => 1, 152 => 1, ]; - - }//end getErrorList() + } /** @@ -73,8 +72,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php index cd29f138f7..76c6a7b3b3 100644 --- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php +++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList() 164 => 1, 170 => 1, ]; - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php index 1a5a326950..f667edc70a 100644 --- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php +++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php @@ -32,8 +32,7 @@ final class ScopeIndentUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->setConfigData('scope_indent_debug', '0', true); - - }//end setCliValues() + } /** @@ -65,8 +64,7 @@ public function getErrorList() 284 => 1, 311 => 1, ]; - - }//end getErrorList() + } /** @@ -80,8 +78,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php index 88da7606d5..43bbfe0be6 100644 --- a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php +++ b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php @@ -29,8 +29,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -68,8 +67,5 @@ public function process(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'Class defined in namespace', 'yes'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php index 5feb5a5bee..36fdb52240 100644 --- a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php +++ b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php @@ -49,8 +49,7 @@ class SideEffectsSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -81,8 +80,7 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() + } /** @@ -308,8 +306,5 @@ private function searchForConflict(File $phpcsFile, int $start, int $end, array 'symbol' => $firstSymbol, 'effect' => $firstEffect, ]; - - }//end searchForConflict() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php index 1aa3c6acee..1bac6e9b98 100644 --- a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php +++ b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php @@ -69,8 +69,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ } else { $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes'); } - - }//end processTokenWithinScope() + } /** @@ -84,8 +83,5 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php index 0e23ce32ff..f5f37f6a0a 100644 --- a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php +++ b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php @@ -40,8 +40,7 @@ public function getErrorList($testFile = '') 2 => 1, 3 => 2, ]; - - }//end getErrorList() + } /** @@ -55,8 +54,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php index f927a4387c..1989098890 100644 --- a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php +++ b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php @@ -34,8 +34,7 @@ public function setCliValues(string $testFile, Config $config) if ($testFile === 'SideEffectsUnitTest.12.inc') { $config->annotations = false; } - - }//end setCliValues() + } /** @@ -51,8 +50,7 @@ public function setCliValues(string $testFile, Config $config) public function getErrorList($testFile = '') { return []; - - }//end getErrorList() + } /** @@ -79,8 +77,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php index c8e6d30cf8..e5db7a575a 100644 --- a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php +++ b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php @@ -50,8 +50,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php index b825475248..20cd4dfb9a 100644 --- a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php +++ b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php @@ -41,8 +41,7 @@ class AnonClassDeclarationSniff extends ClassDeclarationSniff public function register() { return [T_ANON_CLASS]; - - }//end register() + } /** @@ -131,8 +130,7 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } }//end if - - }//end process() + } /** @@ -218,8 +216,7 @@ public function processSingleLineArgumentList(File $phpcsFile, int $stackPtr) }//end if }//end if }//end if - - }//end processSingleLineArgumentList() + } /** @@ -239,8 +236,5 @@ public function processMultiLineArgumentList(File $phpcsFile, int $stackPtr) $this->multiLineSniff->processBracket($phpcsFile, $openBracket, $tokens, 'argument'); $this->multiLineSniff->processArgumentList($phpcsFile, $stackPtr, $this->indent, 'argument'); - - }//end processMultiLineArgumentList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php index 6c005ceabe..963bed27c8 100644 --- a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php +++ b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php @@ -25,8 +25,7 @@ class ClassInstantiationSniff implements Sniff public function register() { return [T_NEW]; - - }//end register() + } /** @@ -104,8 +103,5 @@ public function process(File $phpcsFile, int $stackPtr) $prev = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, ($classNameEnd - 1), null, true); $phpcsFile->fixer->addContent($prev, '()'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php index 3e241c326d..ae1b6f96b2 100644 --- a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php +++ b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php @@ -30,8 +30,7 @@ public function register() T_ENUM, T_FUNCTION, ]; - - }//end register() + } /** @@ -60,8 +59,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Closing brace must not be followed by any comment or statement on the same line'; $phpcsFile->addError($error, $closer, 'StatementAfter'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php index 7825057f73..fdaaa2c687 100644 --- a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php +++ b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php @@ -25,8 +25,7 @@ class OpeningBraceSpaceSniff implements Sniff public function register() { return Tokens::OO_SCOPE_TOKENS; - - }//end register() + } /** @@ -73,8 +72,5 @@ public function process(File $phpcsFile, int $stackPtr) } $phpcsFile->fixer->endChangeset(); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php index 6e64d13661..9f16712d7e 100644 --- a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php +++ b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php @@ -49,8 +49,7 @@ public function register() T_ELSEIF, T_MATCH, ]; - - }//end register() + } /** @@ -227,8 +226,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end foreach $phpcsFile->fixer->endChangeset(); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php index 43417c13d9..e996687cd2 100644 --- a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php +++ b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php @@ -38,8 +38,7 @@ class ControlStructureSpacingSniff implements Sniff public function __construct() { $this->psr2ControlStructureSpacing = new PSR2ControlStructureSpacing(); - - }//end __construct() + } /** @@ -59,8 +58,7 @@ public function register() T_CATCH, T_MATCH, ]; - - }//end register() + } /** @@ -213,8 +211,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php index 15ed5d37c0..82498a14c9 100644 --- a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php +++ b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php @@ -25,8 +25,7 @@ class DeclareStatementSniff implements Sniff public function register() { return [T_DECLARE]; - - }//end register() + } /** @@ -255,8 +254,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php index 33ad1b715c..3947a449b3 100644 --- a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php +++ b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php @@ -25,8 +25,7 @@ class FileHeaderSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -115,8 +114,7 @@ public function process(File $phpcsFile, int $stackPtr) $this->processHeaderLines($phpcsFile, $possibleHeaders[$openTag]); return $phpcsFile->numTokens; - - }//end process() + } /** @@ -273,8 +271,7 @@ public function getHeaderLines(File $phpcsFile, int $stackPtr) } while ($next !== false); return $headerLines; - - }//end getHeaderLines() + } /** @@ -424,8 +421,5 @@ public function processHeaderLines(File $phpcsFile, array $headerLines) $phpcsFile->addError($error, $found[$type]['start'], 'IncorrectOrder', $data); }//end if }//end foreach - - }//end processHeaderLines() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php index af4ebe14da..59dc9488f4 100644 --- a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php +++ b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php @@ -25,8 +25,7 @@ class ImportStatementSniff implements Sniff public function register() { return [T_USE]; - - }//end register() + } /** @@ -70,8 +69,5 @@ public function process(File $phpcsFile, int $stackPtr) if ($fix === true) { $phpcsFile->fixer->replaceToken($next, ltrim($tokens[$next]['content'], '\\')); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php index a43341fc4a..667998f1b3 100644 --- a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php +++ b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php @@ -24,8 +24,7 @@ class OpenTagSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -77,8 +76,5 @@ public function process(File $phpcsFile, int $stackPtr) } return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php index 19f9880278..6dbee05704 100644 --- a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php +++ b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php @@ -40,8 +40,7 @@ class NullableTypeDeclarationSniff implements Sniff public function register() { return [T_NULLABLE]; - - }//end register() + } /** @@ -86,8 +85,5 @@ public function process(File $phpcsFile, int $stackPtr) // Non-whitespace tokens found; trigger error but don't fix. $phpcsFile->addError($error, $stackPtr, 'UnexpectedCharactersFound'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php index b0c0bf9e05..9fd340d6a0 100644 --- a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php +++ b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php @@ -28,8 +28,7 @@ public function register() T_CLOSURE, T_FN, ]; - - }//end register() + } /** @@ -103,8 +102,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $colon, 'SpaceBeforeColon'); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php index 899499f6db..3311afc9a2 100644 --- a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php +++ b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php @@ -27,8 +27,7 @@ public function register() T_BOOL_CAST, T_INT_CAST, ]; - - }//end register() + } /** @@ -68,8 +67,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($stackPtr, $replacement); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php index dbd34e2043..800a829aee 100644 --- a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php +++ b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php @@ -31,8 +31,7 @@ class CompoundNamespaceDepthSniff implements Sniff public function register() { return [T_OPEN_USE_GROUP]; - - }//end register() + } /** @@ -78,8 +77,5 @@ public function process(File $phpcsFile, int $stackPtr) $depth = 1; } }//end for - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php index e5cd2d40e8..f231f594fa 100644 --- a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php +++ b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php @@ -39,8 +39,7 @@ public function register() $targets[] = T_DECLARE; return $targets; - - }//end register() + } /** @@ -121,8 +120,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->addContent($stackPtr, ' '); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php index 6dbd01383e..edeae1bb25 100644 --- a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php +++ b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php @@ -36,8 +36,7 @@ class ConstantVisibilitySniff implements Sniff public function register() { return [T_CONST]; - - }//end register() + } /** @@ -68,8 +67,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Visibility must be declared on all constants if your project supports PHP 7.1 or later'; $phpcsFile->addWarning($error, $stackPtr, 'NotFound'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php index 385c0078bb..9083c7a5ea 100644 --- a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php +++ b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php @@ -25,8 +25,7 @@ class UseDeclarationSniff implements Sniff public function register() { return [T_USE]; - - }//end register() + } /** @@ -299,8 +298,7 @@ public function process(File $phpcsFile, int $stackPtr) }//end foreach return $tokens[$ooToken]['scope_closer']; - - }//end process() + } /** @@ -667,8 +665,7 @@ protected function processUseGroup(File $phpcsFile, int $stackPtr) } } }//end if - - }//end processUseGroup() + } /** @@ -693,8 +690,5 @@ protected function processUseStatement(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($next, ';' . $phpcsFile->eolChar . $padding . 'use '); } } - - }//end processUseStatement() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php index e4cef952fb..ab69e365da 100644 --- a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php +++ b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php @@ -58,8 +58,7 @@ public function getErrorList() 94 => 1, 96 => 1, ]; - - }//end getErrorList() + } /** @@ -73,8 +72,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php index 1881b73ccd..bf6afc4fd0 100644 --- a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php +++ b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php @@ -52,8 +52,7 @@ public function getErrorList() 55 => 1, 56 => 1, ]; - - }//end getErrorList() + } /** @@ -67,8 +66,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php index fb7ea880ea..9ffd91e4bb 100644 --- a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php +++ b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 31 => 1, 52 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php index ebef4ac961..023f9311c6 100644 --- a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php +++ b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 41 => 1, 55 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php index e1d1ca1185..abbe82d8da 100644 --- a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php +++ b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList() 104 => 1, 125 => 1, ]; - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php index 27284d8b0c..dbd70d209d 100644 --- a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php +++ b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php @@ -55,8 +55,7 @@ public function getErrorList() 117 => 1, 127 => 1, ]; - - }//end getErrorList() + } /** @@ -70,8 +69,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php index 1ca9aa3870..8edad0b17b 100644 --- a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php +++ b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php @@ -62,8 +62,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -77,8 +76,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php index 457c76b3da..d497f7b75e 100644 --- a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php +++ b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php @@ -65,8 +65,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -80,8 +79,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php index b5e6cda2b5..247f77079f 100644 --- a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php +++ b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 7 => 1, 10 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php index 6cfa014e56..eb9e0e107c 100644 --- a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php +++ b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php index 416d79fb3a..cac04f0be7 100644 --- a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php +++ b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php @@ -51,8 +51,7 @@ protected function getErrorList() 95 => 1, 98 => 3, ]; - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ protected function getErrorList() protected function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php index 20dffaf3ba..d25f352760 100644 --- a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php +++ b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php @@ -44,8 +44,7 @@ protected function getErrorList() 62 => 1, 64 => 1, ]; - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ protected function getErrorList() protected function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php index 6b56dfb693..b655225f69 100644 --- a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php +++ b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php @@ -37,8 +37,7 @@ public function getErrorList() 13 => 1, 14 => 1, ]; - - }//end getErrorList() + } /** @@ -52,8 +51,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php index bff6560993..41b150ec7f 100644 --- a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php +++ b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 19 => 1, 22 => 1, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php index cd76b02f6b..d33849be67 100644 --- a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php +++ b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php @@ -59,8 +59,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -74,8 +73,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php index ab869ba856..20a8d92426 100644 --- a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php +++ b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php @@ -31,8 +31,7 @@ final class ConstantVisibilityUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -63,8 +62,5 @@ public function getWarningList($testFile = '') default: return []; } - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php index 0ab72b9c7f..d64bd870f6 100644 --- a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php +++ b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php @@ -54,8 +54,7 @@ public function getErrorList() 208 => 1, 219 => 3, ]; - - }//end getErrorList() + } /** @@ -69,8 +68,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php index cc7ee685a5..bdace2de13 100644 --- a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php @@ -57,8 +57,7 @@ public function process(File $phpcsFile, int $stackPtr) $this->processOpen($phpcsFile, $stackPtr); $this->processClose($phpcsFile, $stackPtr); - - }//end process() + } /** @@ -460,8 +459,7 @@ public function processOpen(File $phpcsFile, int $stackPtr) $nextComma = ($className + 1); }//end if }//end foreach - - }//end processOpen() + } /** @@ -516,8 +514,5 @@ public function processClose(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $closeBrace, 'CloseBraceSameLine', $data); } } - - }//end processClose() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php index 9168fe4fce..c1965c6806 100644 --- a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php @@ -25,8 +25,7 @@ class PropertyDeclarationSniff extends AbstractVariableSniff public function __construct() { AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false); - - }//end __construct() + } /** @@ -278,8 +277,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) } } }//end if - - }//end processMemberVar() + } /** @@ -292,11 +290,8 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) */ protected function processVariable(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariable() + // We don't care about normal variables. + } /** @@ -309,11 +304,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr) */ protected function processVariableInString(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariableInString() - - -}//end class + // We don't care about normal variables. + } +} diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php index 45c5a75858..c8276fb91b 100644 --- a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php +++ b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php @@ -48,8 +48,7 @@ public function register() T_CATCH, T_MATCH, ]; - - }//end register() + } /** @@ -134,8 +133,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php index 59abfd1c46..705361457a 100644 --- a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php @@ -27,8 +27,7 @@ public function register() T_ELSE, T_ELSEIF, ]; - - }//end register() + } /** @@ -65,8 +64,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php index 03dd188ecb..218787bded 100644 --- a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php @@ -46,8 +46,7 @@ class SwitchDeclarationSniff implements Sniff public function register() { return [T_SWITCH]; - - }//end register() + } /** @@ -221,8 +220,7 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end while - - }//end process() + } /** @@ -250,8 +248,7 @@ private function findNextCase(File $phpcsFile, int $stackPtr, int $end) } return $stackPtr; - - }//end findNextCase() + } /** @@ -403,8 +400,5 @@ private function findNestedTerminator(File $phpcsFile, int $stackPtr, int $end) }//end if return false; - - }//end findNestedTerminator() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php index c57a6ec366..04b2d1329d 100644 --- a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php +++ b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php @@ -25,8 +25,7 @@ class ClosingTagSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -82,8 +81,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php index 60f4c0793e..e527ab9ae3 100644 --- a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php +++ b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -100,8 +99,5 @@ public function process(File $phpcsFile, int $stackPtr) // Skip the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php index 3034306ab5..9f2c9e8bef 100644 --- a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php +++ b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php @@ -72,8 +72,5 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket } return false; - - }//end isMultiLineCall() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php index c697c0e325..5da3ffe555 100644 --- a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php +++ b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php @@ -27,8 +27,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -84,8 +83,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php index adc9141392..45ad86432b 100644 --- a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php @@ -23,8 +23,7 @@ class MethodDeclarationSniff extends AbstractScopeSniff public function __construct() { parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]); - - }//end __construct() + } /** @@ -139,8 +138,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ $phpcsFile->fixer->endChangeset(); } - - }//end processTokenWithinScope() + } /** @@ -155,8 +153,5 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php index 0abd7a2912..43218aeb15 100644 --- a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php @@ -24,8 +24,7 @@ class NamespaceDeclarationSniff implements Sniff public function register() { return [T_NAMESPACE]; - - }//end register() + } /** @@ -86,8 +85,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php index 7e608f8a92..dcd102a4f9 100644 --- a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php +++ b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php @@ -25,8 +25,7 @@ class UseDeclarationSniff implements Sniff public function register() { return [T_USE]; - - }//end register() + } /** @@ -261,8 +260,7 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() + } /** @@ -295,8 +293,5 @@ private function shouldIgnoreUse(File $phpcsFile, int $stackPtr) } return false; - - }//end shouldIgnoreUse() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php index 1f51327caf..f99a225ebc 100644 --- a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php @@ -81,8 +81,7 @@ public function getErrorList() 324 => 1, 344 => 1, ]; - - }//end getErrorList() + } /** @@ -96,8 +95,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php index af73d7cb75..003e1148e8 100644 --- a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php @@ -89,8 +89,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -118,8 +117,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php index 4abd793a08..2598406e3c 100644 --- a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php +++ b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList() 77 => 2, 79 => 2, ]; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php index f62d7654b9..cacb82f45a 100644 --- a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php @@ -31,8 +31,7 @@ final class ElseIfDeclarationUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getWarningList() 4 => 1, 12 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php index 5fc66e7dba..988211cde1 100644 --- a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php @@ -69,8 +69,7 @@ public function getErrorList() 620 => 1, 622 => 1, ]; - - }//end getErrorList() + } /** @@ -84,8 +83,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php index 50665c40b4..1ca2a2b004 100644 --- a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php +++ b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php @@ -47,8 +47,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -62,8 +61,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php index 0dbda0d8e8..7e3a38eebf 100644 --- a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php +++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php @@ -47,8 +47,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -64,8 +63,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php index 40e082047b..5a2051a362 100644 --- a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php +++ b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php @@ -82,8 +82,7 @@ public function getErrorList() 281 => 1, 282 => 3, ]; - - }//end getErrorList() + } /** @@ -97,8 +96,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php index d2a171daee..394bc42f42 100644 --- a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php +++ b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 63 => 1, 70 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php index 50c531ce22..b617a7f9be 100644 --- a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php @@ -55,8 +55,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -85,8 +84,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php index d5c1cc452f..a0685ac7ed 100644 --- a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 17 => 1, 19 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php index 2c98e0f114..a855c03262 100644 --- a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php +++ b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php @@ -80,8 +80,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -95,8 +94,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php index 7f93acc15a..c04caaada3 100644 --- a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php @@ -27,8 +27,7 @@ public function register() T_OPEN_SQUARE_BRACKET, T_CLOSE_SQUARE_BRACKET, ]; - - }//end register() + } /** @@ -88,8 +87,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php index fe8d988a25..6350acc688 100644 --- a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php @@ -28,8 +28,7 @@ public function register() T_ARRAY, T_OPEN_SHORT_ARRAY, ]; - - }//end register() + } /** @@ -146,8 +145,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd); } - - }//end process() + } /** @@ -320,8 +318,7 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arra } }//end foreach }//end if - - }//end processSingleLineArray() + } /** @@ -955,8 +952,5 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array } } }//end foreach - - }//end processMultiLineArray() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php index 0a44fd4188..448a17bed4 100644 --- a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php @@ -38,8 +38,7 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Only one interface or class is allowed in a file'; $phpcsFile->addError($error, $nextClass, 'MultipleClasses'); } - - }//end process() + } /** @@ -83,8 +82,7 @@ public function processOpen(File $phpcsFile, int $stackPtr) } }//end if }//end if - - }//end processOpen() + } /** @@ -217,8 +215,5 @@ public function processClose(File $phpcsFile, int $stackPtr) } } }//end if - - }//end processClose() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php index e72873cede..8522b13fc9 100644 --- a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php +++ b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php @@ -28,8 +28,7 @@ public function register() unset($targets[T_ANON_CLASS]); return $targets; - - }//end register() + } /** @@ -68,8 +67,5 @@ public function process(File $phpcsFile, int $stackPtr) ]; $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php index 63ad4b93f2..708ba4c57a 100644 --- a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php +++ b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php @@ -34,8 +34,7 @@ public function register() $targets[] = T_CONST; return $targets; - - }//end register() + } /** @@ -66,8 +65,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($stackPtr, $contentLc); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php index 817b576048..a3c50f3035 100644 --- a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php +++ b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php @@ -28,8 +28,7 @@ class SelfMemberReferenceSniff extends AbstractScopeSniff public function __construct() { parent::__construct([T_CLASS], [T_DOUBLE_COLON]); - - }//end __construct() + } /** @@ -151,8 +150,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ $phpcsFile->fixer->endChangeset(); } } - - }//end processTokenWithinScope() + } /** @@ -167,8 +165,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() + } /** @@ -197,8 +194,5 @@ protected function getNamespaceName(File $phpcsFile, int $stackPtr) } return $namespace; - - }//end getNamespaceName() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php index d626d27139..532f82c06e 100644 --- a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php +++ b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php @@ -31,8 +31,7 @@ public function register() T_TRAIT, T_ENUM, ]; - - }//end register() + } /** @@ -79,8 +78,5 @@ public function process(File $phpcsFile, int $stackPtr) } else { $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'yes'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php index 14c131891b..45a7e6e00a 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php @@ -35,8 +35,7 @@ public function register() T_COMMENT, T_DOC_COMMENT_OPEN_TAG, ]; - - }//end register() + } /** @@ -392,8 +391,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Empty line required after block comment'; $phpcsFile->addError($error, $commentCloser, 'NoEmptyLineAfter'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php index 48fba2de90..f071a84d98 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php @@ -32,8 +32,7 @@ class ClassCommentSniff implements Sniff public function register() { return [T_CLASS]; - - }//end register() + } /** @@ -102,8 +101,5 @@ public function process(File $phpcsFile, int $stackPtr) $data = [$tokens[$tag]['content']]; $phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php index 3845c035f9..c27bc32125 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php @@ -30,8 +30,7 @@ public function register() T_INTERFACE, T_TRAIT, ]; - - }//end register() + } /** @@ -125,8 +124,5 @@ public function process(File $phpcsFile, int $stackPtr) return; } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php index e3ee875344..f3514a5b91 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php @@ -25,8 +25,7 @@ class DocCommentAlignmentSniff implements Sniff public function register() { return [T_DOC_COMMENT_OPEN_TAG]; - - }//end register() + } /** @@ -140,8 +139,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end for - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php index 434f759661..8f89be4a78 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php @@ -24,8 +24,7 @@ class EmptyCatchCommentSniff implements Sniff public function register() { return [T_CATCH]; - - }//end register() + } /** @@ -48,8 +47,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Empty CATCH statement must have a comment to explain why the exception is not handled'; $phpcsFile->addError($error, $scopeStart, 'Missing'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php index bc678866b2..22718c1987 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php @@ -36,8 +36,7 @@ class FileCommentSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -214,8 +213,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php index c00e60ebae..ae74f13ec1 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php @@ -188,8 +188,7 @@ protected function processReturn(File $phpcsFile, int $stackPtr, int $commentSta $error = 'Missing @return tag in function comment'; $phpcsFile->addError($error, $tokens[$commentStart]['comment_closer'], 'MissingReturn'); }//end if - - }//end processReturn() + } /** @@ -264,8 +263,7 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta } }//end if }//end foreach - - }//end processThrows() + } /** @@ -639,8 +637,7 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta $data = [$neededParam]; $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data); } - - }//end processParams() + } /** @@ -698,8 +695,7 @@ protected function checkSpacingAfterParamType(File $phpcsFile, array $param, int $phpcsFile->fixer->endChangeset(); }//end if }//end if - - }//end checkSpacingAfterParamType() + } /** @@ -757,8 +753,7 @@ protected function checkSpacingAfterParamName(File $phpcsFile, array $param, int $phpcsFile->fixer->endChangeset(); }//end if }//end if - - }//end checkSpacingAfterParamName() + } /** @@ -793,8 +788,5 @@ protected function checkInheritdoc(File $phpcsFile, int $stackPtr, int $commentS } return false; - - }//end checkInheritdoc() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php index d934631b23..a873b79c3e 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php @@ -25,8 +25,7 @@ class FunctionCommentThrowTagSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -226,8 +225,5 @@ public function process(File $phpcsFile, int $stackPtr) $data = [$throw]; $phpcsFile->addError($error, $commentEnd, 'Missing', $data); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php index 2438646ce5..575f1cb20d 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php @@ -39,8 +39,7 @@ public function register() T_COMMENT, T_DOC_COMMENT_OPEN_TAG, ]; - - }//end register() + } /** @@ -309,8 +308,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if return ($lastCommentToken + 1); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php index 58ff8cca86..fffd476700 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php @@ -57,8 +57,7 @@ class LongConditionClosingCommentSniff implements Sniff public function register() { return [T_CLOSE_CURLY_BRACKET]; - - }//end register() + } /** @@ -201,8 +200,5 @@ public function process(File $phpcsFile, int $stackPtr) return; } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php index 99adb01ad0..e7c81256ac 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php @@ -42,8 +42,7 @@ class PostStatementCommentSniff implements Sniff public function register() { return [T_COMMENT]; - - }//end register() + } /** @@ -110,8 +109,5 @@ public function process(File $phpcsFile, int $stackPtr) if ($fix === true) { $phpcsFile->fixer->addNewlineBefore($stackPtr); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php index 047e9d582e..621c854007 100644 --- a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php +++ b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php @@ -25,8 +25,7 @@ class VariableCommentSniff extends AbstractVariableSniff public function __construct() { AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false); - - }//end __construct() + } /** @@ -174,8 +173,7 @@ public function processMemberVar(File $phpcsFile, int $stackPtr) unset($replacement); } } - - }//end processMemberVar() + } /** @@ -191,8 +189,7 @@ public function processMemberVar(File $phpcsFile, int $stackPtr) */ protected function processVariable(File $phpcsFile, int $stackPtr) { - - }//end processVariable() + } /** @@ -208,8 +205,5 @@ protected function processVariable(File $phpcsFile, int $stackPtr) */ protected function processVariableInString(File $phpcsFile, int $stackPtr) { - - }//end processVariableInString() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php index bfa1d1952a..c1e20ed711 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php @@ -45,8 +45,7 @@ public function register() T_SWITCH, T_MATCH, ]; - - }//end register() + } /** @@ -320,8 +319,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php index 0675d7ea89..6532742d43 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php @@ -24,8 +24,7 @@ class ElseIfDeclarationSniff implements Sniff public function register() { return [T_ELSEIF]; - - }//end register() + } /** @@ -44,8 +43,5 @@ public function process(File $phpcsFile, int $stackPtr) if ($fix === true) { $phpcsFile->fixer->replaceToken($stackPtr, 'else if'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php index 07fbba7ef9..f2f7aac293 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php @@ -38,8 +38,7 @@ class ForEachLoopDeclarationSniff implements Sniff public function register() { return [T_FOREACH]; - - }//end register() + } /** @@ -226,8 +225,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php index e287d6bd3c..68ef309a3c 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php @@ -46,8 +46,7 @@ class ForLoopDeclarationSniff implements Sniff public function register() { return [T_FOR]; - - }//end register() + } /** @@ -298,8 +297,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if }//end if } while ($semicolonCount < 2); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php index dea4c45591..670b64574a 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php @@ -24,8 +24,7 @@ class InlineIfDeclarationSniff implements Sniff public function register() { return [T_INLINE_THEN]; - - }//end register() + } /** @@ -148,8 +147,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php index 1e3d4465c4..e4936db7a2 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php @@ -36,8 +36,7 @@ public function register() T_CATCH, T_MATCH, ]; - - }//end register() + } /** @@ -68,8 +67,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($stackPtr, $contentLc); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php index eeac81c14f..4e5bce884f 100644 --- a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php @@ -32,8 +32,7 @@ class SwitchDeclarationSniff implements Sniff public function register() { return [T_SWITCH]; - - }//end register() + } /** @@ -287,8 +286,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'SWITCH statements must contain at least one CASE statement'; $phpcsFile->addError($error, $stackPtr, 'MissingCase'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php index 15e12538ba..56e106a443 100644 --- a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php +++ b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php @@ -24,8 +24,7 @@ class FileExtensionSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -61,8 +60,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php index ece0d5b823..a439fc5559 100644 --- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php +++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php @@ -25,8 +25,7 @@ class OperatorBracketSniff implements Sniff public function register() { return Tokens::OPERATORS; - - }//end register() + } /** @@ -240,8 +239,7 @@ public function process(File $phpcsFile, int $stackPtr) if ($lastAssignment !== false && $lastAssignment > $lastBracket) { $this->addMissingBracketsError($phpcsFile, $stackPtr); } - - }//end process() + } /** @@ -363,8 +361,5 @@ public function addMissingBracketsError(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($after, $tokens[$after]['content'] . ')'); $phpcsFile->fixer->endChangeset(); } - - }//end addMissingBracketsError() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php index ba1fa6875b..bb645efa77 100644 --- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php @@ -51,8 +51,7 @@ public function register() T_CLOSURE, T_FN, ]; - - }//end register() + } /** @@ -88,8 +87,7 @@ public function process(File $phpcsFile, int $stackPtr) $this->processBracket($phpcsFile, $tokens[$use]['parenthesis_opener']); } } - - }//end process() + } /** @@ -561,8 +559,5 @@ public function processBracket(File $phpcsFile, int $openBracket) } } } - - }//end processBracket() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php index fdb391c285..d7bdba5cac 100644 --- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php @@ -27,8 +27,5 @@ protected function getPatterns() 'function abc(...)', 'abstract function abc(...);', ]; - - }//end getPatterns() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php index 31983996ac..d43e7db12d 100644 --- a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php @@ -24,8 +24,7 @@ class FunctionDuplicateArgumentSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -57,8 +56,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php index 075cfd9cca..f13bc8e421 100644 --- a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php @@ -24,8 +24,7 @@ class GlobalFunctionSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -54,8 +53,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addWarning($error, $stackPtr, 'Found', $data); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php index c3e07a15c7..e066355f32 100644 --- a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php @@ -30,8 +30,7 @@ public function register() $tokens[] = T_FN; return $tokens; - - }//end register() + } /** @@ -62,8 +61,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($stackPtr, $contentLc); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php index 281ae3c206..b3fd17d094 100644 --- a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php +++ b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php @@ -77,8 +77,7 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open }//end foreach return false; - - }//end isMultiLineDeclaration() + } /** @@ -125,8 +124,7 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr } } }//end if - - }//end processSingleLineDeclaration() + } /** @@ -158,8 +156,7 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra } $this->processBracket($phpcsFile, $tokens[$use]['parenthesis_opener'], $tokens, 'use'); - - }//end processMultiLineDeclaration() + } /** @@ -242,8 +239,5 @@ public function processBracket(File $phpcsFile, int $openBracket, array $tokens, } } }//end for - - }//end processBracket() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php index 1661f81d69..dc7d8137f0 100644 --- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php +++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php @@ -47,8 +47,5 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) $error = 'Function name "%s" is not in camel caps format'; $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData); } - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php index d20890092e..0e946e9110 100644 --- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -100,8 +100,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr) $data = [$originalVarName]; $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data); } - - }//end processVariable() + } /** @@ -150,8 +149,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) $error = 'Member variable "%s" is not in valid camel caps format'; $phpcsFile->addError($error, $stackPtr, 'MemberNotCamelCaps', $errorData); } - - }//end processMemberVar() + } /** @@ -181,8 +179,5 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr) } } } - - }//end processVariableInString() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php index 4593eafd63..e2d79689ab 100644 --- a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php +++ b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php @@ -25,8 +25,7 @@ class ObjectInstantiationSniff implements Sniff public function register() { return [T_NEW]; - - }//end register() + } /** @@ -78,8 +77,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'New objects must be assigned to a variable'; $phpcsFile->addError($error, $stackPtr, 'NotAssigned'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php index 21d2c41a77..e7484cf006 100644 --- a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php +++ b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php @@ -57,8 +57,7 @@ public function register() T_WHILE, T_FOR, ]; - - }//end register() + } /** @@ -207,8 +206,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Implicit true comparisons prohibited; use === TRUE instead'; $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue'); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php index 39ef2cea26..dc5ea8bb67 100644 --- a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php +++ b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php @@ -31,8 +31,7 @@ public function register() T_INC, T_DEC, ]; - - }//end register() + } /** @@ -53,8 +52,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->processAssignment($phpcsFile, $stackPtr); } - - }//end process() + } /** @@ -103,8 +101,7 @@ protected function processIncDec(File $phpcsFile, int $stackPtr) $error = 'Increment and decrement operators must be bracketed when used in string concatenation'; $phpcsFile->addError($error, $stackPtr, 'NoBrackets'); } - - }//end processIncDec() + } /** @@ -224,8 +221,5 @@ protected function processAssignment(File $phpcsFile, int $stackPtr) $error .= " operators should be used where possible; found \"$found\" but expected \"$expected\""; $phpcsFile->addError($error, $stackPtr, 'Found'); }//end if - - }//end processAssignment() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php index 42e9285faa..48dc76cecb 100644 --- a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php +++ b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php @@ -27,8 +27,7 @@ public function register() T_LOGICAL_AND, T_LOGICAL_OR, ]; - - }//end register() + } /** @@ -60,8 +59,5 @@ public function process(File $phpcsFile, int $stackPtr) $replacements[$operator], ]; $phpcsFile->addError($error, $stackPtr, 'NotAllowed', $data); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php index fff6bd837c..63f15f60bb 100644 --- a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php @@ -35,8 +35,7 @@ class CommentedOutCodeSniff implements Sniff public function register() { return [T_COMMENT]; - - }//end register() + } /** @@ -272,8 +271,5 @@ public function process(File $phpcsFile, int $stackPtr) } return ($lastCommentBlockToken + 1); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php index 72fb7ef49a..2cd9770ef6 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php @@ -25,8 +25,7 @@ class DisallowBooleanStatementSniff implements Sniff public function register() { return Tokens::BOOLEAN_OPERATORS; - - }//end register() + } /** @@ -52,8 +51,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Boolean operators are not allowed outside of control structure conditions'; $phpcsFile->addError($error, $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php index 6a6c964875..108b3eb702 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php @@ -25,8 +25,7 @@ class DisallowComparisonAssignmentSniff implements Sniff public function register() { return [T_EQUAL]; - - }//end register() + } /** @@ -103,8 +102,5 @@ public function process(File $phpcsFile, int $stackPtr) break; } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php index 4acad46dda..5de62b7716 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php @@ -24,8 +24,7 @@ class DisallowInlineIfSniff implements Sniff public function register() { return [T_INLINE_THEN]; - - }//end register() + } /** @@ -40,8 +39,5 @@ public function register() public function process(File $phpcsFile, int $stackPtr) { $phpcsFile->addError('Inline IF statements are not allowed', $stackPtr, 'Found'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php index fdeea37e83..1f64d3d279 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php @@ -25,8 +25,7 @@ class DisallowMultipleAssignmentsSniff implements Sniff public function register() { return [T_EQUAL]; - - }//end register() + } /** @@ -188,8 +187,5 @@ public function process(File $phpcsFile, int $stackPtr) } $phpcsFile->addError($error, $stackPtr, $errorCode); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php index 464989bb9d..d00442c310 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php @@ -47,8 +47,7 @@ public function register() T_WHILE, T_FOR, ]; - - }//end register() + } /** @@ -95,8 +94,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->addError($error, $i, 'Found', $data); }//end if }//end for - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php index 56fce551d2..e2136b9f5e 100644 --- a/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php @@ -35,4 +35,4 @@ class DiscouragedFunctionsSniff extends GenericForbiddenFunctionsSniff */ public $error = false; -}//end class +} diff --git a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php index ce220a09cc..e6ee2e893c 100644 --- a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php @@ -28,8 +28,7 @@ public function register() T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, ]; - - }//end register() + } /** @@ -53,8 +52,7 @@ public function process(File $phpcsFile, int $stackPtr) } else { $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag); } - - }//end process() + } /** @@ -320,8 +318,7 @@ private function validateMultilineEmbeddedPhp(File $phpcsFile, int $stackPtr, $c $phpcsFile->fixer->endChangeset(); } }//end if - - }//end validateMultilineEmbeddedPhp() + } /** @@ -427,8 +424,7 @@ private function validateInlineEmbeddedPhp(File $phpcsFile, int $stackPtr, int $ } } } - - }//end validateInlineEmbeddedPhp() + } /** @@ -466,8 +462,7 @@ private function reportEmptyTagSet(File $phpcsFile, int $stackPtr, int $closeTag $phpcsFile->fixer->endChangeset(); } - - }//end reportEmptyTagSet() + } /** @@ -506,8 +501,5 @@ private function calculateLineIndent(File $phpcsFile, int $stackPtr) } return $indent; - - }//end calculateLineIndent() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php index 75ce26a17c..0246caf9f2 100644 --- a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php @@ -24,8 +24,7 @@ class EvalSniff implements Sniff public function register() { return [T_EVAL]; - - }//end register() + } /** @@ -41,8 +40,5 @@ public function process(File $phpcsFile, int $stackPtr) { $error = 'Use of eval() is discouraged'; $phpcsFile->addWarning($error, $stackPtr, 'Discouraged'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php index c092669df4..c7df8c46f4 100644 --- a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php @@ -24,8 +24,7 @@ class GlobalKeywordSniff implements Sniff public function register() { return [T_GLOBAL]; - - }//end register() + } /** @@ -46,8 +45,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Use of the "global" keyword is forbidden; use "$GLOBALS[\'%s\']" instead'; $data = [$varName]; $phpcsFile->addError($error, $stackPtr, 'NotAllowed', $data); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php index 1da143a347..7f5bde3ada 100644 --- a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php @@ -27,8 +27,7 @@ public function register() T_START_HEREDOC, T_START_NOWDOC, ]; - - }//end register() + } /** @@ -55,8 +54,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'Use of %s syntax (%s) is not allowed; use standard strings or inline HTML instead'; $phpcsFile->addError($error, $stackPtr, $codePrefix . 'NotAllowed', $data); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php index 5f25a7d981..0a4fdfba10 100644 --- a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php @@ -25,8 +25,7 @@ class InnerFunctionsSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -69,8 +68,5 @@ public function process(File $phpcsFile, int $stackPtr) $error = 'The use of inner functions is forbidden'; $phpcsFile->addError($error, $stackPtr, 'NotAllowed'); - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php index 5b8c4eafc6..cbd2f49bd1 100644 --- a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php @@ -32,8 +32,7 @@ public function __construct() $allFunctions = get_defined_functions(); $this->builtInFunctions = array_flip($allFunctions['internal']); - - }//end __construct() + } /** @@ -47,8 +46,7 @@ public function register() T_STRING, T_NAME_FULLY_QUALIFIED, ]; - - }//end register() + } /** @@ -154,8 +152,5 @@ public function process(File $phpcsFile, int $stackPtr) if ($fix === true) { $phpcsFile->fixer->replaceToken($stackPtr, strtolower($tokens[$stackPtr]['content'])); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php index 238ea560c0..3449afc0c8 100644 --- a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php +++ b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php @@ -48,8 +48,7 @@ public function register() T_EXIT, T_GOTO, ]; - - }//end register() + } /** @@ -296,8 +295,5 @@ public function process(File $phpcsFile, int $stackPtr) $lastLine = $line; } }//end for - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php index cf8adecc2e..1be8a25f9e 100644 --- a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php +++ b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php @@ -25,8 +25,7 @@ class MemberVarScopeSniff extends AbstractVariableSniff public function __construct() { AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false); - - }//end __construct() + } /** @@ -60,8 +59,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) $data = [$tokens[$stackPtr]['content']]; $phpcsFile->addError($error, $stackPtr, 'AsymReadMissing', $data); } - - }//end processMemberVar() + } /** @@ -74,11 +72,8 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) */ protected function processVariable(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariable() + // We don't care about normal variables. + } /** @@ -91,11 +86,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr) */ protected function processVariableInString(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariableInString() - - -}//end class + // We don't care about normal variables. + } +} diff --git a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php index 3527cfeab4..6580e3a685 100644 --- a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php +++ b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php @@ -23,8 +23,7 @@ class MethodScopeSniff extends AbstractScopeSniff public function __construct() { parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]); - - }//end __construct() + } /** @@ -60,8 +59,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ $data = [$methodName]; $phpcsFile->addError($error, $stackPtr, 'Missing', $data); } - - }//end processTokenWithinScope() + } /** @@ -76,8 +74,5 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $ */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php index ad755903bd..ebf43bf013 100644 --- a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php +++ b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php @@ -23,8 +23,7 @@ class StaticThisUsageSniff extends AbstractScopeSniff public function __construct() { parent::__construct([T_CLASS, T_TRAIT, T_ENUM, T_ANON_CLASS], [T_FUNCTION]); - - }//end __construct() + } /** @@ -69,8 +68,7 @@ public function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $cur $end = $tokens[$stackPtr]['scope_closer']; $this->checkThisUsage($phpcsFile, $next, $end); - - }//end processTokenWithinScope() + } /** @@ -105,8 +103,7 @@ private function checkThisUsage(File $phpcsFile, int $next, int $end) $error = 'Usage of "$this" in static methods will cause runtime errors'; $phpcsFile->addError($error, $next, 'Found'); } while ($next !== false); - - }//end checkThisUsage() + } /** @@ -121,8 +118,5 @@ private function checkThisUsage(File $phpcsFile, int $next, int $end) */ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr) { - - }//end processTokenOutsideScope() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php index e4b65eb920..9bead470f4 100644 --- a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php @@ -39,8 +39,7 @@ class ConcatenationSpacingSniff implements Sniff public function register() { return [T_STRING_CONCAT]; - - }//end register() + } /** @@ -157,8 +156,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php index 5b2804af53..0522a4f1bf 100644 --- a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php +++ b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php @@ -53,8 +53,7 @@ public function register() T_CONSTANT_ENCAPSED_STRING, T_DOUBLE_QUOTED_STRING, ]; - - }//end register() + } /** @@ -142,8 +141,5 @@ public function process(File $phpcsFile, int $stackPtr) } return $skipTo; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php index 4093ec84dc..93a913b0c2 100644 --- a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php +++ b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php @@ -25,8 +25,7 @@ class EchoedStringsSniff implements Sniff public function register() { return [T_ECHO]; - - }//end register() + } /** @@ -81,8 +80,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php index b8d7706ae2..b2ca63ff12 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php @@ -25,8 +25,7 @@ class CastSpacingSniff implements Sniff public function register() { return Tokens::CAST_TOKENS; - - }//end register() + } /** @@ -58,8 +57,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->replaceToken($stackPtr, $expected); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php index c7e7fdec12..caac5450f3 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php @@ -38,8 +38,7 @@ public function register() T_FINALLY, T_MATCH, ]; - - }//end register() + } /** @@ -342,8 +341,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php index 6f851c988c..6a3ed01111 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php @@ -27,8 +27,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -127,8 +126,5 @@ public function process(File $phpcsFile, int $stackPtr) } }//end if }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php index cd7a1a9e53..62bbde68df 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php @@ -27,8 +27,7 @@ public function register() T_FUNCTION, T_CLOSURE, ]; - - }//end register() + } /** @@ -81,8 +80,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php index 4b2c34b61b..93a9ce4f85 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php @@ -53,8 +53,7 @@ class FunctionSpacingSniff implements Sniff public function register() { return [T_FUNCTION]; - - }//end register() + } /** @@ -369,8 +368,5 @@ public function process(File $phpcsFile, int $stackPtr) }//end if }//end if }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php index d193456e02..4118e68885 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php @@ -25,8 +25,7 @@ class LogicalOperatorSpacingSniff implements Sniff public function register() { return Tokens::BOOLEAN_OPERATORS; - - }//end register() + } /** @@ -85,8 +84,5 @@ public function process(File $phpcsFile, int $stackPtr) } } } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php index 3fbb8a5911..f52e46680d 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php @@ -38,8 +38,7 @@ class MemberVarSpacingSniff extends AbstractVariableSniff public function __construct() { AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false); - - }//end __construct() + } /** @@ -228,8 +227,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) if ($endOfStatement !== false) { return $endOfStatement; } - - }//end processMemberVar() + } /** @@ -242,11 +240,8 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) */ protected function processVariable(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariable() + // We don't care about normal variables. + } /** @@ -259,11 +254,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr) */ protected function processVariableInString(File $phpcsFile, int $stackPtr) { - /* - We don't care about normal variables. - */ - - }//end processVariableInString() - - -}//end class + // We don't care about normal variables. + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php index ce80cae8ce..a1395965f6 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php @@ -35,8 +35,7 @@ public function register() T_DOUBLE_COLON, T_NULLSAFE_OBJECT_OPERATOR, ]; - - }//end register() + } /** @@ -82,8 +81,7 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->recordMetric($stackPtr, 'Spacing after object operator', $after); $this->checkSpacingAfterOperator($phpcsFile, $stackPtr, $after); - - }//end process() + } /** @@ -121,8 +119,7 @@ protected function checkSpacingBeforeOperator(File $phpcsFile, int $stackPtr, $b } return true; - - }//end checkSpacingBeforeOperator() + } /** @@ -160,8 +157,5 @@ protected function checkSpacingAfterOperator(File $phpcsFile, int $stackPtr, $af } return true; - - }//end checkSpacingAfterOperator() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php index 374cc36f1d..7369d99437 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php @@ -108,8 +108,7 @@ public function register() $targets[] = T_DECLARE; return $targets; - - }//end register() + } /** @@ -326,8 +325,7 @@ public function process(File $phpcsFile, int $stackPtr) } }//end if }//end if - - }//end process() + } /** @@ -392,8 +390,5 @@ protected function isOperator(File $phpcsFile, int $stackPtr) }//end if return true; - - }//end isOperator() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php index 20949d807d..6de5671a3f 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php @@ -25,8 +25,7 @@ class ScopeClosingBraceSniff implements Sniff public function register() { return Tokens::SCOPE_OPENERS; - - }//end register() + } /** @@ -107,8 +106,5 @@ public function process(File $phpcsFile, int $stackPtr) } } }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php index f1425771b9..d17795cf33 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php @@ -28,8 +28,7 @@ public function register() $register += Tokens::SCOPE_MODIFIERS; $register[T_READONLY] = T_READONLY; return $register; - - }//end register() + } /** @@ -165,8 +164,5 @@ public function process(File $phpcsFile, int $stackPtr) } }//end if }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php index 724524a1e9..741448c162 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php @@ -25,8 +25,7 @@ class SemicolonSpacingSniff implements Sniff public function register() { return [T_SEMICOLON]; - - }//end register() + } /** @@ -99,8 +98,5 @@ public function process(File $phpcsFile, int $stackPtr) $phpcsFile->fixer->endChangeset(); } - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php index 89dadac873..992fb567db 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php @@ -45,8 +45,7 @@ public function register() T_DOC_COMMENT_WHITESPACE, T_CLOSURE, ]; - - }//end register() + } /** @@ -207,8 +206,5 @@ public function process(File $phpcsFile, int $stackPtr) } }//end if }//end if - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php index 8d562ec418..ff4ce89a4c 100644 --- a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php @@ -40,8 +40,7 @@ public function getErrorList() 30 => 1, 31 => 2, ]; - - }//end getErrorList() + } /** @@ -55,8 +54,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php index bcbcd1a5c7..520d133a7f 100644 --- a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php @@ -240,8 +240,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -255,8 +254,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php index 5f503b627c..2f788ca2c2 100644 --- a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php @@ -71,8 +71,7 @@ public function getErrorList() 132 => 1, 141 => 1, ]; - - }//end getErrorList() + } /** @@ -86,8 +85,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php index 7d15f9b512..7c63e9b200 100644 --- a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php +++ b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php @@ -57,8 +57,7 @@ protected function getTestFiles(string $testFileBase) sort($testFiles, SORT_NATURAL); return $testFiles; - - }//end getTestFiles() + } /** @@ -124,8 +123,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -139,8 +137,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php index f7e16db41d..a4e3a3132c 100644 --- a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php +++ b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php @@ -47,8 +47,7 @@ public function getErrorList() ]; return $errors; - - }//end getErrorList() + } /** @@ -62,8 +61,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php index 69140bc4f9..a3e57bf17d 100644 --- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php +++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php @@ -48,8 +48,7 @@ public function getErrorList() 183 => 1, 197 => 1, ]; - - }//end getErrorList() + } /** @@ -63,8 +62,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php index dec6113dc2..c30147ce11 100644 --- a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php +++ b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php @@ -61,8 +61,7 @@ public function getErrorList() 197 => 1, 200 => 1, ]; - - }//end getErrorList() + } /** @@ -76,8 +75,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php index 726086ec9b..ff20688484 100644 --- a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php @@ -32,8 +32,7 @@ final class BlockCommentUnitTest extends AbstractSniffTestCase public function setCliValues(string $testFile, Config $config) { $config->tabWidth = 4; - - }//end setCliValues() + } /** @@ -88,8 +87,7 @@ public function getErrorList() ]; return $errors; - - }//end getErrorList() + } /** @@ -103,8 +101,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php index 11dbeb82d4..4cfbfd8bd5 100644 --- a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -80,8 +79,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php index 30c30a5456..677be56eae 100644 --- a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php @@ -62,8 +62,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -79,8 +78,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php index d5fa00c07d..15143e01a0 100644 --- a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php @@ -68,8 +68,7 @@ public function getErrorList() 143 => 1, 144 => 1, ]; - - }//end getErrorList() + } /** @@ -83,8 +82,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php index 9255b5d5f3..00e5a7fae5 100644 --- a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 51 => 1, 52 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php index 937a504812..fdce790126 100644 --- a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php @@ -59,8 +59,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -74,8 +73,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php index aa1d4d29a8..e97d9beb73 100644 --- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList() 519 => 1, 530 => 1, ]; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php index 53c53a715f..f0810924a5 100644 --- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php @@ -183,8 +183,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -198,8 +197,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php index f8a56b29da..5e4e385b48 100644 --- a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php @@ -50,8 +50,7 @@ public function getErrorList() 149 => 1, 189 => 1, ]; - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php index 71a5c577be..ca35c36ca5 100644 --- a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php @@ -61,8 +61,7 @@ public function getErrorList() 1008 => 1, 1032 => 1, ]; - - }//end getErrorList() + } /** @@ -76,8 +75,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php index 4cf17c2825..473f6c274c 100644 --- a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php @@ -43,8 +43,7 @@ public function getErrorList() 63 => 1, 64 => 1, ]; - - }//end getErrorList() + } /** @@ -58,8 +57,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php index bda0cda65e..8279a64075 100644 --- a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php +++ b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php @@ -67,8 +67,7 @@ public function getErrorList() 403 => 1, 457 => 1, ]; - - }//end getErrorList() + } /** @@ -87,8 +86,5 @@ public function getWarningList() 495 => 1, 496 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php index 86e8d86f59..6c44c2446c 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php @@ -89,8 +89,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -104,8 +103,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php index a1f490c7bf..ee82ba2f14 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 8 => 1, 13 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php index ac2d48ac72..bcbaefc237 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php @@ -39,8 +39,7 @@ public function getErrorList() 26 => 2, 28 => 2, ]; - - }//end getErrorList() + } /** @@ -54,8 +53,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php index f9c663555e..0c00bc83c9 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php @@ -70,8 +70,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -87,8 +86,5 @@ public function getErrorList($testFile = '') public function getWarningList($testFile = '') { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php index 01c5b49e4c..82d8fd2d88 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php @@ -30,8 +30,7 @@ final class InlineIfDeclarationUnitTest extends AbstractSniffTestCase public function getCliValues($testFile) { return ['--encoding=utf-8']; - - }//end getCliValues() + } /** @@ -58,8 +57,7 @@ public function getErrorList() 44 => 1, 47 => 1, ]; - - }//end getErrorList() + } /** @@ -73,8 +71,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php index 34897d3de7..b00e0a41c4 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList() 21 => 1, 24 => 1, ]; - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php index 4effd4d56f..34870eadd7 100644 --- a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php @@ -79,8 +79,7 @@ public function getErrorList() 339 => 2, 342 => 1, ]; - - }//end getErrorList() + } /** @@ -94,8 +93,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php index 02f6aecb42..29a2363a95 100644 --- a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php +++ b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php index 6c6d139a11..7455663593 100644 --- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php +++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php @@ -82,8 +82,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -97,8 +96,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php index 29f6ad2d61..5dbee0eb3b 100644 --- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php @@ -106,8 +106,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -121,8 +120,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php index 30d3105cd6..28fc70a889 100644 --- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php index ec83d43546..85eee0e1dd 100644 --- a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 4 => 2, 5 => 1, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php index f5a664592b..1e7d15f504 100644 --- a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php @@ -31,8 +31,7 @@ final class GlobalFunctionUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -54,8 +53,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php index 293e1f6a1e..fa43bbd51d 100644 --- a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php @@ -41,8 +41,7 @@ public function getErrorList() 25 => 4, 28 => 1, ]; - - }//end getErrorList() + } /** @@ -56,8 +55,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php index a5c688c0e8..f815cc861c 100644 --- a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php +++ b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php @@ -75,8 +75,7 @@ public function getErrorList() 318 => 1, 323 => 1, ]; - - }//end getErrorList() + } /** @@ -90,8 +89,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php index 377454dd7a..0146ba433f 100644 --- a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php +++ b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php @@ -50,8 +50,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -65,8 +64,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php index 42ead313f6..9738a5cc0d 100644 --- a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php +++ b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php @@ -81,8 +81,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -96,8 +95,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php index 398464d56e..1450a3a17a 100644 --- a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php +++ b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 31 => 1, 39 => 2, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php index 607d3d852a..2da1c17fcc 100644 --- a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php +++ b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php @@ -65,8 +65,7 @@ public function getErrorList() 148 => 1, 156 => 2, ]; - - }//end getErrorList() + } /** @@ -80,8 +79,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php index 2a63abbc4d..af9f073009 100644 --- a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php +++ b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList() 55 => 1, 56 => 1, ]; - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php index 9630d98c37..24bd44282e 100644 --- a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php +++ b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 11 => 1, 17 => 2, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php index 604cf5f900..9ba224a3ff 100644 --- a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php @@ -31,8 +31,7 @@ final class CommentedOutCodeUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ public function getWarningList() 147 => 1, 158 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php index eb82b519ee..915a17c991 100644 --- a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 13 => 1, 15 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php index 895479e985..985aae828c 100644 --- a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList() 58 => 1, 62 => 1, ]; - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php index 7bc1ba30cd..576fe21c87 100644 --- a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 8 => 1, 18 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php index 788766651e..f43f035a9d 100644 --- a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php @@ -49,8 +49,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -64,8 +63,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php index a9241f35bc..6efbaedc0c 100644 --- a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php @@ -47,8 +47,7 @@ public function getErrorList() 61 => 1, 63 => 1, ]; - - }//end getErrorList() + } /** @@ -62,8 +61,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php index 297fd6c443..e53637de76 100644 --- a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php @@ -31,8 +31,7 @@ final class DiscouragedFunctionsUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getWarningList() 3 => 1, 4 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php index 96d098b2d8..7cf4bbf765 100644 --- a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php @@ -219,8 +219,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -243,8 +242,5 @@ public function getWarningList($testFile = '') } return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php index e350ac9c23..18d3392c70 100644 --- a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php @@ -31,8 +31,7 @@ final class EvalUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getWarningList() 2 => 1, 4 => 1, ]; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php index bcc14291a5..5e2b632c94 100644 --- a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php @@ -34,8 +34,7 @@ public function getErrorList() 8 => 1, 9 => 1, ]; - - }//end getErrorList() + } /** @@ -49,8 +48,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php index d58922be81..0a345f76cf 100644 --- a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php index b4ff803d02..0f2d0f934b 100644 --- a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php @@ -36,8 +36,7 @@ public function getErrorList() 55 => 1, 83 => 1, ]; - - }//end getErrorList() + } /** @@ -51,8 +50,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php index 8708c294f8..b451e7bce2 100644 --- a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 35 => 1, 36 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php index ba173b4817..6a7aa8dcbe 100644 --- a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php +++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php @@ -31,8 +31,7 @@ final class NonExecutableCodeUnitTest extends AbstractSniffTestCase public function getErrorList() { return []; - - }//end getErrorList() + } /** @@ -119,8 +118,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php index 79b7e1b077..f77b956164 100644 --- a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php +++ b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php @@ -54,8 +54,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -69,8 +68,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php index c56db7015b..25bdf18e3b 100644 --- a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php +++ b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php index e7375c3931..38a7039d56 100644 --- a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php +++ b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList() 99 => 1, 125 => 1, ]; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php index 68a1ffc208..11093e4ecf 100644 --- a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php @@ -49,8 +49,7 @@ public function getErrorList() 47 => 2, 49 => 1, ]; - - }//end getErrorList() + } /** @@ -64,8 +63,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php index c30cec1eda..224baa8627 100644 --- a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php +++ b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php @@ -45,8 +45,7 @@ public function getErrorList() 30 => 1, 32 => 1, ]; - - }//end getErrorList() + } /** @@ -60,8 +59,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php index d124cc5330..128029dea7 100644 --- a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php +++ b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php @@ -38,8 +38,7 @@ public function getErrorList() 9 => 1, 13 => 1, ]; - - }//end getErrorList() + } /** @@ -53,8 +52,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php index 7836cc3980..705de29a59 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php @@ -37,8 +37,7 @@ public function getErrorList() 6 => 1, 9 => 1, ]; - - }//end getErrorList() + } /** @@ -52,8 +51,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php index ffcd1a377e..e2b074c2d1 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php @@ -62,8 +62,7 @@ public function getErrorList() 261 => 1, 262 => 1, ]; - - }//end getErrorList() + } /** @@ -77,8 +76,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php index a8ba93f3fa..3ed78f3da5 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList() 81 => 1, 88 => 1, ]; - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php index 2089ce9b9b..2fa7055268 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php @@ -35,8 +35,7 @@ public function getErrorList() 25 => 1, 49 => 1, ]; - - }//end getErrorList() + } /** @@ -50,8 +49,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php index 38cc453200..a3ccc4ef1b 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php @@ -128,8 +128,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -143,8 +142,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php index 19d80c966e..8eb616a846 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php @@ -37,8 +37,7 @@ public function getErrorList() 15 => 1, 17 => 1, ]; - - }//end getErrorList() + } /** @@ -52,8 +51,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php index 64ce562c8c..2288db1ea6 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php @@ -98,8 +98,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -113,8 +112,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php index a6e91fb39a..f52f1278c5 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php @@ -51,8 +51,7 @@ public function getErrorList() 51 => 1, 52 => 2, ]; - - }//end getErrorList() + } /** @@ -66,8 +65,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php index 2114bf68ab..275d9e1339 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php @@ -115,8 +115,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -130,8 +129,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php index 7ed48f14ac..74de03c78c 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php @@ -42,8 +42,7 @@ public function getErrorList() 130 => 1, 134 => 1, ]; - - }//end getErrorList() + } /** @@ -57,8 +56,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php index b5218de5ad..2684993ab7 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php @@ -82,8 +82,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -97,8 +96,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php index bbcbc7229c..1d55bb7bd9 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php @@ -44,8 +44,7 @@ public function getErrorList() 30 => 2, 36 => 1, ]; - - }//end getErrorList() + } /** @@ -59,8 +58,5 @@ public function getErrorList() public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php index 78bcb676c5..ccff6e3348 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php @@ -72,8 +72,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -87,8 +86,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php index 3b2efebb01..5de17450bf 100644 --- a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php +++ b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php @@ -25,8 +25,7 @@ class ClosingTagSniff implements Sniff public function register() { return [T_OPEN_TAG]; - - }//end register() + } /** @@ -72,8 +71,5 @@ public function process(File $phpcsFile, int $stackPtr) // Ignore the rest of the file. return $phpcsFile->numTokens; - - }//end process() - - -}//end class + } +} diff --git a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php index 9d49504102..cdf6a4f418 100644 --- a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php +++ b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php @@ -100,8 +100,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr) $data = [$originalVarName]; $phpcsFile->addWarning($warning, $stackPtr, 'ContainsNumbers', $data); } - - }//end processVariable() + } /** @@ -156,8 +155,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr) $data = [$varName]; $phpcsFile->addWarning($warning, $stackPtr, 'MemberVarContainsNumbers', $data); } - - }//end processMemberVar() + } /** @@ -191,8 +189,5 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr) } }//end foreach }//end if - - }//end processVariableInString() - - -}//end class + } +} diff --git a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php index 4d7a32d982..60c9be4e30 100644 --- a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php +++ b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php @@ -48,8 +48,7 @@ public function getErrorList($testFile = '') default: return []; } - - }//end getErrorList() + } /** @@ -63,8 +62,5 @@ public function getErrorList($testFile = '') public function getWarningList() { return []; - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php index bc314eede3..93359bee2b 100644 --- a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php +++ b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php @@ -76,8 +76,7 @@ public function getErrorList($testFile = '') default: return []; }//end switch - - }//end getErrorList() + } /** @@ -115,8 +114,5 @@ public function getWarningList($testFile = '') default: return []; }//end switch - - }//end getWarningList() - - -}//end class + } +} diff --git a/src/Tokenizers/Comment.php b/src/Tokenizers/Comment.php index 610ba3cb75..da6018dbb6 100644 --- a/src/Tokenizers/Comment.php +++ b/src/Tokenizers/Comment.php @@ -174,8 +174,7 @@ public function tokenizeString(string $comment, string $eolChar, int $stackPtr) } return $tokens; - - }//end tokenizeString() + } /** @@ -250,8 +249,7 @@ private function processLine(string $comment, string $eolChar, int $start, int $ } return $tokens; - - }//end processLine() + } /** @@ -283,8 +281,5 @@ private function collectWhitespace(string $comment, int $start, int $end) 'code' => T_DOC_COMMENT_WHITESPACE, 'type' => 'T_DOC_COMMENT_WHITESPACE', ]; - - }//end collectWhitespace() - - -}//end class + } +} diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php index cf0ac9c996..59c1c4b167 100644 --- a/src/Tokenizers/PHP.php +++ b/src/Tokenizers/PHP.php @@ -2755,8 +2755,7 @@ function return types. We want to keep the parenthesis map clean, } return $finalTokens; - - }//end tokenize() + } /** @@ -3754,8 +3753,7 @@ protected function processAdditional() if (PHP_CODESNIFFER_VERBOSITY > 1) { StatusWriter::write('*** END ADDITIONAL PHP PROCESSING ***', 1); } - - }//end processAdditional() + } /** @@ -3832,8 +3830,7 @@ public static function standardiseToken($token) $newToken['content'] = $token[1]; return $newToken; - - }//end standardiseToken() + } /** @@ -3940,8 +3937,7 @@ public static function resolveSimpleToken(string $token) self::$resolveTokenCache[$token] = $newToken; return $newToken; - - }//end resolveSimpleToken() + } /** @@ -3977,8 +3973,7 @@ private function findCloser(array &$tokens, int $start, $openerTokens, string $c } return $closer; - - }//end findCloser() + } /** @@ -4040,8 +4035,7 @@ private function parsePhpAttribute(array &$tokens, int $stackPtr) } return $subTokens; - - }//end parsePhpAttribute() + } /** @@ -4077,8 +4071,5 @@ private function createAttributesNestingMap() } }//end if }//end for - - }//end createAttributesNestingMap() - - -}//end class + } +} diff --git a/src/Tokenizers/Tokenizer.php b/src/Tokenizers/Tokenizer.php index eb19950e14..4af7509c4b 100644 --- a/src/Tokenizers/Tokenizer.php +++ b/src/Tokenizers/Tokenizer.php @@ -128,8 +128,7 @@ public function __construct(string $content, ?Config $config, string $eolChar = // Allow the tokenizer to do additional processing if required. $this->processAdditional(); - - }//end __construct() + } /** @@ -152,8 +151,7 @@ protected function isMinifiedContent(string $content, string $eolChar = '\n') } return false; - - }//end isMinifiedContent() + } /** @@ -164,8 +162,7 @@ protected function isMinifiedContent(string $content, string $eolChar = '\n') public function getTokens() { return $this->tokens; - - }//end getTokens() + } /** @@ -482,8 +479,7 @@ private function createPositionMap() if ($checkAnnotations === false) { $this->ignoredLines = []; } - - }//end createPositionMap() + } /** @@ -572,8 +568,7 @@ public function replaceTabsInToken(array &$token, string $prefix = ' ', string $ $token['orig_content'] = $token['content']; $token['content'] = $newContent; $token['length'] = $length; - - }//end replaceTabsInToken() + } /** @@ -749,8 +744,7 @@ private function createTokenMap() if (PHP_CODESNIFFER_VERBOSITY > 1) { StatusWriter::write('*** END TOKEN MAP ***', 1); } - - }//end createTokenMap() + } /** @@ -786,8 +780,7 @@ private function createParenthesisNestingMap() } }//end if }//end for - - }//end createParenthesisNestingMap() + } /** @@ -826,8 +819,7 @@ private function createScopeMap() if (PHP_CODESNIFFER_VERBOSITY > 1) { StatusWriter::write('*** END SCOPE MAP ***', 1); } - - }//end createScopeMap() + } /** @@ -1356,8 +1348,7 @@ private function recurseScopeMap(int $stackPtr, int $depth = 1, int &$ignore = 0 }//end for return $stackPtr; - - }//end recurseScopeMap() + } /** @@ -1584,8 +1575,5 @@ private function createLevelMap() if (PHP_CODESNIFFER_VERBOSITY > 1) { StatusWriter::write('*** END LEVEL MAP ***', 1); } - - }//end createLevelMap() - - -}//end class + } +} diff --git a/src/Util/Cache.php b/src/Util/Cache.php index 88ea0a79a2..6c8a543b5c 100644 --- a/src/Util/Cache.php +++ b/src/Util/Cache.php @@ -283,8 +283,7 @@ static function ($file, $key, $iterator) { } self::$cache['config'] = $configData; - - }//end load() + } /** @@ -295,8 +294,7 @@ static function ($file, $key, $iterator) { public static function save() { file_put_contents(self::$path, json_encode(self::$cache)); - - }//end save() + } /** @@ -318,8 +316,7 @@ public static function get(?string $key = null) } return false; - - }//end get() + } /** @@ -338,8 +335,7 @@ public static function set(?string $key, $value) } else { self::$cache[$key] = $value; } - - }//end set() + } /** @@ -350,8 +346,5 @@ public static function set(?string $key, $value) public static function getSize() { return (count(self::$cache) - 1); - - }//end getSize() - - -}//end class + } +} diff --git a/src/Util/Common.php b/src/Util/Common.php index 3988f811fa..4ac808962b 100644 --- a/src/Util/Common.php +++ b/src/Util/Common.php @@ -56,8 +56,7 @@ public static function isPharFile(string $path) } return false; - - }//end isPharFile() + } /** @@ -84,8 +83,7 @@ public static function isReadable(string $path) } return false; - - }//end isReadable() + } /** @@ -137,8 +135,7 @@ public static function realpath(string $path) } return false; - - }//end realpath() + } /** @@ -167,8 +164,7 @@ public static function stripBasepath(string $path, ?string $basepath) } return $path; - - }//end stripBasepath() + } /** @@ -188,8 +184,7 @@ public static function detectLineEndings(string $contents) } return $eolChar; - - }//end detectLineEndings() + } /** @@ -247,8 +242,7 @@ public static function isStdinATTY() $isTTY = ($mode !== $type['S_IFIFO']); return $isTTY; - - }//end isStdinATTY() + } /** @@ -269,8 +263,7 @@ public static function escapeshellcmd(string $cmd) } return $cmd; - - }//end escapeshellcmd() + } /** @@ -318,8 +311,7 @@ public static function prepareForOutput(string $content, array $exclude = []) }//end if return $content; - - }//end prepareForOutput() + } /** @@ -332,8 +324,7 @@ public static function prepareForOutput(string $content, array $exclude = []) public static function stripColors(string $text) { return preg_replace('`\033\[[0-9;]+m`', '', $text); - - }//end stripColors() + } /** @@ -417,8 +408,7 @@ public static function isCamelCaps( }//end if return true; - - }//end isCamelCaps() + } /** @@ -455,8 +445,7 @@ public static function isUnderscoreName(string $name) } return $validName; - - }//end isUnderscoreName() + } /** @@ -529,8 +518,7 @@ public static function suggestType(string $varType) return $varType; }//end if }//end if - - }//end suggestType() + } /** @@ -578,8 +566,7 @@ public static function getSniffCode($sniffClass) $standard = $parts[($partsCount - 4)]; $category = $parts[($partsCount - 2)]; return $standard . '.' . $category . '.' . $sniff; - - }//end getSniffCode() + } /** @@ -609,8 +596,5 @@ public static function cleanSniffClass(string $sniffClass) $newName = substr($newName, ($start + 1)); return $newName; - - }//end cleanSniffClass() - - -}//end class + } +} diff --git a/src/Util/ExitCode.php b/src/Util/ExitCode.php index b4ede3f114..408651bcdf 100644 --- a/src/Util/ExitCode.php +++ b/src/Util/ExitCode.php @@ -138,8 +138,5 @@ public static function calculate(Reporter $reporter) } return $exitCode; - - }//end calculate() - - -}//end class + } +} diff --git a/src/Util/Help.php b/src/Util/Help.php index 897ab6395a..ecfef28b87 100644 --- a/src/Util/Help.php +++ b/src/Util/Help.php @@ -148,8 +148,7 @@ public function __construct(Config $config, array $longOptions, string $shortOpt $this->gutterWidth = strlen(self::GUTTER); $this->setMaxOptionNameLength(); - - }//end __construct() + } /** @@ -161,8 +160,7 @@ public function display() { $this->printUsage(); $this->printCategories(); - - }//end display() + } /** @@ -211,8 +209,7 @@ private function filterOptions() }//end foreach $this->activeOptions = $filteredOptions; - - }//end filterOptions() + } /** @@ -236,8 +233,7 @@ private function setMaxOptionNameLength() if (empty($lengths) === false) { $this->maxOptionNameLength = max($lengths); } - - }//end setMaxOptionNameLength() + } /** @@ -251,8 +247,7 @@ private function setMaxOptionNameLength() private function getMaxWidth() { return max(self::MIN_WIDTH, $this->config->reportWidth); - - }//end getMaxWidth() + } /** @@ -263,8 +258,7 @@ private function getMaxWidth() private function getDescriptionColumnWidth() { return ($this->getMaxWidth() - $this->maxOptionNameLength - $this->indentWidth - $this->gutterWidth); - - }//end getDescriptionColumnWidth() + } /** @@ -275,8 +269,7 @@ private function getDescriptionColumnWidth() private function getDescriptionFollowupLineIndentLength() { return ($this->maxOptionNameLength + $this->indentWidth + $this->gutterWidth); - - }//end getDescriptionFollowupLineIndentLength() + } /** @@ -294,8 +287,7 @@ private function printUsage() $this->printCategoryHeader('Usage'); echo self::INDENT . $command . ' [options] ' . PHP_EOL; - - }//end printUsage() + } /** @@ -309,8 +301,7 @@ private function printCategories() $this->printCategoryHeader($category); $this->printCategoryOptions($options); } - - }//end printCategories() + } /** @@ -328,8 +319,7 @@ private function printCategoryHeader(string $header) } echo PHP_EOL . $header . PHP_EOL; - - }//end printCategoryHeader() + } /** @@ -372,8 +362,7 @@ private function printCategoryOptions(array $options) } echo $output; - - }//end printCategoryOptions() + } /** @@ -389,8 +378,7 @@ private function printCategoryOptions(array $options) private function colorizeVariableInput(string $text) { return preg_replace('`(<(?:(?>[^<>]+)|(?R))*>)`', "\033[36m" . '$1' . "\033[32m", $text); - - }//end colorizeVariableInput() + } /** @@ -636,8 +624,5 @@ private function getAllOptions() // phpcs:enable return $options; - - }//end getAllOptions() - - -}//end class + } +} diff --git a/src/Util/IgnoreList.php b/src/Util/IgnoreList.php index f277335730..068cecb3ab 100644 --- a/src/Util/IgnoreList.php +++ b/src/Util/IgnoreList.php @@ -38,8 +38,7 @@ final class IgnoreList */ private function __construct() { - - }//end __construct() + } /** @@ -50,8 +49,7 @@ private function __construct() public static function getInstanceIgnoringNothing() { return new self(); - - }//end getInstanceIgnoringNothing() + } /** @@ -64,8 +62,7 @@ public static function getInstanceIgnoringAll() $instance = new self(); $instance->data['.default'] = true; return $instance; - - }//end getInstanceIgnoringAll() + } /** @@ -84,8 +81,7 @@ public static function getNewInstanceFrom(?IgnoreList $ignoreList) } return clone $ignoreList; - - }//end getNewInstanceFrom() + } /** @@ -115,8 +111,7 @@ public function set(string $code, bool $ignore) $data[$part] = (bool) $ignore; return $this; - - }//end set() + } /** @@ -147,8 +142,7 @@ public function isIgnored(string $code) } return $returnValue; - - }//end isIgnored() + } /** @@ -173,8 +167,7 @@ public function ignoresNothing() } return true; - - }//end ignoresNothing() + } /** @@ -199,8 +192,5 @@ public function ignoresEverything() } return true; - - }//end ignoresEverything() - - -}//end class + } +} diff --git a/src/Util/MessageCollector.php b/src/Util/MessageCollector.php index 3ece9e9ec0..dc5af475c0 100644 --- a/src/Util/MessageCollector.php +++ b/src/Util/MessageCollector.php @@ -114,8 +114,7 @@ public function add($message, $type = self::NOTICE) 'message' => $message, 'type' => $type, ]; - - }//end add() + } /** @@ -128,8 +127,7 @@ public function containsBlockingErrors() $seenTypes = array_column($this->cache, 'type'); $typeFrequency = array_count_values($seenTypes); return isset($typeFrequency[self::ERROR]); - - }//end containsBlockingErrors() + } /** @@ -169,8 +167,7 @@ public function display(string $order = self::ORDERBY_SEVERITY) } else { StatusWriter::write($allMessages, 0, 2); } - - }//end display() + } /** @@ -187,8 +184,7 @@ private function prefixAll(array $messages) } return $messages; - - }//end prefixAll() + } /** @@ -220,8 +216,7 @@ private function prefix(string $message, int $type) } return $message; - - }//end prefix() + } /** @@ -263,8 +258,7 @@ private function sortBySeverity(array $messages) } return array_merge($errors, $warnings, $notices, $deprecations); - - }//end sortBySeverity() + } /** @@ -275,8 +269,5 @@ private function sortBySeverity(array $messages) private function clearCache() { $this->cache = []; - - }//end clearCache() - - -}//end class + } +} diff --git a/src/Util/Standards.php b/src/Util/Standards.php index e22b0880aa..4be2a04f2f 100644 --- a/src/Util/Standards.php +++ b/src/Util/Standards.php @@ -46,8 +46,7 @@ public static function getInstalledStandardPaths() } return $resolvedInstalledPaths; - - }//end getInstalledStandardPaths() + } /** @@ -144,8 +143,7 @@ public static function getInstalledStandardDetails( }//end foreach return $installedStandards; - - }//end getInstalledStandardDetails() + } /** @@ -215,8 +213,7 @@ public static function getInstalledStandards( }//end foreach return $installedStandards; - - }//end getInstalledStandards() + } /** @@ -262,8 +259,7 @@ public static function isInstalledStandard(string $standard) }//end if return false; - - }//end isInstalledStandard() + } /** @@ -307,8 +303,7 @@ public static function getInstalledStandardPath(string $standard) }//end foreach return null; - - }//end getInstalledStandardPath() + } /** @@ -336,8 +331,7 @@ public static function prepareInstalledStandardsForDisplay() } return $output; - - }//end prepareInstalledStandardsForDisplay() + } /** @@ -350,8 +344,5 @@ public static function prepareInstalledStandardsForDisplay() public static function printInstalledStandards() { echo self::prepareInstalledStandardsForDisplay(), PHP_EOL; - - }//end printInstalledStandards() - - -}//end class + } +} diff --git a/src/Util/Timing.php b/src/Util/Timing.php index 177053c741..b7c4410ed8 100644 --- a/src/Util/Timing.php +++ b/src/Util/Timing.php @@ -61,8 +61,7 @@ public static function startTiming() { self::$startTime = microtime(true); - - }//end startTiming() + } /** @@ -78,8 +77,7 @@ public static function getDuration() } return ((microtime(true) - self::$startTime) * 1000); - - }//end getDuration() + } /** @@ -92,8 +90,7 @@ public static function getDuration() public static function getDurationSince(float $startTime) { return ((microtime(true) - $startTime) * 1000); - - }//end getDurationSince() + } /** @@ -120,8 +117,7 @@ public static function getHumanReadableDuration(float $duration) } return $timeString; - - }//end getHumanReadableDuration() + } /** @@ -151,8 +147,5 @@ public static function printRunTime(bool $force = false) StatusWriter::write("Time: $duration; Memory: $mem"); self::$printed = true; - - }//end printRunTime() - - -}//end class + } +} diff --git a/src/Util/Tokens.php b/src/Util/Tokens.php index 0e65797102..3589ebf39d 100644 --- a/src/Util/Tokens.php +++ b/src/Util/Tokens.php @@ -942,8 +942,7 @@ public static function tokenName($token) } return substr($token, 6); - - }//end tokenName() + } /** @@ -984,8 +983,5 @@ public static function getHighestWeightedToken(array $tokens) } return $highestType; - - }//end getHighestWeightedToken() - - -}//end class + } +} diff --git a/src/Util/Writers/StatusWriter.php b/src/Util/Writers/StatusWriter.php index 9544827e58..db7102ca9c 100644 --- a/src/Util/Writers/StatusWriter.php +++ b/src/Util/Writers/StatusWriter.php @@ -67,8 +67,7 @@ public static function write(string $message, int $indent = 0, int $newlines = 1 } self::forceWrite($message, $indent, $newlines); - - }//end write() + } /** @@ -94,8 +93,7 @@ public static function forceWrite(string $message, int $indent = 0, int $newline } fwrite(self::$stream, $message); - - }//end forceWrite() + } /** @@ -109,8 +107,7 @@ public static function forceWrite(string $message, int $indent = 0, int $newline public static function writeNewline(int $nr = 1) { self::write('', 0, $nr); - - }//end writeNewline() + } /** @@ -124,8 +121,7 @@ public static function writeNewline(int $nr = 1) public static function forceWriteNewline(int $nr = 1) { self::forceWrite('', 0, $nr); - - }//end forceWriteNewline() + } /** @@ -137,8 +133,7 @@ public static function pause() { self::$paused = true; ++self::$pauseCount; - - }//end pause() + } /** @@ -155,8 +150,7 @@ public static function resume() if (self::$pauseCount === 0) { self::$paused = false; } - - }//end resume() + } /** @@ -167,8 +161,5 @@ public static function resume() public static function isPaused() { return self::$paused; - - }//end isPaused() - - -}//end class + } +} diff --git a/tests/ConfigDouble.php b/tests/ConfigDouble.php index 42e14c75a5..c4048022b1 100644 --- a/tests/ConfigDouble.php +++ b/tests/ConfigDouble.php @@ -68,8 +68,7 @@ public function __construct(array $cliArgs = [], bool $skipSettingStandard = fal if ($skipSettingReportWidth !== true) { $this->preventAutoDiscoveryScreenWidth(); } - - }//end __construct() + } /** @@ -83,8 +82,7 @@ public function __destruct() $this->setStaticConfigProperty('executablePaths', []); $this->setStaticConfigProperty('configData', null); $this->setStaticConfigProperty('configDataFile', null); - - }//end __destruct() + } /** @@ -101,8 +99,7 @@ public function setCommandLineValues($args) if ($this->skipSettingStandard !== true) { $this->preventSearchingForRuleset(); } - - }//end setCommandLineValues() + } /** @@ -113,8 +110,7 @@ public function setCommandLineValues($args) private function resetSelectProperties() { $this->setStaticConfigProperty('executablePaths', []); - - }//end resetSelectProperties() + } /** @@ -129,8 +125,7 @@ private function preventReadingCodeSnifferConfFile() { $this->setStaticConfigProperty('configData', []); $this->setStaticConfigProperty('configDataFile', ''); - - }//end preventReadingCodeSnifferConfFile() + } /** @@ -153,8 +148,7 @@ private function preventSearchingForRuleset() } self::setStaticConfigProperty('overriddenDefaults', $overriddenDefaults); - - }//end preventSearchingForRuleset() + } /** @@ -169,8 +163,7 @@ private function preventAutoDiscoveryScreenWidth() if ($settings['reportWidth'] === 'auto') { $this->reportWidth = self::DEFAULT_REPORT_WIDTH; } - - }//end preventAutoDiscoveryScreenWidth() + } /** @@ -190,8 +183,7 @@ private function getStaticConfigProperty(string $name) } return $property->getValue(); - - }//end getStaticConfigProperty() + } /** @@ -214,8 +206,5 @@ private function setStaticConfigProperty(string $name, $value) } (PHP_VERSION_ID < 80100) && $property->setAccessible(false); - - }//end setStaticConfigProperty() - - -}//end class + } +} diff --git a/tests/Core/AbstractMethodTestCase.php b/tests/Core/AbstractMethodTestCase.php index 35dbadab11..bce730c0a8 100644 --- a/tests/Core/AbstractMethodTestCase.php +++ b/tests/Core/AbstractMethodTestCase.php @@ -61,8 +61,7 @@ public static function setUpBeforeClass(): void self::$phpcsFile = new LocalFile($pathToTestFile, $ruleset, $config); self::$phpcsFile->parse(); - - }//end setUpBeforeClass() + } /** @@ -82,8 +81,7 @@ public static function tearDownAfterClass(): void self::$tabWidth = 4; self::$phpcsFile = null; - - }//end tearDownAfterClass() + } /** @@ -103,8 +101,7 @@ public static function tearDownAfterClass(): void public function testTestMarkersAreUnique() { $this->assertTestMarkersAreUnique(self::$phpcsFile); - - }//end testTestMarkersAreUnique() + } /** @@ -133,8 +130,7 @@ public static function assertTestMarkersAreUnique(File $phpcsFile) } self::assertSame(array_unique($seenComments), $seenComments, 'Duplicate test markers found.'); - - }//end assertTestMarkersAreUnique() + } /** @@ -152,8 +148,7 @@ public static function assertTestMarkersAreUnique(File $phpcsFile) public function getTargetToken($commentString, $tokenType, $tokenContent = null) { return self::getTargetTokenFromFile(self::$phpcsFile, $commentString, $tokenType, $tokenContent); - - }//end getTargetToken() + } /** @@ -222,8 +217,7 @@ public static function getTargetTokenFromFile(File $phpcsFile, $commentString, $ } return $target; - - }//end getTargetTokenFromFile() + } /** @@ -238,8 +232,5 @@ public function expectRunTimeException($message) { $this->expectException(RuntimeException::class); $this->expectExceptionMessage($message); - - }//end expectRunTimeException() - - -}//end class + } +} diff --git a/tests/Core/AbstractWriterTestCase.php b/tests/Core/AbstractWriterTestCase.php index 0d0e67ff3e..343e1e63f4 100644 --- a/tests/Core/AbstractWriterTestCase.php +++ b/tests/Core/AbstractWriterTestCase.php @@ -15,4 +15,4 @@ abstract class AbstractWriterTestCase extends TestCase { use StatusWriterTestHelper; -}//end class +} diff --git a/tests/Core/Autoloader/DetermineLoadedClassTest.php b/tests/Core/Autoloader/DetermineLoadedClassTest.php index 74f5ddf3e0..374df3329e 100644 --- a/tests/Core/Autoloader/DetermineLoadedClassTest.php +++ b/tests/Core/Autoloader/DetermineLoadedClassTest.php @@ -29,8 +29,7 @@ final class DetermineLoadedClassTest extends TestCase public static function setUpBeforeClass(): void { include __DIR__ . '/TestFiles/Sub/C.inc'; - - }//end setUpBeforeClass() + } /** @@ -59,8 +58,7 @@ public function testOrdered() $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad); $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className); - - }//end testOrdered() + } /** @@ -117,8 +115,5 @@ public function testUnordered() $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad); $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className); - - }//end testUnordered() - - -}//end class + } +} diff --git a/tests/Core/Config/AbstractRealConfigTestCase.php b/tests/Core/Config/AbstractRealConfigTestCase.php index f316f4aa85..fbce31bf6e 100644 --- a/tests/Core/Config/AbstractRealConfigTestCase.php +++ b/tests/Core/Config/AbstractRealConfigTestCase.php @@ -32,8 +32,7 @@ protected function setUp(): void // from being read and influencing the tests. self::setStaticConfigProperty('configData', []); self::setStaticConfigProperty('configDataFile', ''); - - }//end setUp() + } /** @@ -44,8 +43,7 @@ protected function setUp(): void protected function tearDown(): void { $_SERVER['argv'] = []; - - }//end tearDown() + } /** @@ -60,8 +58,7 @@ public static function tearDownAfterClass(): void self::setStaticConfigProperty('configData', null); self::setStaticConfigProperty('configDataFile', null); $_SERVER['argv'] = []; - - }//end tearDownAfterClass() + } /** @@ -78,8 +75,5 @@ protected static function setStaticConfigProperty($name, $value) (PHP_VERSION_ID < 80100) && $property->setAccessible(true); $property->setValue(null, $value); (PHP_VERSION_ID < 80100) && $property->setAccessible(false); - - }//end setStaticConfigProperty() - - -}//end class + } +} diff --git a/tests/Core/Config/ExtensionsArgTest.php b/tests/Core/Config/ExtensionsArgTest.php index 1077a82c74..976d285a47 100644 --- a/tests/Core/Config/ExtensionsArgTest.php +++ b/tests/Core/Config/ExtensionsArgTest.php @@ -36,8 +36,7 @@ public function testValidExtensions($passedValue, $expected) $config = new ConfigDouble(["--extensions=$passedValue"]); $this->assertSame($expected, $config->extensions); - - }//end testValidExtensions() + } /** @@ -97,8 +96,7 @@ public static function dataValidExtensions() ], ], ]; - - }//end dataValidExtensions() + } /** @@ -116,8 +114,7 @@ public function testOnlySetOnce() ); $this->assertSame(['php' => 'PHP'], $config->extensions); - - }//end testOnlySetOnce() + } /** @@ -139,8 +136,7 @@ public function testInvalidExtensions($passedValue) $this->expectExceptionMessage($message); new ConfigDouble(["--extensions={$passedValue}"]); - - }//end testInvalidExtensions() + } /** @@ -163,8 +159,5 @@ public static function dataInvalidExtensions() 'passedValue' => 'php,js/js,phpt/php', ], ]; - - }//end dataInvalidExtensions() - - -}//end class + } +} diff --git a/tests/Core/Config/GeneratorArgTest.php b/tests/Core/Config/GeneratorArgTest.php index d8e90c2549..1453fe3091 100644 --- a/tests/Core/Config/GeneratorArgTest.php +++ b/tests/Core/Config/GeneratorArgTest.php @@ -31,8 +31,7 @@ protected function setUp(): void if (PHP_CODESNIFFER_CBF === true) { $this->markTestSkipped('This test needs CS mode to run'); } - - }//end setUp() + } /** @@ -50,8 +49,7 @@ public function testValidGenerators($argumentValue, $expectedPropertyValue) $config = new ConfigDouble(["--generator=$argumentValue"]); $this->assertSame($expectedPropertyValue, $config->generator); - - }//end testValidGenerators() + } /** @@ -89,8 +87,7 @@ public static function dataValidGeneratorNames() 'expectedPropertyValue' => 'HTML', ], ]; - - }//end dataValidGeneratorNames() + } /** @@ -109,8 +106,7 @@ public function testOnlySetOnce() ); $this->assertSame('Text', $config->generator); - - }//end testOnlySetOnce() + } /** @@ -130,8 +126,7 @@ public function testInvalidGenerator($generatorName) $this->expectExceptionMessage($message); new ConfigDouble(["--generator={$generatorName}"]); - - }//end testInvalidGenerator() + } /** @@ -148,8 +143,5 @@ public static function dataInvalidGeneratorNames() ['Text,HTML'], [''], ]; - - }//end dataInvalidGeneratorNames() - - -}//end class + } +} diff --git a/tests/Core/Config/IniSetTest.php b/tests/Core/Config/IniSetTest.php index 7d06d32b7d..1efd347412 100644 --- a/tests/Core/Config/IniSetTest.php +++ b/tests/Core/Config/IniSetTest.php @@ -46,8 +46,7 @@ protected function tearDown(): void if (is_string($this->originalValue) === true) { @ini_set($this->currentOption, $this->originalValue); } - - }//end tearDown() + } /** @@ -66,8 +65,7 @@ public function testIniValueHandlingWhenValueIsAlreadyCorrect() new ConfigDouble(['-d', "{$this->currentOption}={$this->originalValue}"]); $this->assertSame($this->originalValue, ini_get($this->currentOption)); - - }//end testIniValueHandlingWhenValueIsAlreadyCorrect() + } /** @@ -96,8 +94,7 @@ public function testIniValueIsUpdatedToTrueWhenNoValuePassed() new ConfigDouble(['-d', $this->currentOption]); $this->assertSame($expected, ini_get($this->currentOption)); - - }//end testIniValueIsUpdatedToTrueWhenNoValuePassed() + } /** @@ -126,8 +123,7 @@ public function testIniValueIsUpdated($option, $newValue, $alternativeValue) new ConfigDouble(['-d', "$option=$newValue"]); $this->assertSame($newValue, ini_get($option)); - - }//end testIniValueIsUpdated() + } /** @@ -145,8 +141,7 @@ public static function dataIniValueIsUpdated() 'alternativeValue' => '20', ], ]; - - }//end dataIniValueIsUpdated() + } /** @@ -175,8 +170,7 @@ public function testIniValueIsUpdatedWhenOptionalBcmathExtensionIsAvailable() new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]); $this->assertSame($newValue, ini_get($this->currentOption)); - - }//end testIniValueIsUpdatedWhenOptionalBcmathExtensionIsAvailable() + } /** @@ -211,8 +205,7 @@ public function testIniValueIsUpdatedWhenOptionalSqllite3ExtensionIsAvailable() new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]); $this->assertSame($newValue, ini_get($this->currentOption)); - - }//end testIniValueIsUpdatedWhenOptionalSqllite3ExtensionIsAvailable() + } /** @@ -237,8 +230,7 @@ public function testIniValueIsSilentlyIgnoredWhenOptionalExtensionIsNotAvailable new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]); $this->assertFalse(ini_get($this->currentOption), 'This should be impossible: an option for a disabled extension cannot be set'); - - }//end testIniValueIsSilentlyIgnoredWhenOptionalExtensionIsNotAvailable() + } /** @@ -257,8 +249,7 @@ public function testIniValueIsSilentlyIgnoredForUnknownIniName() new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]); $this->assertFalse(ini_get($this->currentOption), 'This should be impossible: an option which isn\'t known to PHP cannot be set'); - - }//end testIniValueIsSilentlyIgnoredForUnknownIniName() + } /** @@ -286,8 +277,7 @@ public function testIniValueCannotBeUpdatedAtRuntime($option, $newValue, $altern } new ConfigDouble(['-d', "$option=$newValue"]); - - }//end testIniValueCannotBeUpdatedAtRuntime() + } /** @@ -321,8 +311,5 @@ public static function dataIniValueCannotBeUpdatedAtRuntime() 'alternativeValue' => '300', ], ]; - - }//end dataIniValueCannotBeUpdatedAtRuntime() - - -}//end class + } +} diff --git a/tests/Core/Config/IssueSquiz2675Test.php b/tests/Core/Config/IssueSquiz2675Test.php index ee87f12645..9d418b5f97 100644 --- a/tests/Core/Config/IssueSquiz2675Test.php +++ b/tests/Core/Config/IssueSquiz2675Test.php @@ -36,8 +36,5 @@ public function testIssueSquiz2675() $configB = new Config(['--tab-width=4']); $this->assertSame(4, $configB->tabWidth, 'Tab width not correctly set when Config is created a second time'); - - }//end testIssueSquiz2675() - - -}//end class + } +} diff --git a/tests/Core/Config/PrepareConfigDataForDisplayTest.php b/tests/Core/Config/PrepareConfigDataForDisplayTest.php index a708e63a6a..7207a3b2c7 100644 --- a/tests/Core/Config/PrepareConfigDataForDisplayTest.php +++ b/tests/Core/Config/PrepareConfigDataForDisplayTest.php @@ -41,8 +41,7 @@ public function testPrepareConfigDataForDisplay($data, $expected) $actual = $config->prepareConfigDataForDisplay($data); $this->assertSame($expected, $actual); - - }//end testPrepareConfigDataForDisplay() + } /** @@ -95,8 +94,7 @@ public static function dataPrepareConfigDataForDisplay() ], ]; // phpcs:enable - - }//end dataPrepareConfigDataForDisplay() + } /** @@ -110,8 +108,5 @@ public function testPrintConfigData() $config = new ConfigDouble(); $config->printConfigData([]); - - }//end testPrintConfigData() - - -}//end class + } +} diff --git a/tests/Core/Config/ReportArgsTest.php b/tests/Core/Config/ReportArgsTest.php index b55a0dda09..7749e0ce90 100644 --- a/tests/Core/Config/ReportArgsTest.php +++ b/tests/Core/Config/ReportArgsTest.php @@ -36,8 +36,7 @@ public function testReportFileDoesNotSetReportsCs() $this->assertTrue(is_string($config->reportFile)); $this->assertStringEndsWith('/report.txt', $config->reportFile); $this->assertSame(['full' => null], $config->reports); - - }//end testReportFileDoesNotSetReportsCs() + } /** @@ -57,8 +56,5 @@ public function testReportFileDoesNotSetReportsCbf() $this->assertNull($config->reportFile); $this->assertSame(['full' => null], $config->reports); - - }//end testReportFileDoesNotSetReportsCbf() - - -}//end class + } +} diff --git a/tests/Core/Config/ReportWidthTest.php b/tests/Core/Config/ReportWidthTest.php index 71e20a9549..1052ea2e47 100644 --- a/tests/Core/Config/ReportWidthTest.php +++ b/tests/Core/Config/ReportWidthTest.php @@ -36,8 +36,7 @@ public function testReportWidthDefault() // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests. $this->assertIsInt($config->reportWidth, 'Report width is not an integer'); $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0'); - - }//end testReportWidthDefault() + } /** @@ -62,8 +61,7 @@ public function testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile() // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests. $this->assertIsInt($config->reportWidth, 'Report width is not an integer'); $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0'); - - }//end testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile() + } /** @@ -86,8 +84,7 @@ public function testReportWidthCanBeSetFromConfFile() $config = new Config(['--standard=PSR1']); $this->assertSame(120, $config->reportWidth); - - }//end testReportWidthCanBeSetFromConfFile() + } /** @@ -108,8 +105,7 @@ public function testReportWidthCanBeSetFromCLI() $config = new Config(); $this->assertSame(100, $config->reportWidth); - - }//end testReportWidthCanBeSetFromCLI() + } /** @@ -131,8 +127,7 @@ public function testReportWidthWhenSetFromCLIFirstValuePrevails() $config = new Config(); $this->assertSame(100, $config->reportWidth); - - }//end testReportWidthWhenSetFromCLIFirstValuePrevails() + } /** @@ -164,8 +159,7 @@ public function testReportWidthSetFromCLIOverrulesConfFile() $config = new Config($cliArgs); $this->assertSame(180, $config->reportWidth); - - }//end testReportWidthSetFromCLIOverrulesConfFile() + } /** @@ -183,8 +177,7 @@ public function testReportWidthInputHandlingForAuto() // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests. $this->assertIsInt($config->reportWidth, 'Report width is not an integer'); $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0'); - - }//end testReportWidthInputHandlingForAuto() + } /** @@ -204,8 +197,7 @@ public function testReportWidthInputHandling($value, $expected) $config->reportWidth = $value; $this->assertSame($expected, $config->reportWidth); - - }//end testReportWidthInputHandling() + } /** @@ -253,8 +245,5 @@ public static function dataReportWidthInputHandling() 'expected' => 180, ], ]; - - }//end dataReportWidthInputHandling() - - -}//end class + } +} diff --git a/tests/Core/Config/SniffsExcludeArgsTest.php b/tests/Core/Config/SniffsExcludeArgsTest.php index b9643aa5a7..0945b28615 100644 --- a/tests/Core/Config/SniffsExcludeArgsTest.php +++ b/tests/Core/Config/SniffsExcludeArgsTest.php @@ -59,8 +59,7 @@ public function testInvalid($argument, $value, $errors, $suggestion) $this->expectExceptionMessage($message); new ConfigDouble(["--$argument=$value"]); - - }//end testInvalid() + } /** @@ -195,8 +194,7 @@ public static function dataInvalid() }//end foreach return $data; - - }//end dataInvalid() + } /** @@ -214,8 +212,7 @@ public function testValid($argument, $value, $result) $config = new ConfigDouble(["--$argument=$value"]); $this->assertSame($result, $config->$argument); - - }//end testValid() + } /** @@ -276,8 +273,7 @@ public static function dataValid() }//end foreach return $data; - - }//end dataValid() + } /** @@ -299,8 +295,7 @@ public function testOnlySetOnce($argument) ); $this->assertSame(['StandardOne.Category.Sniff'], $config->$argument); - - }//end testOnlySetOnce() + } /** @@ -314,8 +309,5 @@ public static function dataOnlySetOnce() 'sniffs' => ['sniffs'], 'exclude' => ['exclude'], ]; - - }//end dataOnlySetOnce() - - -}//end class + } +} diff --git a/tests/Core/ErrorSuppressionTest.php b/tests/Core/ErrorSuppressionTest.php index 47ad238574..005883f9fb 100644 --- a/tests/Core/ErrorSuppressionTest.php +++ b/tests/Core/ErrorSuppressionTest.php @@ -54,8 +54,7 @@ public function testSuppressError($before, $after, $expectedErrors = 0) $this->assertSame($expectedErrors, $file->getErrorCount()); $this->assertCount($expectedErrors, $file->getErrors()); - - }//end testSuppressError() + } /** @@ -134,8 +133,7 @@ public static function dataSuppressError() 'after' => '/** phpcs:enable */', ], ]; - - }//end dataSuppressError() + } /** @@ -174,8 +172,7 @@ public function testSuppressSomeErrors($before, $between, $expectedErrors = 1) $this->assertSame($expectedErrors, $file->getErrorCount()); $this->assertCount($expectedErrors, $file->getErrors()); - - }//end testSuppressSomeErrors() + } /** @@ -216,8 +213,7 @@ public static function dataSuppressSomeErrors() 'between' => '/** phpcs:enable */', ], ]; - - }//end dataSuppressSomeErrors() + } /** @@ -255,8 +251,7 @@ public function testSuppressWarning($before, $after, $expectedWarnings = 0) $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testSuppressWarning() + } /** @@ -289,8 +284,7 @@ public static function dataSuppressWarning() 'after' => '/** phpcs:enable */', ], ]; - - }//end dataSuppressWarning() + } /** @@ -329,8 +323,7 @@ public function testSuppressLine($before, $after = '', $expectedErrors = 1) $this->assertSame($expectedErrors, $file->getErrorCount()); $this->assertCount($expectedErrors, $file->getErrors()); - - }//end testSuppressLine() + } /** @@ -387,8 +380,7 @@ public static function dataSuppressLine() 'after' => ' # @phpcs:ignore', ], ]; - - }//end dataSuppressLine() + } /** @@ -410,8 +402,7 @@ public function testSuppressLineMidLine() $this->assertSame(0, $file->getErrorCount()); $this->assertCount(0, $file->getErrors()); - - }//end testSuppressLineMidLine() + } /** @@ -442,8 +433,7 @@ public function testSuppressLineWithinDocblock() $this->assertSame(0, $file->getErrorCount()); $this->assertCount(0, $file->getErrors()); - - }//end testSuppressLineWithinDocblock() + } /** @@ -480,8 +470,7 @@ public function testNestedSuppressLine($before, $after) $this->assertSame(0, $file->getErrorCount()); $this->assertCount(0, $file->getErrors()); - - }//end testNestedSuppressLine() + } /** @@ -522,8 +511,7 @@ public static function dataNestedSuppressLine() 'after' => '# @phpcs:enable', ], ]; - - }//end dataNestedSuppressLine() + } /** @@ -565,8 +553,7 @@ function myFunction() { $this->assertSame($expectedErrors, $file->getErrorCount()); $this->assertCount($expectedErrors, $file->getErrors()); - - }//end testSuppressScope() + } /** @@ -607,8 +594,7 @@ public static function dataSuppressScope() 'after' => '/** @phpcs:enable */', ], ]; - - }//end dataSuppressScope() + } /** @@ -649,8 +635,7 @@ class MyClass {} $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testSuppressFile() + } /** @@ -701,8 +686,7 @@ public static function dataSuppressFile() 'after' => '// phpcs:ignoreFile', ], ]; - - }//end dataSuppressFile() + } /** @@ -747,8 +731,7 @@ public function testDisableSelected($before, $expectedErrors = 0, $expectedWarni $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testDisableSelected() + } /** @@ -820,8 +803,7 @@ public static function dataDisableSelected() 'expectedWarnings' => 1, ], ]; - - }//end dataDisableSelected() + } /** @@ -859,8 +841,7 @@ public function testEnableSelected($code, $expectedErrors, $expectedWarnings) $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testEnableSelected() + } /** @@ -1068,8 +1049,7 @@ public static function dataEnableSelected() 'expectedWarnings' => 0, ], ]; - - }//end dataEnableSelected() + } /** @@ -1112,8 +1092,7 @@ public function testIgnoreSelected($before, $expectedErrors, $expectedWarnings) $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testIgnoreSelected() + } /** @@ -1159,8 +1138,7 @@ public static function dataIgnoreSelected() 'expectedWarnings' => 1, ], ]; - - }//end dataIgnoreSelected() + } /** @@ -1198,8 +1176,7 @@ public function testCommenting($code, $expectedErrors, $expectedWarnings) $this->assertSame($expectedWarnings, $file->getWarningCount()); $this->assertCount($expectedWarnings, $file->getWarnings()); - - }//end testCommenting() + } /** @@ -1259,8 +1236,5 @@ public static function dataCommenting() 'expectedWarnings' => 0, ], ]; - - }//end dataCommenting() - - -}//end class + } +} diff --git a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php index e5cc9be12b..30590b1aef 100644 --- a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php +++ b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php @@ -38,8 +38,7 @@ public function testRulesetIgnoredInternalErrorIsIgnored($sniffs, $exclude) $added = $phpcsFile->addError('No code found', 0, 'Internal.NoCodeFound'); $this->assertFalse($added); - - }//end testRulesetIgnoredInternalErrorIsIgnored() + } /** @@ -58,8 +57,7 @@ public function testOtherInternalErrorIsNotIgnored($sniffs, $exclude) $added = $phpcsFile->addError('Some other error', 0, 'Internal.SomeError'); $this->assertTrue($added); - - }//end testOtherInternalErrorIsNotIgnored() + } /** @@ -85,8 +83,7 @@ public static function dataSniffSelection() 'exclude' => 'Generic.Files.ByteOrderMark,Generic.PHP.DisallowShortOpenTag', ], ]; - - }//end dataSniffSelection() + } /** @@ -119,8 +116,5 @@ private function getPhpcsFile($sniffs, $exclude) $phpcsFile->parse(); return $phpcsFile; - - }//end getPhpcsFile() - - -}//end class + } +} diff --git a/tests/Core/Files/File/FindEndOfStatementTest.php b/tests/Core/Files/File/FindEndOfStatementTest.php index f7875883a3..a2ef8ba8a1 100644 --- a/tests/Core/Files/File/FindEndOfStatementTest.php +++ b/tests/Core/Files/File/FindEndOfStatementTest.php @@ -53,8 +53,7 @@ public function testEndIsNeverLessThanCurrentToken() } $this->assertSame([], $errors); - - }//end testEndIsNeverLessThanCurrentToken() + } /** @@ -68,8 +67,7 @@ public function testSimpleAssignment() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 5), $found); - - }//end testSimpleAssignment() + } /** @@ -83,8 +81,7 @@ public function testControlStructure() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 6), $found); - - }//end testControlStructure() + } /** @@ -98,8 +95,7 @@ public function testClosureAssignment() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 13), $found); - - }//end testClosureAssignment() + } /** @@ -126,8 +122,7 @@ public function testHeredocFunctionArg() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame($start, $found); - - }//end testHeredocFunctionArg() + } /** @@ -154,8 +149,7 @@ public function testSwitch() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 6), $found); - - }//end testSwitch() + } /** @@ -182,8 +176,7 @@ public function testStatementAsArrayValue() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 3), $found); - - }//end testStatementAsArrayValue() + } /** @@ -197,8 +190,7 @@ public function testUseGroup() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 21), $found); - - }//end testUseGroup() + } /** @@ -212,8 +204,7 @@ public function testArrowFunctionArrayValue() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 9), $found); - - }//end testArrowFunctionArrayValue() + } /** @@ -230,8 +221,7 @@ public function testStaticArrowFunction() $endOfStatementFn = self::$phpcsFile->findEndOfStatement($fn); $this->assertSame($endOfStatementFn, $endOfStatementStatic); - - }//end testStaticArrowFunction() + } /** @@ -245,8 +235,7 @@ public function testArrowFunctionReturnValue() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 18), $found); - - }//end testArrowFunctionReturnValue() + } /** @@ -260,8 +249,7 @@ public function testArrowFunctionAsArgument() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 8), $found); - - }//end testArrowFunctionAsArgument() + } /** @@ -275,8 +263,7 @@ public function testArrowFunctionWithArrayAsArgument() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 17), $found); - - }//end testArrowFunctionWithArrayAsArgument() + } /** @@ -295,8 +282,7 @@ public function testMatchCase() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 1), $found); - - }//end testMatchCase() + } /** @@ -315,8 +301,7 @@ public function testMatchDefault() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame($start, $found); - - }//end testMatchDefault() + } /** @@ -333,8 +318,7 @@ public function testMatchMultipleCase() $start += 6; $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 7), $found); - - }//end testMatchMultipleCase() + } /** @@ -348,8 +332,7 @@ public function testMatchDefaultComma() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 5), $found); - - }//end testMatchDefaultComma() + } /** @@ -368,8 +351,7 @@ public function testMatchFunctionCall() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 1), $found); - - }//end testMatchFunctionCall() + } /** @@ -390,8 +372,7 @@ public function testMatchFunctionCallArm() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 21), $found); - - }//end testMatchFunctionCallArm() + } /** @@ -410,8 +391,7 @@ public function testMatchClosure() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 14), $found); - - }//end testMatchClosure() + } /** @@ -430,8 +410,7 @@ public function testMatchArray() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 22), $found); - - }//end testMatchArray() + } /** @@ -450,8 +429,5 @@ public function testNestedMatch() $found = self::$phpcsFile->findEndOfStatement($start); $this->assertSame(($start + 5), $found); - - }//end testNestedMatch() - - -}//end class + } +} diff --git a/tests/Core/Files/File/FindExtendedClassNameTest.php b/tests/Core/Files/File/FindExtendedClassNameTest.php index 3998635192..1a139f2b3d 100644 --- a/tests/Core/Files/File/FindExtendedClassNameTest.php +++ b/tests/Core/Files/File/FindExtendedClassNameTest.php @@ -29,8 +29,7 @@ public function testNonExistentToken() { $result = self::$phpcsFile->findExtendedClassName(100000); $this->assertFalse($result); - - }//end testNonExistentToken() + } /** @@ -43,8 +42,7 @@ public function testNotAClass() $token = $this->getTargetToken('/* testNotAClass */', [T_FUNCTION]); $result = self::$phpcsFile->findExtendedClassName($token); $this->assertFalse($result); - - }//end testNotAClass() + } /** @@ -63,8 +61,7 @@ public function testFindExtendedClassName($identifier, $expected) $OOToken = $this->getTargetToken($identifier, [T_CLASS, T_ANON_CLASS, T_INTERFACE]); $result = self::$phpcsFile->findExtendedClassName($OOToken); $this->assertSame($expected, $result); - - }//end testFindExtendedClassName() + } /** @@ -150,8 +147,5 @@ public static function dataExtendedClass() 'expected' => false, ], ]; - - }//end dataExtendedClass() - - -}//end class + } +} diff --git a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php index ac6df164cb..8d66dbd88a 100644 --- a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php +++ b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php @@ -29,8 +29,7 @@ public function testNonExistentToken() { $result = self::$phpcsFile->findImplementedInterfaceNames(100000); $this->assertFalse($result); - - }//end testNonExistentToken() + } /** @@ -43,8 +42,7 @@ public function testNotAClass() $token = $this->getTargetToken('/* testNotAClass */', [T_FUNCTION]); $result = self::$phpcsFile->findImplementedInterfaceNames($token); $this->assertFalse($result); - - }//end testNotAClass() + } /** @@ -62,8 +60,7 @@ public function testFindImplementedInterfaceNames($identifier, $expected) $OOToken = $this->getTargetToken($identifier, [T_CLASS, T_ANON_CLASS, T_INTERFACE, T_ENUM]); $result = self::$phpcsFile->findImplementedInterfaceNames($OOToken); $this->assertSame($expected, $result); - - }//end testFindImplementedInterfaceNames() + } /** @@ -162,8 +159,5 @@ public static function dataImplementedInterface() 'expected' => false, ], ]; - - }//end dataImplementedInterface() - - -}//end class + } +} diff --git a/tests/Core/Files/File/FindStartOfStatementTest.php b/tests/Core/Files/File/FindStartOfStatementTest.php index e8f8453777..edbf88ac1a 100644 --- a/tests/Core/Files/File/FindStartOfStatementTest.php +++ b/tests/Core/Files/File/FindStartOfStatementTest.php @@ -55,8 +55,7 @@ public function testStartIsNeverMoreThanCurrentToken() } $this->assertSame([], $errors); - - }//end testStartIsNeverMoreThanCurrentToken() + } /** @@ -70,8 +69,7 @@ public function testSimpleAssignment() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 5), $found); - - }//end testSimpleAssignment() + } /** @@ -85,8 +83,7 @@ public function testFunctionCall() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 6), $found); - - }//end testFunctionCall() + } /** @@ -100,8 +97,7 @@ public function testFunctionCallArgument() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame($start, $found); - - }//end testFunctionCallArgument() + } /** @@ -115,8 +111,7 @@ public function testControlStructure() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 6), $found); - - }//end testControlStructure() + } /** @@ -130,8 +125,7 @@ public function testClosureAssignment() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 11), $found); - - }//end testClosureAssignment() + } /** @@ -158,8 +152,7 @@ public function testHeredocFunctionArg() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame($start, $found); - - }//end testHeredocFunctionArg() + } /** @@ -198,8 +191,7 @@ public function testSwitch() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 1), $found); - - }//end testSwitch() + } /** @@ -232,8 +224,7 @@ public function testStatementAsArrayValue() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 5), $found); - - }//end testStatementAsArrayValue() + } /** @@ -247,8 +238,7 @@ public function testUseGroup() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 21), $found); - - }//end testUseGroup() + } /** @@ -262,8 +252,7 @@ public function testArrowFunctionArrayValue() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 7), $found); - - }//end testArrowFunctionArrayValue() + } /** @@ -277,8 +266,7 @@ public function testStaticArrowFunction() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 11), $found); - - }//end testStaticArrowFunction() + } /** @@ -292,8 +280,7 @@ public function testArrowFunctionReturnValue() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 18), $found); - - }//end testArrowFunctionReturnValue() + } /** @@ -308,8 +295,7 @@ public function testArrowFunctionAsArgument() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 8), $found); - - }//end testArrowFunctionAsArgument() + } /** @@ -324,8 +310,7 @@ public function testArrowFunctionWithArrayAsArgument() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 17), $found); - - }//end testArrowFunctionWithArrayAsArgument() + } /** @@ -339,8 +324,7 @@ public function testMatchCase() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 1), $found); - - }//end testMatchCase() + } /** @@ -354,8 +338,7 @@ public function testMatchDefault() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame($start, $found); - - }//end testMatchDefault() + } /** @@ -374,8 +357,7 @@ public function testMatchMultipleCase() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 4), $found); - - }//end testMatchMultipleCase() + } /** @@ -394,8 +376,7 @@ public function testMatchDefaultComma() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame($start, $found); - - }//end testMatchDefaultComma() + } /** @@ -409,8 +390,7 @@ public function testMatchFunctionCall() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 6), $found); - - }//end testMatchFunctionCall() + } /** @@ -431,8 +411,7 @@ public function testMatchFunctionCallArm() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 18), $found); - - }//end testMatchFunctionCallArm() + } /** @@ -452,8 +431,7 @@ public function testMatchClosure() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 10), $found); - - }//end testMatchClosure() + } /** @@ -482,8 +460,7 @@ public function testMatchArray() $start += 30; $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 26), $found); - - }//end testMatchArray() + } /** @@ -508,8 +485,7 @@ public function testNestedMatch() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 2), $found); - - }//end testNestedMatch() + } /** @@ -524,8 +500,7 @@ public function testOpenTag() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 1), $found); - - }//end testOpenTag() + } /** @@ -540,8 +515,7 @@ public function testOpenTagWithEcho() $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame(($start - 1), $found); - - }//end testOpenTagWithEcho() + } /** @@ -560,8 +534,7 @@ public function testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInAr $found = self::$phpcsFile->findStartOfStatement($start); $this->assertSame($expected, $found); - - }//end testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInArray() + } /** @@ -586,8 +559,7 @@ public function testFindStartInsideSwitchCaseDefaultStatements($testMarker, $tar $found = self::$phpcsFile->findStartOfStatement($testToken); $this->assertSame($expected, $found); - - }//end testFindStartInsideSwitchCaseDefaultStatements() + } /** @@ -686,8 +658,7 @@ public static function dataFindStartInsideSwitchCaseDefaultStatements() 'expectedTarget' => T_CONTINUE, ], ]; - - }//end dataFindStartInsideSwitchCaseDefaultStatements() + } /** @@ -711,8 +682,7 @@ public function testFindStartInsideClosedScopeNestedWithinMatch($testMarker, $ta $found = self::$phpcsFile->findStartOfStatement($testToken); $this->assertSame($expected, $found); - - }//end testFindStartInsideClosedScopeNestedWithinMatch() + } /** @@ -768,8 +738,7 @@ public static function dataFindStartInsideClosedScopeNestedWithinMatch() 'expectedTarget' => T_STRING, ], ]; - - }//end dataFindStartInsideClosedScopeNestedWithinMatch() + } /** @@ -793,8 +762,7 @@ public function testFindStartInsideParenthesesNestedWithinMatch($testMarker, $ta $found = self::$phpcsFile->findStartOfStatement($testToken); $this->assertSame($expected, $found); - - }//end testFindStartInsideParenthesesNestedWithinMatch() + } /** @@ -848,8 +816,7 @@ public static function dataFindStartInsideParenthesesNestedWithinMatch() 'expectedTarget' => T_VARIABLE, ], ]; - - }//end dataFindStartInsideParenthesesNestedWithinMatch() + } /** @@ -874,8 +841,7 @@ public function testFindStartInsideParenthesesNestedWithinNestedMatch($testMarke $found = self::$phpcsFile->findStartOfStatement($testToken); $this->assertSame($expected, $found); - - }//end testFindStartInsideParenthesesNestedWithinNestedMatch() + } /** @@ -929,8 +895,7 @@ public static function dataFindStartInsideParenthesesNestedWithinNestedMatch() 'expectedTarget' => T_VARIABLE, ], ]; - - }//end dataFindStartInsideParenthesesNestedWithinNestedMatch() + } /** @@ -954,8 +919,7 @@ public function testFindStartInsideShortArrayNestedWithinMatch($testMarker, $tar $found = self::$phpcsFile->findStartOfStatement($testToken); $this->assertSame($expected, $found); - - }//end testFindStartInsideShortArrayNestedWithinMatch() + } /** @@ -982,8 +946,5 @@ public static function dataFindStartInsideShortArrayNestedWithinMatch() 'expectedTarget' => T_VARIABLE, ], ]; - - }//end dataFindStartInsideShortArrayNestedWithinMatch() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetClassPropertiesTest.php b/tests/Core/Files/File/GetClassPropertiesTest.php index 2a711a955b..bace2d8d54 100644 --- a/tests/Core/Files/File/GetClassPropertiesTest.php +++ b/tests/Core/Files/File/GetClassPropertiesTest.php @@ -36,8 +36,7 @@ public function testNotAClassException($testMarker, $tokenType) $target = $this->getTargetToken($testMarker, $tokenType); self::$phpcsFile->getClassProperties($target); - - }//end testNotAClassException() + } /** @@ -63,8 +62,7 @@ public static function dataNotAClassException() 'tokenType' => T_ENUM, ], ]; - - }//end dataNotAClassException() + } /** @@ -82,8 +80,7 @@ public function testGetClassProperties($testMarker, $expected) $class = $this->getTargetToken($testMarker, T_CLASS); $result = self::$phpcsFile->getClassProperties($class); $this->assertSame($expected, $result); - - }//end testGetClassProperties() + } /** @@ -185,8 +182,5 @@ public static function dataGetClassProperties() ], ], ]; - - }//end dataGetClassProperties() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetConditionTest.php b/tests/Core/Files/File/GetConditionTest.php index f59b3af2d2..5baa64b0f9 100644 --- a/tests/Core/Files/File/GetConditionTest.php +++ b/tests/Core/Files/File/GetConditionTest.php @@ -138,8 +138,7 @@ protected function setUp(): void self::$markerTokens[$marker] = $this->getTargetToken($marker, Tokens::SCOPE_OPENERS); } } - - }//end setUp() + } /** @@ -154,8 +153,7 @@ public function testNonExistentToken() $result = self::$phpcsFile->hasCondition(100000, T_IF); $this->assertFalse($result); - - }//end testNonExistentToken() + } /** @@ -173,8 +171,7 @@ public function testNonConditionalToken() $result = self::$phpcsFile->hasCondition($stackPtr, Tokens::OO_SCOPE_TOKENS); $this->assertFalse($result); - - }//end testNonConditionalToken() + } /** @@ -207,8 +204,7 @@ public function testGetCondition($testMarker, $expectedResults) "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}" ); } - - }//end testGetCondition() + } /** @@ -278,8 +274,7 @@ public static function dataGetCondition() ], ], ]; - - }//end dataGetCondition() + } /** @@ -312,8 +307,7 @@ public function testGetConditionReversed($testMarker, $expectedResults) "Assertion failed for test marker '{$testMarker}' with condition {$conditionType} (reversed)" ); } - - }//end testGetConditionReversed() + } /** @@ -344,8 +338,7 @@ public static function dataGetConditionReversed() $data['testInDefault']['expectedResults']['T_IF'] = '/* condition 4: if */'; return $data; - - }//end dataGetConditionReversed() + } /** @@ -374,8 +367,7 @@ public function testHasCondition($testMarker, $expectedResults) "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}" ); } - - }//end testHasCondition() + } /** @@ -445,8 +437,7 @@ public static function dataHasCondition() ], ], ]; - - }//end dataHasCondition() + } /** @@ -483,8 +474,5 @@ public function testHasConditionMultipleTypes() $result, 'Failed asserting that "testSeriouslyNestedMethod" has an OO Scope token condition' ); - - }//end testHasConditionMultipleTypes() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php index e81da845e6..37e3c5ce55 100644 --- a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php +++ b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php @@ -30,8 +30,5 @@ public function testGetDeclarationName() $target = $this->getTargetToken('/* testLiveCoding */', T_FUNCTION); $result = self::$phpcsFile->getDeclarationName($target); $this->assertSame('', $result); - - }//end testGetDeclarationName() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php index 10454670b3..c89b9195a4 100644 --- a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php +++ b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php @@ -30,8 +30,5 @@ public function testGetDeclarationName() $target = $this->getTargetToken('/* testLiveCoding */', T_FUNCTION); $result = self::$phpcsFile->getDeclarationName($target); $this->assertSame('', $result); - - }//end testGetDeclarationName() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetDeclarationNameTest.php b/tests/Core/Files/File/GetDeclarationNameTest.php index 489fb077e6..6860826b1d 100644 --- a/tests/Core/Files/File/GetDeclarationNameTest.php +++ b/tests/Core/Files/File/GetDeclarationNameTest.php @@ -38,8 +38,7 @@ public function testInvalidTokenPassed($testMarker, $targetType) $target = $this->getTargetToken($testMarker, $targetType); self::$phpcsFile->getDeclarationName($target); - - }//end testInvalidTokenPassed() + } /** @@ -77,8 +76,7 @@ public static function dataInvalidTokenPassed() 'targetType' => T_ANON_CLASS, ], ]; - - }//end dataInvalidTokenPassed() + } /** @@ -107,8 +105,7 @@ public function testGetDeclarationName($testMarker, $expected, $targetType = nul $target = $this->getTargetToken($testMarker, $targetType); $result = self::$phpcsFile->getDeclarationName($target); $this->assertSame($expected, $result); - - }//end testGetDeclarationName() + } /** @@ -206,8 +203,5 @@ public static function dataGetDeclarationName() 'expected' => 'static', ], ]; - - }//end dataGetDeclarationName() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMemberPropertiesTest.php b/tests/Core/Files/File/GetMemberPropertiesTest.php index aa2ad69354..f0759160d4 100644 --- a/tests/Core/Files/File/GetMemberPropertiesTest.php +++ b/tests/Core/Files/File/GetMemberPropertiesTest.php @@ -45,8 +45,7 @@ public function testGetMemberProperties($identifier, $expected) } $this->assertSame($expected, $result); - - }//end testGetMemberProperties() + } /** @@ -1844,8 +1843,7 @@ public static function dataGetMemberProperties() ], ], ]; - - }//end dataGetMemberProperties() + } /** @@ -1863,8 +1861,7 @@ public function testNotClassPropertyException($identifier) $variable = $this->getTargetToken($identifier, T_VARIABLE); self::$phpcsFile->getMemberProperties($variable); - - }//end testNotClassPropertyException() + } /** @@ -1886,8 +1883,7 @@ public static function dataNotClassProperty() 'method parameter in enum' => ['/* testEnumMethodParamNotProperty */'], 'property in enum (parse error)' => ['/* testEnumProperty */'], ]; - - }//end dataNotClassProperty() + } /** @@ -1901,8 +1897,5 @@ public function testNotAVariableException() $next = $this->getTargetToken('/* testNotAVariable */', T_RETURN); self::$phpcsFile->getMemberProperties($next); - - }//end testNotAVariableException() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodParametersParseError1Test.php b/tests/Core/Files/File/GetMethodParametersParseError1Test.php index 9ac4f7f0d6..4ecc8be944 100644 --- a/tests/Core/Files/File/GetMethodParametersParseError1Test.php +++ b/tests/Core/Files/File/GetMethodParametersParseError1Test.php @@ -31,8 +31,5 @@ public function testParseError() $result = self::$phpcsFile->getMethodParameters($target); $this->assertSame([], $result); - - }//end testParseError() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodParametersParseError2Test.php b/tests/Core/Files/File/GetMethodParametersParseError2Test.php index 62b6688695..4b4d9f25b5 100644 --- a/tests/Core/Files/File/GetMethodParametersParseError2Test.php +++ b/tests/Core/Files/File/GetMethodParametersParseError2Test.php @@ -31,8 +31,5 @@ public function testParseError() $result = self::$phpcsFile->getMethodParameters($target); $this->assertSame([], $result); - - }//end testParseError() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodParametersParseError3Test.php b/tests/Core/Files/File/GetMethodParametersParseError3Test.php index c97c01a374..a6dbf8816e 100644 --- a/tests/Core/Files/File/GetMethodParametersParseError3Test.php +++ b/tests/Core/Files/File/GetMethodParametersParseError3Test.php @@ -30,8 +30,5 @@ public function testParseError() $target = $this->getTargetToken('/* testParseError */', [T_USE]); self::$phpcsFile->getMethodParameters($target); - - }//end testParseError() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodParametersParseError4Test.php b/tests/Core/Files/File/GetMethodParametersParseError4Test.php index 07e3f48f4b..c13b00cc00 100644 --- a/tests/Core/Files/File/GetMethodParametersParseError4Test.php +++ b/tests/Core/Files/File/GetMethodParametersParseError4Test.php @@ -30,8 +30,5 @@ public function testParseError() $result = self::$phpcsFile->getMethodParameters($target); $this->assertSame([], $result); - - }//end testParseError() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodParametersTest.php b/tests/Core/Files/File/GetMethodParametersTest.php index 3b4d2bd30d..fddc83dc3a 100644 --- a/tests/Core/Files/File/GetMethodParametersTest.php +++ b/tests/Core/Files/File/GetMethodParametersTest.php @@ -38,8 +38,7 @@ public function testUnexpectedTokenException($commentString, $targetTokenType) $target = $this->getTargetToken($commentString, $targetTokenType); self::$phpcsFile->getMethodParameters($target); - - }//end testUnexpectedTokenException() + } /** @@ -71,8 +70,7 @@ public static function dataUnexpectedTokenException() ], ], ]; - - }//end dataUnexpectedTokenException() + } /** @@ -90,8 +88,7 @@ public function testInvalidUse($identifier) $use = $this->getTargetToken($identifier, [T_USE]); self::$phpcsFile->getMethodParameters($use); - - }//end testInvalidUse() + } /** @@ -108,8 +105,7 @@ public static function dataInvalidUse() 'ImportGroupUse' => ['/* testImportGroupUse */'], 'TraitUse' => ['/* testTraitUse */'], ]; - - }//end dataInvalidUse() + } /** @@ -129,8 +125,7 @@ public function testNoParams($commentString, $targetTokenType = [T_FUNCTION, T_C $result = self::$phpcsFile->getMethodParameters($target); $this->assertSame([], $result); - - }//end testNoParams() + } /** @@ -154,8 +149,7 @@ public static function dataNoParams() 'targetTokenType' => T_USE, ], ]; - - }//end dataNoParams() + } /** @@ -184,8 +178,7 @@ public function testPassByReference() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPassByReference() + } /** @@ -214,8 +207,7 @@ public function testArrayHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrayHint() + } /** @@ -244,8 +236,7 @@ public function testVariable() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testVariable() + } /** @@ -277,8 +268,7 @@ public function testSingleDefaultValue() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testSingleDefaultValue() + } /** @@ -328,8 +318,7 @@ public function testDefaultValues() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testDefaultValues() + } /** @@ -374,8 +363,7 @@ public function testTypeHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testTypeHint() + } /** @@ -404,8 +392,7 @@ public function testSelfTypeHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testSelfTypeHint() + } /** @@ -450,8 +437,7 @@ public function testNullableTypeHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNullableTypeHint() + } /** @@ -483,8 +469,7 @@ public function testBitwiseAndConstantExpressionDefaultValue() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testBitwiseAndConstantExpressionDefaultValue() + } /** @@ -529,8 +514,7 @@ public function testArrowFunction() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunction() + } /** @@ -559,8 +543,7 @@ public function testArrowFunctionReturnByRef() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunctionReturnByRef() + } /** @@ -610,8 +593,7 @@ public function testArrayDefaultValues() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrayDefaultValues() + } /** @@ -658,8 +640,7 @@ public function testConstantDefaultValueSecondParam() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testConstantDefaultValueSecondParam() + } /** @@ -706,8 +687,7 @@ public function testScalarTernaryExpressionInDefault() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testScalarTernaryExpressionInDefault() + } /** @@ -736,8 +716,7 @@ public function testVariadicFunction() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testVariadicFunction() + } /** @@ -766,8 +745,7 @@ public function testVariadicByRefFunction() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testVariadicByRefFunction() + } /** @@ -811,8 +789,7 @@ public function testVariadicFunctionClassType() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testVariadicFunctionClassType() + } /** @@ -856,8 +833,7 @@ public function testNameSpacedTypeDeclaration() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNameSpacedTypeDeclaration() + } /** @@ -1045,8 +1021,7 @@ public function testWithAllTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testWithAllTypes() + } /** @@ -1234,8 +1209,7 @@ public function testArrowFunctionWithAllTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunctionWithAllTypes() + } /** @@ -1303,8 +1277,7 @@ public function testMessyDeclaration() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testMessyDeclaration() + } /** @@ -1333,8 +1306,7 @@ public function testPHP8MixedTypeHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8MixedTypeHint() + } /** @@ -1363,8 +1335,7 @@ public function testPHP8MixedTypeHintNullable() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8MixedTypeHintNullable() + } /** @@ -1393,8 +1364,7 @@ public function testNamespaceOperatorTypeHint() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNamespaceOperatorTypeHint() + } /** @@ -1438,8 +1408,7 @@ public function testPHP8UnionTypesSimple() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesSimple() + } /** @@ -1483,8 +1452,7 @@ public function testPHP8UnionTypesWithSpreadOperatorAndReference() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesWithSpreadOperatorAndReference() + } /** @@ -1516,8 +1484,7 @@ public function testPHP8UnionTypesSimpleWithBitwiseOrInDefault() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesSimpleWithBitwiseOrInDefault() + } /** @@ -1546,8 +1513,7 @@ public function testPHP8UnionTypesTwoClasses() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesTwoClasses() + } /** @@ -1576,8 +1542,7 @@ public function testPHP8UnionTypesAllBaseTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesAllBaseTypes() + } /** @@ -1608,8 +1573,7 @@ public function testPHP8UnionTypesAllPseudoTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesAllPseudoTypes() + } /** @@ -1638,8 +1602,7 @@ public function testPHP8UnionTypesNullable() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesNullable() + } /** @@ -1671,8 +1634,7 @@ public function testPHP8PseudoTypeNull() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeNull() + } /** @@ -1704,8 +1666,7 @@ public function testPHP8PseudoTypeFalse() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeFalse() + } /** @@ -1737,8 +1698,7 @@ public function testPHP8PseudoTypeFalseAndBool() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeFalseAndBool() + } /** @@ -1767,8 +1727,7 @@ public function testPHP8ObjectAndClass() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ObjectAndClass() + } /** @@ -1797,8 +1756,7 @@ public function testPHP8PseudoTypeIterableAndArray() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeIterableAndArray() + } /** @@ -1827,8 +1785,7 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8DuplicateTypeInUnionWhitespaceAndComment() + } /** @@ -1905,8 +1862,7 @@ public function testPHP8ConstructorPropertyPromotionNoTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ConstructorPropertyPromotionNoTypes() + } /** @@ -1977,8 +1933,7 @@ public function testPHP8ConstructorPropertyPromotionWithTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ConstructorPropertyPromotionWithTypes() + } /** @@ -2025,8 +1980,7 @@ public function testPHP8ConstructorPropertyPromotionAndNormalParam() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ConstructorPropertyPromotionAndNormalParam() + } /** @@ -2078,8 +2032,7 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnly() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81ConstructorPropertyPromotionWithReadOnly() + } /** @@ -2132,8 +2085,7 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclarati ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration() + } /** @@ -2186,8 +2138,7 @@ public function testPHP81ConstructorPropertyPromotionWithOnlyReadOnly() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81ConstructorPropertyPromotionWithOnlyReadOnly() + } /** @@ -2302,8 +2253,7 @@ public function testPHP84ConstructorPropertyPromotionWithAsymVisibility() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP84ConstructorPropertyPromotionWithAsymVisibility() + } /** @@ -2335,8 +2285,7 @@ public function testPHP8ConstructorPropertyPromotionGlobalFunction() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ConstructorPropertyPromotionGlobalFunction() + } /** @@ -2386,8 +2335,7 @@ public function testPHP8ConstructorPropertyPromotionAbstractMethod() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ConstructorPropertyPromotionAbstractMethod() + } /** @@ -2420,8 +2368,7 @@ public function testCommentsInParameter() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testCommentsInParameter() + } /** @@ -2516,8 +2463,7 @@ public function testParameterAttributesInFunctionDeclaration() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testParameterAttributesInFunctionDeclaration() + } /** @@ -2561,8 +2507,7 @@ public function testPHP8IntersectionTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8IntersectionTypes() + } /** @@ -2607,8 +2552,7 @@ public function testPHP81IntersectionTypesWithSpreadOperatorAndReference() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81IntersectionTypesWithSpreadOperatorAndReference() + } /** @@ -2637,8 +2581,7 @@ public function testPHP81MoreIntersectionTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81MoreIntersectionTypes() + } /** @@ -2667,8 +2610,7 @@ public function testPHP81IllegalIntersectionTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81IllegalIntersectionTypes() + } /** @@ -2697,8 +2639,7 @@ public function testPHP81NullableIntersectionTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81NullableIntersectionTypes() + } /** @@ -2730,8 +2671,7 @@ public function testPHP82PseudoTypeTrue() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82PseudoTypeTrue() + } /** @@ -2763,8 +2703,7 @@ public function testPHP82PseudoTypeFalseAndTrue() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82PseudoTypeFalseAndTrue() + } /** @@ -2814,8 +2753,7 @@ public function testPHP81NewInInitializers() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81NewInInitializers() + } /** @@ -2863,8 +2801,7 @@ public function testPHP82DNFTypes() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypes() + } /** @@ -2909,8 +2846,7 @@ public function testPHP82DNFTypesWithSpreadOperatorAndReference() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypesWithSpreadOperatorAndReference() + } /** @@ -2939,8 +2875,7 @@ public function testPHP82DNFTypesIllegalNullable() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypesIllegalNullable() + } /** @@ -2969,8 +2904,7 @@ public function testPHP82DNFTypesInArrow() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypesInArrow() + } /** @@ -3002,8 +2936,7 @@ public function testClosure() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosure() + } /** @@ -3047,8 +2980,7 @@ public function testClosureUse() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]); - - }//end testClosureUse() + } /** @@ -3092,8 +3024,7 @@ public function testClosureUseWithReference() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]); - - }//end testClosureUseWithReference() + } /** @@ -3140,8 +3071,7 @@ public function testFunctionParamListWithTrailingComma() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testFunctionParamListWithTrailingComma() + } /** @@ -3185,8 +3115,7 @@ public function testClosureParamListWithTrailingComma() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosureParamListWithTrailingComma() + } /** @@ -3230,8 +3159,7 @@ public function testArrowFunctionParamListWithTrailingComma() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunctionParamListWithTrailingComma() + } /** @@ -3275,8 +3203,7 @@ public function testClosureUseWithTrailingComma() ]; $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]); - - }//end testClosureUseWithTrailingComma() + } /** @@ -3340,8 +3267,5 @@ private function getMethodParametersTestHelper($commentString, $expected, $targe }//end foreach $this->assertSame($expected, $found); - - }//end getMethodParametersTestHelper() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetMethodPropertiesTest.php b/tests/Core/Files/File/GetMethodPropertiesTest.php index 47578c4225..61abbf4eaf 100644 --- a/tests/Core/Files/File/GetMethodPropertiesTest.php +++ b/tests/Core/Files/File/GetMethodPropertiesTest.php @@ -36,8 +36,7 @@ public function testNotAFunctionException($commentString, $targetTokenType) $next = $this->getTargetToken($commentString, $targetTokenType); self::$phpcsFile->getMethodProperties($next); - - }//end testNotAFunctionException() + } /** @@ -69,8 +68,7 @@ public static function dataNotAFunctionException() ], ], ]; - - }//end dataNotAFunctionException() + } /** @@ -94,8 +92,7 @@ public function testBasicFunction() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testBasicFunction() + } /** @@ -120,8 +117,7 @@ public function testReturnFunction() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnFunction() + } /** @@ -146,8 +142,7 @@ public function testNestedClosure() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNestedClosure() + } /** @@ -171,8 +166,7 @@ public function testBasicMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testBasicMethod() + } /** @@ -196,8 +190,7 @@ public function testPrivateStaticMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPrivateStaticMethod() + } /** @@ -221,8 +214,7 @@ public function testFinalMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testFinalMethod() + } /** @@ -247,8 +239,7 @@ public function testProtectedReturnMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testProtectedReturnMethod() + } /** @@ -273,8 +264,7 @@ public function testPublicReturnMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPublicReturnMethod() + } /** @@ -299,8 +289,7 @@ public function testNullableReturnMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNullableReturnMethod() + } /** @@ -325,8 +314,7 @@ public function testMessyNullableReturnMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testMessyNullableReturnMethod() + } /** @@ -351,8 +339,7 @@ public function testReturnNamespace() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnNamespace() + } /** @@ -377,8 +364,7 @@ public function testReturnMultilineNamespace() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnMultilineNamespace() + } /** @@ -403,8 +389,7 @@ public function testReturnUnqualifiedName() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnUnqualifiedName() + } /** @@ -429,8 +414,7 @@ public function testReturnPartiallyQualifiedName() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnPartiallyQualifiedName() + } /** @@ -454,8 +438,7 @@ public function testAbstractMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testAbstractMethod() + } /** @@ -480,8 +463,7 @@ public function testAbstractReturnMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testAbstractReturnMethod() + } /** @@ -505,8 +487,7 @@ public function testInterfaceMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testInterfaceMethod() + } /** @@ -531,8 +512,7 @@ public function testArrowFunction() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunction() + } /** @@ -557,8 +537,7 @@ public function testReturnTypeStatic() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnTypeStatic() + } /** @@ -583,8 +562,7 @@ public function testReturnTypeNullableStatic() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testReturnTypeNullableStatic() + } /** @@ -609,8 +587,7 @@ public function testPHP8MixedTypeHint() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8MixedTypeHint() + } /** @@ -635,8 +612,7 @@ public function testPHP8MixedTypeHintNullable() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8MixedTypeHintNullable() + } /** @@ -661,8 +637,7 @@ public function testNamespaceOperatorTypeHint() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testNamespaceOperatorTypeHint() + } /** @@ -687,8 +662,7 @@ public function testPHP8UnionTypesSimple() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesSimple() + } /** @@ -713,8 +687,7 @@ public function testPHP8UnionTypesTwoClasses() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesTwoClasses() + } /** @@ -739,8 +712,7 @@ public function testPHP8UnionTypesAllBaseTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesAllBaseTypes() + } /** @@ -767,8 +739,7 @@ public function testPHP8UnionTypesAllPseudoTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesAllPseudoTypes() + } /** @@ -793,8 +764,7 @@ public function testPHP8UnionTypesNullable() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8UnionTypesNullable() + } /** @@ -819,8 +789,7 @@ public function testPHP8PseudoTypeNull() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeNull() + } /** @@ -845,8 +814,7 @@ public function testPHP8PseudoTypeFalse() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeFalse() + } /** @@ -871,8 +839,7 @@ public function testPHP8PseudoTypeFalseAndBool() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeFalseAndBool() + } /** @@ -897,8 +864,7 @@ public function testPHP8ObjectAndClass() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8ObjectAndClass() + } /** @@ -923,8 +889,7 @@ public function testPHP8PseudoTypeIterableAndArray() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8PseudoTypeIterableAndArray() + } /** @@ -949,8 +914,7 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8DuplicateTypeInUnionWhitespaceAndComment() + } /** @@ -975,8 +939,7 @@ public function testPHP81NeverType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81NeverType() + } /** @@ -1001,8 +964,7 @@ public function testPHP81NullableNeverType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81NullableNeverType() + } /** @@ -1027,8 +989,7 @@ public function testPHP8IntersectionTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP8IntersectionTypes() + } /** @@ -1053,8 +1014,7 @@ public function testPHP81MoreIntersectionTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81MoreIntersectionTypes() + } /** @@ -1079,8 +1039,7 @@ public function testPHP81IntersectionArrowFunction() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81IntersectionArrowFunction() + } /** @@ -1105,8 +1064,7 @@ public function testPHP81IllegalIntersectionTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81IllegalIntersectionTypes() + } /** @@ -1131,8 +1089,7 @@ public function testPHP81NullableIntersectionTypes() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP81NullableIntersectionTypes() + } /** @@ -1157,8 +1114,7 @@ public function testPHP82PseudoTypeTrue() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82PseudoTypeTrue() + } /** @@ -1183,8 +1139,7 @@ public function testPHP82PseudoTypeFalseAndTrue() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82PseudoTypeFalseAndTrue() + } /** @@ -1209,8 +1164,7 @@ public function testPHP82DNFType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFType() + } /** @@ -1235,8 +1189,7 @@ public function testPHP82DNFTypeAbstractMethod() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypeAbstractMethod() + } /** @@ -1261,8 +1214,7 @@ public function testPHP82DNFTypeIllegalNullable() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypeIllegalNullable() + } /** @@ -1287,8 +1239,7 @@ public function testPHP82DNFTypeClosure() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypeClosure() + } /** @@ -1313,8 +1264,7 @@ public function testPHP82DNFTypeFn() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPHP82DNFTypeFn() + } /** @@ -1341,8 +1291,7 @@ public function testPhpcsIssue1264() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testPhpcsIssue1264() + } /** @@ -1370,8 +1319,7 @@ public function testArrowFunctionArrayReturnValue() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunctionArrayReturnValue() + } /** @@ -1396,8 +1344,7 @@ public function testArrowFunctionReturnByRef() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testArrowFunctionReturnByRef() + } /** @@ -1423,8 +1370,7 @@ public function testFunctionDeclarationNestedInTernaryPHPCS2975() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testFunctionDeclarationNestedInTernaryPHPCS2975() + } /** @@ -1449,8 +1395,7 @@ public function testClosureWithUseNoReturnType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosureWithUseNoReturnType() + } /** @@ -1476,8 +1421,7 @@ public function testClosureWithUseNoReturnTypeIllegalUseProp() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosureWithUseNoReturnTypeIllegalUseProp() + } /** @@ -1502,8 +1446,7 @@ public function testClosureWithUseWithReturnType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosureWithUseWithReturnType() + } /** @@ -1528,8 +1471,7 @@ public function testClosureWithUseMultiParamWithReturnType() ]; $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected); - - }//end testClosureWithUseMultiParamWithReturnType() + } /** @@ -1555,8 +1497,5 @@ private function getMethodPropertiesTestHelper($commentString, $expected) } $this->assertSame($expected, $found); - - }//end getMethodPropertiesTestHelper() - - -}//end class + } +} diff --git a/tests/Core/Files/File/GetTokensAsStringTest.php b/tests/Core/Files/File/GetTokensAsStringTest.php index 25b78cdc4f..ad9b4ecd37 100644 --- a/tests/Core/Files/File/GetTokensAsStringTest.php +++ b/tests/Core/Files/File/GetTokensAsStringTest.php @@ -30,8 +30,7 @@ public function testNonExistentToken() $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack'); self::$phpcsFile->getTokensAsString(100000, 10); - - }//end testNonExistentToken() + } /** @@ -44,8 +43,7 @@ public function testNonIntegerStart() $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack'); self::$phpcsFile->getTokensAsString(false, 10); - - }//end testNonIntegerStart() + } /** @@ -60,8 +58,7 @@ public function testNonIntegerLength() $result = self::$phpcsFile->getTokensAsString(10, 1.5); $this->assertSame('', $result); - - }//end testNonIntegerLength() + } /** @@ -76,8 +73,7 @@ public function testLengthEqualToOrLessThanZero() $result = self::$phpcsFile->getTokensAsString(10, 0); $this->assertSame('', $result); - - }//end testLengthEqualToOrLessThanZero() + } /** @@ -94,8 +90,7 @@ public function testLengthBeyondEndOfFile() ', $result ); - - }//end testLengthBeyondEndOfFile() + } /** @@ -115,8 +110,7 @@ public function testGetTokensAsString($testMarker, $startTokenType, $length, $ex $start = $this->getTargetToken($testMarker, $startTokenType); $result = self::$phpcsFile->getTokensAsString($start, $length); $this->assertSame($expected, $result); - - }//end testGetTokensAsString() + } /** @@ -269,8 +263,7 @@ public static function dataGetTokensAsString() 'expected' => 'echo $foo;', ], ]; - - }//end dataGetTokensAsString() + } /** @@ -290,8 +283,7 @@ public function testGetOrigContent($testMarker, $startTokenType, $length, $expec $start = $this->getTargetToken($testMarker, $startTokenType); $result = self::$phpcsFile->getTokensAsString($start, $length, true); $this->assertSame($expected, $result); - - }//end testGetOrigContent() + } /** @@ -327,8 +319,5 @@ public static function dataGetOrigContent() 'expected' => 'echo $foo;', ], ]; - - }//end dataGetOrigContent() - - -}//end class + } +} diff --git a/tests/Core/Files/File/IsReferenceTest.php b/tests/Core/Files/File/IsReferenceTest.php index 4ebc3732e7..f133586bdf 100644 --- a/tests/Core/Files/File/IsReferenceTest.php +++ b/tests/Core/Files/File/IsReferenceTest.php @@ -36,8 +36,7 @@ public function testNotBitwiseAndToken($testMarker, $targetTokens) $target = $this->getTargetToken($testMarker, $targetTokens); $this->assertFalse(self::$phpcsFile->isReference($target)); - - }//end testNotBitwiseAndToken() + } /** @@ -63,8 +62,7 @@ public static function dataNotBitwiseAndToken() 'targetTokens' => [T_TYPE_INTERSECTION], ], ]; - - }//end dataNotBitwiseAndToken() + } /** @@ -82,8 +80,7 @@ public function testIsReference($testMarker, $expected) $bitwiseAnd = $this->getTargetToken($testMarker, T_BITWISE_AND); $result = self::$phpcsFile->isReference($bitwiseAnd); $this->assertSame($expected, $result); - - }//end testIsReference() + } /** @@ -389,8 +386,5 @@ public static function dataIsReference() 'expected' => true, ], ]; - - }//end dataIsReference() - - -}//end class + } +} diff --git a/tests/Core/Files/FileList/AbstractFileListTestCase.php b/tests/Core/Files/FileList/AbstractFileListTestCase.php index da9370009d..9cf9fe9929 100644 --- a/tests/Core/Files/FileList/AbstractFileListTestCase.php +++ b/tests/Core/Files/FileList/AbstractFileListTestCase.php @@ -46,8 +46,5 @@ public static function setUpBeforeClass(): void self::$config->filter = __DIR__ . '/FilterDouble.php'; self::$ruleset = new Ruleset(self::$config); } - - }//end setUpBeforeClass() - - -}//end class + } +} diff --git a/tests/Core/Files/FileList/AddFileTest.php b/tests/Core/Files/FileList/AddFileTest.php index ac4d78d7f4..878796c7f0 100644 --- a/tests/Core/Files/FileList/AddFileTest.php +++ b/tests/Core/Files/FileList/AddFileTest.php @@ -36,8 +36,7 @@ protected function setUp(): void { self::$config->files = []; $this->fileList = new FileList(self::$config, self::$ruleset); - - }//end setUp() + } /** @@ -70,8 +69,7 @@ public function testAddFile($fileName, $fileObject = null) 'File object not found in list' ); } - - }//end testAddFile() + } /** @@ -95,8 +93,7 @@ public static function dataAddFile() 'fileObject' => new File('test1.php', self::$ruleset, self::$config), ], ]; - - }//end dataAddFile() + } /** @@ -127,8 +124,5 @@ public function testAddFileShouldNotAddTheSameFileTwice() $this->fileList->addFile($file2); $this->assertCount(2, $this->fileList); $this->assertSame($expectedFiles, array_keys(iterator_to_array($this->fileList))); - - }//end testAddFileShouldNotAddTheSameFileTwice() - - -}//end class + } +} diff --git a/tests/Core/Files/FileList/ConstructTest.php b/tests/Core/Files/FileList/ConstructTest.php index eb9b27415b..49d540f647 100644 --- a/tests/Core/Files/FileList/ConstructTest.php +++ b/tests/Core/Files/FileList/ConstructTest.php @@ -61,8 +61,7 @@ public function testConstruct($files, $expectedFiles) ); $i++; } - - }//end testConstruct() + } /** @@ -116,8 +115,5 @@ public static function dataConstruct() ], ], ]; - - }//end dataConstruct() - - -}//end class + } +} diff --git a/tests/Core/Files/FileList/FilterDouble.php b/tests/Core/Files/FileList/FilterDouble.php index 99952ef63c..5a71226df9 100644 --- a/tests/Core/Files/FileList/FilterDouble.php +++ b/tests/Core/Files/FileList/FilterDouble.php @@ -24,8 +24,5 @@ final class FilterDouble extends Filter public function accept() { return true; - - }//end accept() - - -}//end class + } +} diff --git a/tests/Core/Filters/AbstractFilterTestCase.php b/tests/Core/Filters/AbstractFilterTestCase.php index 2569199426..7de5ccdc94 100644 --- a/tests/Core/Filters/AbstractFilterTestCase.php +++ b/tests/Core/Filters/AbstractFilterTestCase.php @@ -45,8 +45,7 @@ public static function setUpBeforeClass(): void { self::$config = new ConfigDouble(); self::$ruleset = new Ruleset(self::$config); - - }//end setUpBeforeClass() + } /** @@ -63,8 +62,7 @@ public static function tearDownAfterClass(): void if (isset(self::$config) === true) { self::$config->__destruct(); } - - }//end tearDownAfterClass() + } /** @@ -98,8 +96,7 @@ protected function getMockedClass($className, array $constructorArgs = [], $meth return $mockedObj->getMock() ->setConstructorArgs($constructorArgs); - - }//end getMockedClass() + } /** @@ -118,8 +115,7 @@ protected function getFilteredResultsAsArray(Filter $filter) } return $files; - - }//end getFilteredResultsAsArray() + } /** @@ -130,8 +126,7 @@ protected function getFilteredResultsAsArray(Filter $filter) protected static function getBaseDir() { return dirname(__DIR__, 3); - - }//end getBaseDir() + } /** @@ -197,8 +192,7 @@ protected static function getFakeFileList() $basedir . '/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed', $basedir . '/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php', ]; - - }//end getFakeFileList() + } /** @@ -227,8 +221,5 @@ protected static function mapPathsToRuntimeOs(array $paths) } return $paths; - - }//end mapPathsToRuntimeOs() - - -}//end class + } +} diff --git a/tests/Core/Filters/Filter/AcceptTest.php b/tests/Core/Filters/Filter/AcceptTest.php index 224e2542b7..8fc085bba0 100644 --- a/tests/Core/Filters/Filter/AcceptTest.php +++ b/tests/Core/Filters/Filter/AcceptTest.php @@ -35,8 +35,7 @@ public static function setUpBeforeClass(): void $standard = __DIR__ . '/' . basename(__FILE__, '.php') . '.xml'; self::$config = new ConfigDouble(["--standard=$standard", '--ignore=*/somethingelse/*']); self::$ruleset = new Ruleset(self::$config); - - }//end setUpBeforeClass() + } /** @@ -55,8 +54,7 @@ public function testExcludePatterns($inputPaths, $expectedOutput) $filter = new Filter($fakeDI, '/', self::$config, self::$ruleset); $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter)); - - }//end testExcludePatterns() + } /** @@ -101,8 +99,5 @@ public static function dataExcludePatterns() // Allow these tests to work on Windows as well. return self::mapPathsToRuntimeOs($testCases); - - }//end dataExcludePatterns() - - -}//end class + } +} diff --git a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php index 87922b22c5..94e25d4ef8 100644 --- a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php +++ b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php @@ -34,8 +34,7 @@ public function testFileWithoutExtensionIsAcceptedWhenExplicitlyRequested() $filter = new Filter($fakeDI, $fileWithoutExt, self::$config, self::$ruleset); $this->assertSame([$fileWithoutExt], $this->getFilteredResultsAsArray($filter)); - - }//end testFileWithoutExtensionIsAcceptedWhenExplicitlyRequested() + } /** @@ -64,8 +63,5 @@ public function testFileWithoutExtensionIsRejectedWhenRecursingDirectory() ]; $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter)); - - }//end testFileWithoutExtensionIsRejectedWhenRecursingDirectory() - - -}//end class + } +} diff --git a/tests/Core/Filters/GitModifiedTest.php b/tests/Core/Filters/GitModifiedTest.php index 92003a1f7f..e40b1aa0b9 100644 --- a/tests/Core/Filters/GitModifiedTest.php +++ b/tests/Core/Filters/GitModifiedTest.php @@ -47,8 +47,7 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname() ->willReturn(['autoload.php']); $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj)); - - }//end testFileNamePassesAsBasePathWillTranslateToDirname() + } /** @@ -78,8 +77,7 @@ public function testAcceptOnlyGitModified($inputPaths, $outputGitModified, $expe ->willReturn($outputGitModified); $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj)); - - }//end testAcceptOnlyGitModified() + } /** @@ -197,8 +195,7 @@ public static function dataAcceptOnlyGitModified() ]; return $testCases; - - }//end dataAcceptOnlyGitModified() + } /** @@ -229,8 +226,7 @@ public function testExecAlwaysReturnsArray($cmd, $expected) $result = $reflMethod->invoke($filter, $cmd); $this->assertSame($expected, $result); - - }//end testExecAlwaysReturnsArray() + } /** @@ -263,8 +259,5 @@ public static function dataExecAlwaysReturnsArray() ], ], ]; - - }//end dataExecAlwaysReturnsArray() - - -}//end class + } +} diff --git a/tests/Core/Filters/GitStagedTest.php b/tests/Core/Filters/GitStagedTest.php index 9c43be3782..8b9abb7dc8 100644 --- a/tests/Core/Filters/GitStagedTest.php +++ b/tests/Core/Filters/GitStagedTest.php @@ -47,8 +47,7 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname() ->willReturn(['autoload.php']); $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj)); - - }//end testFileNamePassesAsBasePathWillTranslateToDirname() + } /** @@ -78,8 +77,7 @@ public function testAcceptOnlyGitStaged($inputPaths, $outputGitStaged, $expected ->willReturn($outputGitStaged); $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj)); - - }//end testAcceptOnlyGitStaged() + } /** @@ -197,8 +195,7 @@ public static function dataAcceptOnlyGitStaged() ]; return $testCases; - - }//end dataAcceptOnlyGitStaged() + } /** @@ -229,8 +226,7 @@ public function testExecAlwaysReturnsArray($cmd, $expected) $result = $reflMethod->invoke($filter, $cmd); $this->assertSame($expected, $result); - - }//end testExecAlwaysReturnsArray() + } /** @@ -263,8 +259,5 @@ public static function dataExecAlwaysReturnsArray() ], ], ]; - - }//end dataExecAlwaysReturnsArray() - - -}//end class + } +} diff --git a/tests/Core/Fixer/FixFileReturnValueTest.php b/tests/Core/Fixer/FixFileReturnValueTest.php index 6266fb4181..e8da5de506 100644 --- a/tests/Core/Fixer/FixFileReturnValueTest.php +++ b/tests/Core/Fixer/FixFileReturnValueTest.php @@ -39,8 +39,7 @@ public function testReturnValueIsTrueWhenFileWasFixed() $fixed = $phpcsFile->fixer->fixFile(); $this->assertTrue($fixed); - - }//end testReturnValueIsTrueWhenFileWasFixed() + } /** @@ -63,8 +62,7 @@ public function testReturnValueIsFalse($standard) $fixed = $phpcsFile->fixer->fixFile(); $this->assertFalse($fixed); - - }//end testReturnValueIsFalse() + } /** @@ -82,8 +80,5 @@ public static function dataReturnValueIsFalse() 'standard' => __DIR__ . '/FixFileReturnValueNotEnoughLoopsTest.xml', ], ]; - - }//end dataReturnValueIsFalse() - - -}//end class + } +} diff --git a/tests/Core/Fixer/GenerateDiffTest.php b/tests/Core/Fixer/GenerateDiffTest.php index 87d7f1fc26..f2556e9e25 100644 --- a/tests/Core/Fixer/GenerateDiffTest.php +++ b/tests/Core/Fixer/GenerateDiffTest.php @@ -56,8 +56,7 @@ public static function setUpBeforeClass(): void self::$phpcsFile = new LocalFile(__DIR__ . '/Fixtures/GenerateDiffTest.inc', $ruleset, $config); self::$phpcsFile->parse(); self::$phpcsFile->fixer->startFile(self::$phpcsFile); - - }//end setUpBeforeClass() + } /** @@ -70,8 +69,7 @@ public function testGenerateDiffNoFile() $diff = self::$phpcsFile->fixer->generateDiff(null, false); $this->assertSame('', $diff); - - }//end testGenerateDiffNoFile() + } /** @@ -93,8 +91,7 @@ public function testGenerateDiff($filePath) $expectedDiffFile = str_replace('.inc', '.diff', $filePath); $this->assertStringEqualsFile($expectedDiffFile, $diff); - - }//end testGenerateDiff() + } /** @@ -138,8 +135,7 @@ public static function dataGenerateDiff() 'filePath' => __DIR__ . '/Fixtures/GenerateDiffTest-WhiteSpaceAtEnd.inc', ], ]; - - }//end dataGenerateDiff() + } /** @@ -169,8 +165,7 @@ public function testGenerateDiffColoured() $diff = str_replace('--- tests\Core\Fixer/', '--- tests/Core/Fixer/', $diff); $this->assertSame($expected, $diff); - - }//end testGenerateDiffColoured() + } /** @@ -218,8 +213,5 @@ public function testGenerateDiffDifferentLineEndings() $diff = preg_replace('`\R`', "\n", $diff); $this->assertSame($expected, $diff); - - }//end testGenerateDiffDifferentLineEndings() - - -}//end class + } +} diff --git a/tests/Core/Generators/GeneratorTest.php b/tests/Core/Generators/GeneratorTest.php index d7864272d5..00fe449059 100644 --- a/tests/Core/Generators/GeneratorTest.php +++ b/tests/Core/Generators/GeneratorTest.php @@ -42,8 +42,7 @@ public function testConstructor($standard, array $expected) $generator = new MockGenerator($ruleset); $this->assertSame($expected, $generator->docFiles); - - }//end testConstructor() + } /** @@ -88,8 +87,7 @@ public static function dataConstructor() ], ], ]; - - }//end dataConstructor() + } /** @@ -109,8 +107,7 @@ public function testGeneratingInvalidDocsResultsInException() $generator = new MockGenerator($ruleset); $generator->generate(); - - }//end testGeneratingInvalidDocsResultsInException() + } /** @@ -133,8 +130,7 @@ public function testGeneratingDocs($standard, $expected) $generator = new MockGenerator($ruleset); $generator->generate(); - - }//end testGeneratingDocs() + } /** @@ -169,8 +165,7 @@ public static function dataGeneratingDocs() 'expected' => $multidocExpected, ], ]; - - }//end dataGeneratingDocs() + } /** @@ -192,8 +187,5 @@ public function testGetTitleFallbackToFilename() $generator = new MockGenerator($ruleset); $generator->generate(); - - }//end testGetTitleFallbackToFilename() - - -}//end class + } +} diff --git a/tests/Core/Generators/HTMLTest.php b/tests/Core/Generators/HTMLTest.php index b4b6d6a76c..b75d8e069b 100644 --- a/tests/Core/Generators/HTMLTest.php +++ b/tests/Core/Generators/HTMLTest.php @@ -42,8 +42,7 @@ public function testGeneratingInvalidDocsResultsInException() $generator = new HTML($ruleset); $generator->generate(); - - }//end testGeneratingInvalidDocsResultsInException() + } /** @@ -71,8 +70,7 @@ public function testDocs($standard, $pathToExpected) $generator = new HTMLDouble($ruleset); $generator->generate(); - - }//end testDocs() + } /** @@ -96,8 +94,7 @@ public static function dataDocs() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.html', ], ]; - - }//end dataDocs() + } /** @@ -126,8 +123,7 @@ public function testDocSpecifics($sniffs, $pathToExpected) $generator = new HTMLDouble($ruleset); $generator->generate(); - - }//end testDocSpecifics() + } /** @@ -251,8 +247,7 @@ public static function dataDocSpecifics() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.html', ], ]; - - }//end dataDocSpecifics() + } /** @@ -277,8 +272,7 @@ public function testAnchorLinks() $generator = new HTMLDouble($ruleset); $generator->generate(); - - }//end testAnchorLinks() + } /** @@ -307,8 +301,7 @@ public function testFooter() // PHPUnit < 9.1.0. $this->assertRegExp($regex, $footer); } - - }//end testFooter() + } /** @@ -332,8 +325,7 @@ public function testFooterResetsErrorReportingToOriginalSetting() $generator->getRealFooter(); $this->assertSame($expected, error_reporting()); - - }//end testFooterResetsErrorReportingToOriginalSetting() + } /** @@ -372,8 +364,5 @@ public function testFooterDoesntThrowWarningOnMissingTimezone() // Reset the timezone to its original state. ini_set('date.timezone', $originalIni); - - }//end testFooterDoesntThrowWarningOnMissingTimezone() - - -}//end class + } +} diff --git a/tests/Core/Generators/MarkdownTest.php b/tests/Core/Generators/MarkdownTest.php index 862f41c28e..9d3edf2b93 100644 --- a/tests/Core/Generators/MarkdownTest.php +++ b/tests/Core/Generators/MarkdownTest.php @@ -42,8 +42,7 @@ public function testGeneratingInvalidDocsResultsInException() $generator = new Markdown($ruleset); $generator->generate(); - - }//end testGeneratingInvalidDocsResultsInException() + } /** @@ -71,8 +70,7 @@ public function testDocs($standard, $pathToExpected) $generator = new MarkdownDouble($ruleset); $generator->generate(); - - }//end testDocs() + } /** @@ -96,8 +94,7 @@ public static function dataDocs() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.md', ], ]; - - }//end dataDocs() + } /** @@ -126,8 +123,7 @@ public function testDocSpecifics($sniffs, $pathToExpected) $generator = new MarkdownDouble($ruleset); $generator->generate(); - - }//end testDocSpecifics() + } /** @@ -251,8 +247,7 @@ public static function dataDocSpecifics() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.md', ], ]; - - }//end dataDocSpecifics() + } /** @@ -279,8 +274,7 @@ public function testFooter() // PHPUnit < 9.1.0. $this->assertRegExp($regex, $footer); } - - }//end testFooter() + } /** @@ -304,8 +298,7 @@ public function testFooterResetsErrorReportingToOriginalSetting() $generator->getRealFooter(); $this->assertSame($expected, error_reporting()); - - }//end testFooterResetsErrorReportingToOriginalSetting() + } /** @@ -344,8 +337,5 @@ public function testFooterDoesntThrowWarningOnMissingTimezone() // Reset the timezone to its original state. ini_set('date.timezone', $originalIni); - - }//end testFooterDoesntThrowWarningOnMissingTimezone() - - -}//end class + } +} diff --git a/tests/Core/Generators/TextTest.php b/tests/Core/Generators/TextTest.php index 81e8482d9e..1d4fc053b7 100644 --- a/tests/Core/Generators/TextTest.php +++ b/tests/Core/Generators/TextTest.php @@ -48,8 +48,7 @@ public function testDocs($standard, $pathToExpected) $generator = new Text($ruleset); $generator->generate(); - - }//end testDocs() + } /** @@ -73,8 +72,7 @@ public static function dataDocs() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.txt', ], ]; - - }//end dataDocs() + } /** @@ -103,8 +101,7 @@ public function testDocSpecifics($sniffs, $pathToExpected) $generator = new Text($ruleset); $generator->generate(); - - }//end testDocSpecifics() + } /** @@ -228,8 +225,5 @@ public static function dataDocSpecifics() 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.txt', ], ]; - - }//end dataDocSpecifics() - - -}//end class + } +} diff --git a/tests/Core/Reporter/MagicMethodsTest.php b/tests/Core/Reporter/MagicMethodsTest.php index d0d3f0a471..d837817267 100644 --- a/tests/Core/Reporter/MagicMethodsTest.php +++ b/tests/Core/Reporter/MagicMethodsTest.php @@ -35,8 +35,7 @@ public function testMagicIssetReturnsFalseForUnknownProperty() $reporter = new Reporter(new ConfigDouble()); $this->assertFalse(isset($reporter->unknown)); - - }//end testMagicIssetReturnsFalseForUnknownProperty() + } /** @@ -50,8 +49,7 @@ public function testMagicGetThrowsExceptionForUnsupportedProperty() $this->expectExceptionMessage('ERROR: access requested to unknown property "Reporter::$invalid"'); (new Reporter(new ConfigDouble()))->invalid; - - }//end testMagicGetThrowsExceptionForUnsupportedProperty() + } /** @@ -78,8 +76,7 @@ public function testMagicGetReturnsValueForSupportedProperty($propertyName, $set $this->assertTrue(isset($reporter->$propertyName)); $this->assertSame($expectedValue, $reporter->$propertyName); - - }//end testMagicGetReturnsValueForSupportedProperty() + } /** @@ -111,8 +108,7 @@ public static function dataMagicGetReturnsValueForSupportedProperty() 'expectedValue' => 4, ], ]; - - }//end dataMagicGetReturnsValueForSupportedProperty() + } /** @@ -127,8 +123,7 @@ public function testMagicSetThrowsException() $reporter = new Reporter(new ConfigDouble()); $reporter->totalFixable = 10; - - }//end testMagicSetThrowsException() + } /** @@ -143,8 +138,5 @@ public function testMagicUnsetThrowsException() $reporter = new Reporter(new ConfigDouble()); unset($reporter->totalFixed); - - }//end testMagicUnsetThrowsException() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/AbstractRulesetTestCase.php b/tests/Core/Ruleset/AbstractRulesetTestCase.php index 0c5ffc5fe4..8972b398cc 100644 --- a/tests/Core/Ruleset/AbstractRulesetTestCase.php +++ b/tests/Core/Ruleset/AbstractRulesetTestCase.php @@ -33,8 +33,7 @@ protected function assertXObjectHasProperty($propertyName, $object, $message = ' // PHPUnit < 9.6.11. $this->assertObjectHasAttribute($propertyName, $object, $message); } - - }//end assertXObjectHasProperty() + } /** @@ -55,8 +54,7 @@ protected function assertXObjectNotHasProperty($propertyName, $object, $message // PHPUnit < 9.6.11. $this->assertObjectNotHasAttribute($propertyName, $object, $message); } - - }//end assertXObjectNotHasProperty() + } /** @@ -71,8 +69,7 @@ protected function expectRuntimeExceptionMessage($message) { $this->expectException(RuntimeException::class); $this->expectExceptionMessage($message); - - }//end expectRuntimeExceptionMessage() + } /** @@ -93,8 +90,5 @@ protected function expectRuntimeExceptionRegex($regex) $this->expectException(RuntimeException::class); $this->expectExceptionMessageRegExp($regex); } - - }//end expectRuntimeExceptionRegex() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ConstructorTest.php b/tests/Core/Ruleset/ConstructorTest.php index 43cc724c8f..33ca23f201 100644 --- a/tests/Core/Ruleset/ConstructorTest.php +++ b/tests/Core/Ruleset/ConstructorTest.php @@ -39,8 +39,7 @@ public function testHandlingStandardsPassedViaCLI($cliArgs, $expected) $ruleset = new Ruleset($config); $this->assertSame($expected, $ruleset->name); - - }//end testHandlingStandardsPassedViaCLI() + } /** @@ -71,8 +70,7 @@ public static function dataHandlingStandardsPassedViaCLI() 'expected' => 'TestStandard', ], ]; - - }//end dataHandlingStandardsPassedViaCLI() + } /** @@ -101,8 +99,7 @@ public function testStandardsAreRegisteredWithAutoloader($cliArgs, $expected) $this->assertArrayHasKey($path, $autoloadPaths, "Path $path has not been registered with the autoloader"); $this->assertSame($namespacedStandardName, $autoloadPaths[$path], 'Expected (namespaced) standard name does not match'); } - - }//end testStandardsAreRegisteredWithAutoloader() + } /** @@ -161,8 +158,7 @@ public static function dataStandardsAreRegisteredWithAutoloader() ]; return $data; - - }//end dataStandardsAreRegisteredWithAutoloader() + } /** @@ -189,8 +185,7 @@ public function testCachingVersusRestrictions($cliArgs, $cache, $expected) sort($actual); $this->assertSame($expected, $actual); - - }//end testCachingVersusRestrictions() + } /** @@ -267,8 +262,7 @@ public static function dataCachingVersusRestrictions() */ ]; - - }//end dataCachingVersusRestrictions() + } /** @@ -285,8 +279,5 @@ public function testNoSniffsRegisteredException() $this->expectRuntimeExceptionMessage($message); new Ruleset($config); - - }//end testNoSniffsRegisteredException() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/DisplayCachedMessagesTest.php b/tests/Core/Ruleset/DisplayCachedMessagesTest.php index 6431a59884..ae9040fec4 100644 --- a/tests/Core/Ruleset/DisplayCachedMessagesTest.php +++ b/tests/Core/Ruleset/DisplayCachedMessagesTest.php @@ -44,8 +44,7 @@ public function testDisplayCachedMessagesStaysSilentWithoutErrors() $this->invokeDisplayCachedMessages($ruleset); $this->assertStderrOutputSameString(''); - - }//end testDisplayCachedMessagesStaysSilentWithoutErrors() + } /** @@ -66,8 +65,7 @@ public function testBlockingErrorsAreDisplayedViaAnException($messages, $expecte $this->expectRuntimeExceptionMessage($expected); $this->invokeDisplayCachedMessages($ruleset); - - }//end testBlockingErrorsAreDisplayedViaAnException() + } /** @@ -109,8 +107,7 @@ public static function dataBlockingErrorsAreDisplayedViaAnException() // phpcs:enable ], ]; - - }//end dataBlockingErrorsAreDisplayedViaAnException() + } /** @@ -133,8 +130,7 @@ public function testNonBlockingErrorsGenerateOutput($messages, $expected) $this->invokeDisplayCachedMessages($ruleset); $this->assertStderrOutputSameString($expected); - - }//end testNonBlockingErrorsGenerateOutput() + } /** @@ -174,8 +170,7 @@ public static function dataNonBlockingErrorsGenerateOutput() // phpcs:enable ], ]; - - }//end dataNonBlockingErrorsGenerateOutput() + } /** @@ -199,8 +194,7 @@ public function testBlockingErrorsAlwaysShow($configArgs) $this->expectRuntimeExceptionMessage('ERROR: ' . $message . PHP_EOL); $this->invokeDisplayCachedMessages($ruleset); - - }//end testBlockingErrorsAlwaysShow() + } /** @@ -223,8 +217,7 @@ public function testNonBlockingErrorsDoNotShowUnderSpecificCircumstances($config $this->invokeDisplayCachedMessages($ruleset); $this->assertStderrOutputSameString(''); - - }//end testNonBlockingErrorsDoNotShowUnderSpecificCircumstances() + } /** @@ -254,8 +247,7 @@ public static function dataSelectiveDisplayOfMessages() } return $data; - - }//end dataSelectiveDisplayOfMessages() + } /** @@ -273,8 +265,7 @@ private function getPlainRuleset() } return $ruleset; - - }//end getPlainRuleset() + } /** @@ -296,8 +287,7 @@ private function mockCachedMessages(Ruleset $ruleset, $messages) } (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false); - - }//end mockCachedMessages() + } /** @@ -313,8 +303,5 @@ private function invokeDisplayCachedMessages(Ruleset $ruleset) (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(true); $reflMethod->invoke($ruleset); (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(false); - - }//end invokeDisplayCachedMessages() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php index 692c8e5bd9..c87693e25c 100644 --- a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php +++ b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php @@ -37,8 +37,7 @@ final class ExpandRulesetReferenceHomePathTest extends AbstractRulesetTestCase public static function setUpBeforeClass(): void { self::$homepath = getenv('HOME'); - - }//end setUpBeforeClass() + } /** @@ -54,8 +53,7 @@ public static function tearDownAfterClass(): void // Remove the environment variable as it didn't exist before. putenv('HOME'); } - - }//end tearDownAfterClass() + } /** @@ -67,8 +65,7 @@ protected function setUp(): void { $fakeHomePath = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'FakeHomePath'; putenv("HOME=$fakeHomePath"); - - }//end setUp() + } /** @@ -87,8 +84,7 @@ public function testHomePathRefGetsExpandedAndFindsSniff() $expected = ['MyStandard.Category.Valid' => 'FakeHomePath\\MyStandard\\Sniffs\\Category\\ValidSniff']; $this->assertSame($expected, $ruleset->sniffCodes); - - }//end testHomePathRefGetsExpandedAndFindsSniff() + } /** @@ -108,8 +104,5 @@ public function testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid() $this->expectRuntimeExceptionMessage($exceptionMessage); new Ruleset($config); - - }//end testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php index 67283d1acc..595d23babe 100644 --- a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php +++ b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php @@ -37,8 +37,7 @@ public function testInternalRefDoesNotGetExpanded() $expected = ['Generic.PHP.BacktickOperator' => 'PHP_CodeSniffer\\Standards\\Generic\\Sniffs\\PHP\\BacktickOperatorSniff']; $this->assertSame($expected, $ruleset->sniffCodes); - - }//end testInternalRefDoesNotGetExpanded() + } /** @@ -64,8 +63,5 @@ public function testInternalStandardIsNotSupported() // This assertion will only take effect for PHPUnit 10+. $this->assertSame($expected, $ruleset->sniffCodes); - - }//end testInternalStandardIsNotSupported() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php index 12fa26871a..7c61ef20cb 100644 --- a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php +++ b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php @@ -41,8 +41,7 @@ public function testRulesetRelativePathReferences() ]; $this->assertSame($expected, $ruleset->sniffCodes); - - }//end testRulesetRelativePathReferences() + } /** @@ -66,8 +65,7 @@ public function testUnresolvableReferenceThrowsException($standard, $replacement $this->expectRuntimeExceptionMessage(sprintf($exceptionMessage, $replacement)); new Ruleset($config); - - }//end testUnresolvableReferenceThrowsException() + } /** @@ -127,8 +125,5 @@ public static function dataUnresolvableReferenceThrowsException() } return $data; - - }//end dataUnresolvableReferenceThrowsException() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php index 0d25f6c213..281b7a0048 100644 --- a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php +++ b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php @@ -60,8 +60,5 @@ public function testExpandSniffDirectory() ksort($actual); $this->assertSame($expectedSniffCodes, $actual, 'Registered sniffs do not match expectation'); - - }//end testExpandSniffDirectory() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ExplainTest.php b/tests/Core/Ruleset/ExplainTest.php index cb6e38eb4c..9f99a4e873 100644 --- a/tests/Core/Ruleset/ExplainTest.php +++ b/tests/Core/Ruleset/ExplainTest.php @@ -53,8 +53,7 @@ public function testExplain() $this->expectOutputString($expected); $ruleset->explain(); - - }//end testExplain() + } /** @@ -88,8 +87,7 @@ public function testExplainAlwaysDisplaysCompleteSniffName() $this->expectOutputString($expected); $ruleset->explain(); - - }//end testExplainAlwaysDisplaysCompleteSniffName() + } /** @@ -115,8 +113,7 @@ public function testExplainSingleSniff() $this->expectOutputString($expected); $ruleset->explain(); - - }//end testExplainSingleSniff() + } /** @@ -161,8 +158,7 @@ public function testExplainCustomRuleset() $this->expectOutputString($expected); $ruleset->explain(); - - }//end testExplainCustomRuleset() + } /** @@ -206,8 +202,5 @@ public function testExplainWithDeprecatedSniffs() $this->expectOutputString($expected); $ruleset->explain(); - - }//end testExplainWithDeprecatedSniffs() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/GetIgnorePatternsTest.php b/tests/Core/Ruleset/GetIgnorePatternsTest.php index ec1de10d2d..968f70bd44 100644 --- a/tests/Core/Ruleset/GetIgnorePatternsTest.php +++ b/tests/Core/Ruleset/GetIgnorePatternsTest.php @@ -40,8 +40,7 @@ public static function setUpBeforeClass(): void $standard = __DIR__ . '/GetIgnorePatternsTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset($config); - - }//end setUpBeforeClass() + } /** @@ -57,8 +56,7 @@ public static function setUpBeforeClass(): void public function testGetIgnorePatterns($listener, $expected) { $this->assertSame($expected, self::$ruleset->getIgnorePatterns($listener)); - - }//end testGetIgnorePatterns() + } /** @@ -102,8 +100,5 @@ public static function dataGetIgnorePatterns() 'expected' => [], ], ]; - - }//end dataGetIgnorePatterns() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/GetIncludePatternsTest.php b/tests/Core/Ruleset/GetIncludePatternsTest.php index b162f4a98d..f1929e511a 100644 --- a/tests/Core/Ruleset/GetIncludePatternsTest.php +++ b/tests/Core/Ruleset/GetIncludePatternsTest.php @@ -40,8 +40,7 @@ public static function setUpBeforeClass(): void $standard = __DIR__ . '/GetIncludePatternsTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset($config); - - }//end setUpBeforeClass() + } /** @@ -57,8 +56,7 @@ public static function setUpBeforeClass(): void public function testGetIncludePatterns($listener, $expected) { $this->assertSame($expected, self::$ruleset->getIncludePatterns($listener)); - - }//end testGetIncludePatterns() + } /** @@ -99,8 +97,5 @@ public static function dataGetIncludePatterns() 'expected' => [], ], ]; - - }//end dataGetIncludePatterns() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php index b20fb7aebc..5be1481c7c 100644 --- a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php +++ b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php @@ -63,8 +63,5 @@ public function testBrokenNamingConventions() // This assertion will only take effect for PHPUnit 10+. $this->assertSame($expectedSniffCodes, $ruleset->sniffCodes, 'Registered sniffs do not match expectation'); - - }//end testBrokenNamingConventions() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/PopulateTokenListenersTest.php b/tests/Core/Ruleset/PopulateTokenListenersTest.php index 09062da642..435bd9a978 100644 --- a/tests/Core/Ruleset/PopulateTokenListenersTest.php +++ b/tests/Core/Ruleset/PopulateTokenListenersTest.php @@ -45,8 +45,7 @@ protected function setUp(): void $config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset($config); } - - }//end setUp() + } /** @@ -69,8 +68,7 @@ public function testSniffWhereRegisterDoesNotReturnAnArrayThrowsException() // These assertions will only take effect for PHPUnit 10+. $this->assertArrayNotHasKey($sniffClass, self::$ruleset->sniffs, "Sniff class $sniffClass is listed in registered sniffs"); $this->assertArrayNotHasKey('TestStandard.InvalidSniffs.RegisterNoArray', self::$ruleset->sniffCodes, 'Sniff code is registered'); - - }//end testSniffWhereRegisterDoesNotReturnAnArrayThrowsException() + } /** @@ -90,8 +88,7 @@ public function testSniffWithRegisterMethodReturningEmptyArrayIsSilentlyIgnored( sprintf('Found the %s sniff registered for token %s', $target, Tokens::tokenName($token)) ); } - - }//end testSniffWithRegisterMethodReturningEmptyArrayIsSilentlyIgnored() + } /** @@ -115,8 +112,7 @@ public function testRegistersSniffsToListenToTokens($sniffClass, $expectedCount) } $this->assertSame($expectedCount, $counter); - - }//end testRegistersSniffsToListenToTokens() + } /** @@ -154,8 +150,7 @@ public static function dataSniffListensToTokenss() 'expectedCount' => 0, ], ]; - - }//end dataSniffListensToTokenss() + } /** @@ -174,8 +169,7 @@ public function testRegistersWhenADeprecatedSniffIsLoaded() // There are other tests which test the deprecated sniff handling in more detail. $this->assertIsArray($actualValue); $this->assertCount(1, $actualValue); - - }//end testRegistersWhenADeprecatedSniffIsLoaded() + } /** @@ -195,8 +189,7 @@ public function testDoesntTriggerPropertySettingForNoProperties() // Just making sure there are no properties on the sniff object (which doesn't have declared properties). $this->assertSame([], $reflection->getProperties(), "Unexpected properties found on sniff class $sniffClass"); - - }//end testDoesntTriggerPropertySettingForNoProperties() + } /** @@ -219,8 +212,7 @@ public function testTriggersPropertySettingWhenPropertiesProvided($sniffClass, $ // Verify the property has been set. $this->assertSame($expected, $sniffObject->$propertyName, "Property on sniff class $sniffClass set to unexpected value"); - - }//end testTriggersPropertySettingWhenPropertiesProvided() + } /** @@ -249,8 +241,7 @@ public static function dataTriggersPropertySettingWhenPropertiesProvided() 'expected' => '8', ], ]; - - }//end dataTriggersPropertySettingWhenPropertiesProvided() + } /** @@ -296,8 +287,7 @@ public function testSetsClassAndSourceIndexes() ); }//end foreach }//end foreach - - }//end testSetsClassAndSourceIndexes() + } /** @@ -331,8 +321,7 @@ public function testSetsIncludePatternsToEmptyArrayByDefault() ); } }//end foreach - - }//end testSetsIncludePatternsToEmptyArrayByDefault() + } /** @@ -366,8 +355,7 @@ public function testSetsIgnorePatternsToEmptyArrayByDefault() ); } }//end foreach - - }//end testSetsIgnorePatternsToEmptyArrayByDefault() + } /** @@ -413,8 +401,7 @@ public function testSetsIncludeAndIgnorePatterns($token, $sniffClass, $patternTy self::$ruleset->tokenListeners[$token][$sniffClass][$patternType], sprintf('Unexpected value for "%s" key for sniff class %s for token %s', $patternType, $sniffClass, Tokens::tokenName($token)) ); - - }//end testSetsIncludeAndIgnorePatterns() + } /** @@ -443,8 +430,5 @@ public static function dataSetsIncludeAndIgnorePatterns() 'patternType' => 'ignore', ], ]; - - }//end dataSetsIncludeAndIgnorePatterns() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php index 17e2a24235..11553fe689 100644 --- a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php +++ b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php @@ -36,8 +36,5 @@ public function testInvalidTypeHandling() $this->expectRuntimeExceptionMessage($message); new Ruleset($config); - - }//end testInvalidTypeHandling() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php index b7a4d67695..7ae23dc2a8 100644 --- a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php +++ b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php @@ -43,8 +43,7 @@ protected function setUp(): void $config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset($config); } - - }//end setUp() + } /** @@ -75,8 +74,7 @@ public function testShouldProcessSeverityCsonly() // Verify that the CBF-only severity directive is NOT applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertNotHasRulesetDirective($sniffCode, $key); - - }//end testShouldProcessSeverityCsonly() + } /** @@ -106,8 +104,7 @@ public function testShouldProcessSeverityCbfonly() // Verify that the CBF-only severity directive IS applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertRulesetPropertySame(4, $sniffCode, $key); - - }//end testShouldProcessSeverityCbfonly() + } /** @@ -135,8 +132,7 @@ public function testShouldProcessTypeCsonly() // Verify that the CBF-only type directive is NOT applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertNotHasRulesetDirective($sniffCode, $key); - - }//end testShouldProcessTypeCsonly() + } /** @@ -166,8 +162,7 @@ public function testShouldProcessTypeCbfonly() // Verify that the CBF-only type directive IS applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertRulesetPropertySame('error', $sniffCode, $key); - - }//end testShouldProcessTypeCbfonly() + } /** @@ -195,8 +190,7 @@ public function testShouldProcessMessageCsonly() // Verify that the CBF-only message directive is NOT applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertNotHasRulesetDirective($sniffCode, $key); - - }//end testShouldProcessMessageCsonly() + } /** @@ -229,8 +223,7 @@ public function testShouldProcessMessageCbfonly() // Verify that the CBF-only message directive IS applied. $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration'; $this->assertRulesetPropertySame('A different warning but only for phpcbf', $sniffCode, $key); - - }//end testShouldProcessMessageCbfonly() + } /** @@ -260,8 +253,7 @@ public function testShouldProcessIncludePatternCsonly() // Verify that the CBF-only include-pattern directive is NOT applied. $sniffCode = 'PSR2.Files.ClosingTag'; $this->assertArrayNotHasKey($sniffCode, self::$ruleset->includePatterns, "Sniff $sniffCode was registered"); - - }//end testShouldProcessIncludePatternCsonly() + } /** @@ -293,8 +285,7 @@ public function testShouldProcessIncludePatternCbfonly() $sniffCode = 'PSR2.Files.ClosingTag'; $this->assertArrayHasKey($sniffCode, self::$ruleset->includePatterns, "Sniff $sniffCode not registered"); $this->assertArrayHasKey($includedKey, self::$ruleset->includePatterns[$sniffCode], "Include pattern for sniff $sniffCode not registered"); - - }//end testShouldProcessIncludePatternCbfonly() + } /** @@ -324,8 +315,7 @@ public function testShouldProcessExcludePatternCsonly() // Verify that the CBF-only exclude-pattern directive is NOT applied. $sniffCode = 'PSR2.Methods.FunctionClosingBrace'; $this->assertArrayNotHasKey($sniffCode, self::$ruleset->ignorePatterns, "Sniff $sniffCode was registered"); - - }//end testShouldProcessExcludePatternCsonly() + } /** @@ -357,8 +347,7 @@ public function testShouldProcessExcludePatternCbfonly() $sniffCode = 'PSR2.Methods.FunctionClosingBrace'; $this->assertArrayHasKey($sniffCode, self::$ruleset->ignorePatterns, "Sniff $sniffCode not registered"); $this->assertArrayHasKey($excludedKey, self::$ruleset->ignorePatterns[$sniffCode], "Ignore pattern for sniff $sniffCode not registered"); - - }//end testShouldProcessExcludePatternCbfonly() + } /** @@ -393,8 +382,7 @@ public function testShouldProcessPropertiesCsonly() $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName; $this->assertSame($propertyDefault, $actualValue, 'cbf-only property change directive was applied'); - - }//end testShouldProcessPropertiesCsonly() + } /** @@ -431,8 +419,7 @@ public function testShouldProcessPropertiesCbfonly() $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName; $this->assertSame($propertyChanged, $actualValue, 'cbf-only property change directive not applied'); - - }//end testShouldProcessPropertiesCbfonly() + } /** @@ -473,8 +460,7 @@ public function testShouldProcessPropertyCsonly() $this->assertXObjectHasProperty($propertyName, $sniffObject); $this->assertSame($expectedDefault, $sniffObject->$propertyName, 'cbf-only property change directive was applied'); - - }//end testShouldProcessPropertyCsonly() + } /** @@ -517,8 +503,7 @@ public function testShouldProcessPropertyCbfonly() $this->assertXObjectHasProperty($propertyName, $sniffObject); $this->assertSame($expected, $sniffObject->$propertyName, 'cbf-only property change directive not applied'); - - }//end testShouldProcessPropertyCbfonly() + } /** @@ -545,8 +530,7 @@ public function testShouldProcessElementCsonly() ]; $this->verifyShouldProcessElement($expected); - - }//end testShouldProcessElementCsonly() + } /** @@ -575,8 +559,7 @@ public function testShouldProcessElementCbfonly() ]; $this->verifyShouldProcessElement($expected); - - }//end testShouldProcessElementCbfonly() + } /** @@ -601,8 +584,7 @@ private function verifyShouldProcessElement($expected) // Verify the value. $actualValue = $sniffObject->$propertyName; $this->assertSame($expected, $actualValue, 'Selective element directives not applied correctly'); - - }//end verifyShouldProcessElement() + } /** @@ -618,8 +600,7 @@ private function assertHasRulesetDirective($sniffCode, $key) $this->assertArrayHasKey($sniffCode, self::$ruleset->ruleset, "Sniff $sniffCode not registered"); $this->assertIsArray(self::$ruleset->ruleset[$sniffCode], "Sniff $sniffCode is not an array"); $this->assertArrayHasKey($key, self::$ruleset->ruleset[$sniffCode], "Directive $key not registered for sniff $sniffCode"); - - }//end assertHasRulesetDirective() + } /** @@ -638,8 +619,7 @@ private function assertNotHasRulesetDirective($sniffCode, $key) ) { $this->fail("Directive $key is registered for sniff $sniffCode"); } - - }//end assertNotHasRulesetDirective() + } /** @@ -657,8 +637,5 @@ private function assertRulesetPropertySame($expected, $sniffCode, $key) $actual = self::$ruleset->ruleset[$sniffCode][$key]; $this->assertSame($expected, $actual, "Value for $key on sniff $sniffCode does not meet expectations"); - - }//end assertRulesetPropertySame() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php index 8f7b4a9781..04626733a6 100644 --- a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php +++ b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php @@ -81,8 +81,7 @@ public function testShouldProcessAutoloadCsonly() $diff, 'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was loaded, while it shouldn\'t have been' ); - - }//end testShouldProcessAutoloadCsonly() + } /** @@ -139,8 +138,7 @@ public function testShouldProcessAutoloadCbfonly() $diff, 'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was not loaded' ); - - }//end testShouldProcessAutoloadCbfonly() + } /** @@ -157,8 +155,5 @@ public function testFileNotFoundException() $standard = __DIR__ . '/ProcessRulesetAutoloadFileNotFoundTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testFileNotFoundException() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php index 2f2f422dbe..479ac45973 100644 --- a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php +++ b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php @@ -47,8 +47,7 @@ public function testBrokenRulesetEmptyFile() $this->expectRuntimeExceptionRegex($regex); new Ruleset($config); - - }//end testBrokenRulesetEmptyFile() + } /** @@ -67,8 +66,7 @@ public function testBrokenRulesetSingleError() $this->expectRuntimeExceptionRegex($regex); new Ruleset($config); - - }//end testBrokenRulesetSingleError() + } /** @@ -89,8 +87,5 @@ public function testBrokenRulesetMultiError() $this->expectRuntimeExceptionRegex($regex); new Ruleset($config); - - }//end testBrokenRulesetMultiError() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php index bd3a0261a7..7a4a600e77 100644 --- a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php +++ b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php @@ -48,8 +48,7 @@ protected function setUp(): void self::$config = new ConfigDouble(["--standard=$standard"]); new Ruleset(self::$config); } - - }//end setUp() + } /** @@ -66,8 +65,7 @@ public static function tearDownAfterClass(): void if (isset(self::$config) === true) { self::$config->__destruct(); } - - }//end tearDownAfterClass() + } /** @@ -88,8 +86,7 @@ public static function tearDownAfterClass(): void public function testCliArgs($name, $expected) { $this->assertSame($expected, self::$config->{$name}); - - }//end testCliArgs() + } /** @@ -152,8 +149,7 @@ public static function dataCliArgs() 'expected' => 120, ], ]; - - }//end dataCliArgs() + } /** @@ -173,8 +169,7 @@ public function testCliArgsWithPaths($name, $expected) $actual = $this->normalizeSlashes(self::$config->{$name}); $this->assertSame($expected, $actual); - - }//end testCliArgsWithPaths() + } /** @@ -210,8 +205,7 @@ public static function dataCliArgsWithPaths() } return $data; - - }//end dataCliArgsWithPaths() + } /** @@ -232,8 +226,5 @@ private function normalizeSlashes($path) } return str_replace(DIRECTORY_SEPARATOR, '/', $path); - - }//end normalizeSlashes() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php index 292e869172..d05642c0a1 100644 --- a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php +++ b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php @@ -49,8 +49,7 @@ protected function setUp(): void self::$config = new ConfigDouble(["--standard=$standardA,$standardB"]); new Ruleset(self::$config); } - - }//end setUp() + } /** @@ -67,8 +66,7 @@ public static function tearDownAfterClass(): void if (isset(self::$config) === true) { self::$config->__destruct(); } - - }//end tearDownAfterClass() + } /** @@ -89,8 +87,7 @@ public static function tearDownAfterClass(): void public function testConfigDirectives($name, $expected) { $this->assertSame($expected, self::$config->getConfigData($name)); - - }//end testConfigDirectives() + } /** @@ -146,8 +143,5 @@ public static function dataConfigDirectives() 'expected' => 'grandchild B', ], ]; - - }//end dataConfigDirectives() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php index 44b4c8439c..1d90912c38 100644 --- a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php +++ b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php @@ -64,8 +64,7 @@ public static function setUpBeforeClass(): void self::$originalIniValues[$name] = $value; } } - - }//end setUpBeforeClass() + } /** @@ -83,8 +82,7 @@ protected function setUp(): void self::$initialized = true; } - - }//end setUp() + } /** @@ -101,8 +99,7 @@ public static function tearDownAfterClass(): void ini_set($name, $value); } - - }//end tearDownAfterClass() + } /** @@ -123,8 +120,7 @@ public static function tearDownAfterClass(): void public function testIniDirectives($name, $expected) { $this->assertSame($expected, ini_get($name)); - - }//end testIniDirectives() + } /** @@ -168,8 +164,5 @@ public static function dataIniDirectives() 'expected' => 'grandchild A', ], ]; - - }//end dataIniDirectives() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php index dd5d7101fc..f6f7f6b115 100644 --- a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php +++ b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php @@ -47,8 +47,7 @@ protected function tearDown(): void if (is_string($this->originalValue) === true) { @ini_set($this->currentOption, $this->originalValue); } - - }//end tearDown() + } /** @@ -67,8 +66,7 @@ public function testIniValueIsUpdated() new Ruleset(new ConfigDouble(['.', '--standard=' . __DIR__ . '/IniSetSuccessTest.xml'])); $this->assertSame($expected, ini_get($this->currentOption)); - - }//end testIniValueIsUpdated() + } /** @@ -102,8 +100,7 @@ public function testIniValueCannotBeUpdatedAtRuntime($standard, $option, $expect // Make sure the value didn't get set. $this->assertNotSame($expected, ini_get($option), 'Setting the ini value should not have worked, the test is broken'); - - }//end testIniValueCannotBeUpdatedAtRuntime() + } /** @@ -132,8 +129,5 @@ public static function dataIniValueCannotBeUpdatedAtRuntime() 'expected' => '200', ], ]; - - }//end dataIniValueCannotBeUpdatedAtRuntime() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php index 2606ea48b2..f9dc426f1c 100644 --- a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php +++ b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php @@ -62,8 +62,7 @@ public static function setUpBeforeClass(): void self::$originalIniValues[$name] = $value; } } - - }//end setUpBeforeClass() + } /** @@ -79,8 +78,7 @@ protected function setUp(): void self::$config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset(self::$config); } - - }//end setUp() + } /** @@ -105,8 +103,7 @@ public static function tearDownAfterClass(): void ini_set($name, $value); } - - }//end tearDownAfterClass() + } /** @@ -124,8 +121,7 @@ public function testShouldProcessConfigCsonly() $this->assertSame('true', Config::getConfigData('neither'), 'Non-selective config directive was not applied.'); $this->assertSame('true', Config::getConfigData('csOnly'), 'CS-only config directive was not applied.'); $this->assertSame(null, Config::getConfigData('cbfOnly'), 'CBF-only config directive was applied, while it shouldn\'t have been.'); - - }//end testShouldProcessConfigCsonly() + } /** @@ -145,8 +141,7 @@ public function testShouldProcessConfigCbfonly() $this->assertSame('true', Config::getConfigData('neither'), 'Non-selective config directive was not applied.'); $this->assertSame(null, Config::getConfigData('csOnly'), 'CS-only config directive was applied, while it shouldn\'t have been.'); $this->assertSame('true', Config::getConfigData('cbfOnly'), 'CBF-only config directive was not applied.'); - - }//end testShouldProcessConfigCbfonly() + } /** @@ -172,8 +167,7 @@ public function testShouldProcessArgCsonly() $this->assertTrue(self::$config->showSources, 'Non-selective short arg directive was not applied [2].'); $this->assertTrue(self::$config->colors, 'CS-only arg directive was not applied.'); $this->assertSame($expectedReports, self::$config->reports, 'CBF-only arg directive was applied, while it shouldn\'t have been.'); - - }//end testShouldProcessArgCsonly() + } /** @@ -201,8 +195,7 @@ public function testShouldProcessArgCbfonly() $this->assertTrue(self::$config->showSources, 'Non-selective short arg directive was not applied [2].'); $this->assertFalse(self::$config->colors, 'CS-only arg directive was applied, while it shouldn\'t have been.'); $this->assertSame($expectedReports, self::$config->reports, 'CBF-only arg directive was not applied.'); - - }//end testShouldProcessArgCbfonly() + } /** @@ -222,8 +215,7 @@ public function testShouldProcessIniCsonly() $this->assertSame('2', ini_get('bcmath.scale'), 'Non-selective ini directive was not applied.'); $this->assertSame('path/to/docs/', ini_get('docref_root'), 'CS-only ini directive was not applied.'); $this->assertSame('', ini_get('user_agent'), 'CBF-only ini directive was applied, while it shouldn\'t have been.'); - - }//end testShouldProcessIniCsonly() + } /** @@ -244,8 +236,7 @@ public function testShouldProcessIniCbfonly() $this->assertSame('2', ini_get('bcmath.scale'), 'Non-selective ini directive was not applied.'); $this->assertSame('', ini_get('docref_root'), 'CS-only ini directive was applied, while it shouldn\'t have been..'); $this->assertSame('Never mind', ini_get('user_agent'), 'CBF-only ini directive was not applied.'); - - }//end testShouldProcessIniCbfonly() + } /** @@ -266,8 +257,7 @@ public function testShouldProcessExcludePatternCsonly() ]; $this->assertSame($expected, self::$ruleset->ignorePatterns); - - }//end testShouldProcessExcludePatternCsonly() + } /** @@ -290,8 +280,7 @@ public function testShouldProcessExcludePatternCbfonly() ]; $this->assertSame($expected, self::$ruleset->ignorePatterns); - - }//end testShouldProcessExcludePatternCbfonly() + } /** @@ -309,8 +298,7 @@ public function testShouldProcessRuleCsonly() $this->assertArrayHasKey('PEAR.Formatting.MultiLineAssignment', self::$ruleset->sniffCodes); $this->assertArrayHasKey('Generic.Arrays.ArrayIndent', self::$ruleset->sniffCodes); $this->assertArrayNotHasKey('PSR2.Classes.ClassDeclaration', self::$ruleset->sniffCodes); - - }//end testShouldProcessRuleCsonly() + } /** @@ -330,8 +318,7 @@ public function testShouldProcessRuleCbfonly() $this->assertArrayHasKey('PEAR.Formatting.MultiLineAssignment', self::$ruleset->sniffCodes); $this->assertArrayNotHasKey('Generic.Arrays.ArrayIndent', self::$ruleset->sniffCodes); $this->assertArrayHasKey('PSR2.Classes.ClassDeclaration', self::$ruleset->sniffCodes); - - }//end testShouldProcessRuleCbfonly() + } /** @@ -353,8 +340,7 @@ public function testShouldProcessRuleExcludeCsonly() ]; $this->assertSame($expected, self::$ruleset->ruleset); - - }//end testShouldProcessRuleExcludeCsonly() + } /** @@ -378,8 +364,5 @@ public function testShouldProcessRuleExcludeCbfonly() ]; $this->assertSame($expected, self::$ruleset->ruleset); - - }//end testShouldProcessRuleExcludeCbfonly() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ProcessRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetTest.php index 344a237db4..ab0f83e421 100644 --- a/tests/Core/Ruleset/ProcessRulesetTest.php +++ b/tests/Core/Ruleset/ProcessRulesetTest.php @@ -38,8 +38,7 @@ public function testSniffsFileNotDirectory() $expected = ['Generic.PHP.BacktickOperator' => 'PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\BacktickOperatorSniff']; $this->assertSame($expected, $ruleset->sniffCodes); - - }//end testSniffsFileNotDirectory() + } /** @@ -84,8 +83,7 @@ public function testAutoExpandSniffsDirectory() ksort($actual); $this->assertSame($expected, $actual); - - }//end testAutoExpandSniffsDirectory() + } /** @@ -111,8 +109,7 @@ public function testExcludeSniffGroup() ksort($actual); $this->assertSame($expected, $actual); - - }//end testExcludeSniffGroup() + } /* @@ -139,8 +136,7 @@ public function testIniWithoutValue() } $this->assertSame('1', $actualValue); - - }//end testIniWithoutValue() + } /** @@ -168,8 +164,7 @@ public function testIncludeSingleErrorCode() $this->assertIsArray($ruleset->ruleset[$sniffCode], "Sniff $sniffCode is not an array"); $this->assertArrayHasKey($key, $ruleset->ruleset[$sniffCode], "Directive $key not registered for sniff $sniffCode"); $this->assertSame(5, $ruleset->ruleset[$sniffCode][$key], "$key has unexpected value for sniff $sniffCode"); - - }//end testIncludeSingleErrorCode() + } /** @@ -202,8 +197,7 @@ public function testErrorCodeIncludeAfterExclude() $this->assertIsArray($ruleset->ruleset[$sniffCode], "Sniff $sniffCode is not an array"); $this->assertArrayHasKey($key, $ruleset->ruleset[$sniffCode], "Directive $key not registered for sniff $sniffCode"); $this->assertSame(5, $ruleset->ruleset[$sniffCode][$key], "$key has unexpected value for sniff $sniffCode"); - - }//end testErrorCodeIncludeAfterExclude() + } /** @@ -219,8 +213,7 @@ public function testRuleWithoutRefIsIgnored() $sniffCode = 'Generic.Metrics.CyclomaticComplexity'; $this->assertArrayNotHasKey($sniffCode, $ruleset->sniffCodes, "Sniff $sniffCode registered"); $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted"); - - }//end testRuleWithoutRefIsIgnored() + } /** @@ -239,8 +232,7 @@ public function testRuleExcludeWithoutNameIsIgnored() $sniffCode = 'Generic.PHP.BacktickOperator.Found'; $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted"); - - }//end testRuleExcludeWithoutNameIsIgnored() + } /** @@ -260,8 +252,5 @@ private function getMiscRuleset() } return $ruleset; - - }//end getMiscRuleset() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php index cdff278cd3..9dcb04f626 100644 --- a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php +++ b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php @@ -47,8 +47,5 @@ public function testUsingOldSchoolArrayFormatThrowsError() $standard = __DIR__ . '/PropertyTypeHandlingOldArrayFormatTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testUsingOldSchoolArrayFormatThrowsError() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/PropertyTypeHandlingTest.php b/tests/Core/Ruleset/PropertyTypeHandlingTest.php index 37e6a667ff..5627137b11 100644 --- a/tests/Core/Ruleset/PropertyTypeHandlingTest.php +++ b/tests/Core/Ruleset/PropertyTypeHandlingTest.php @@ -55,8 +55,7 @@ public function testTypeHandlingWhenSetViaRuleset($propertyName, $expected) $sniffObject = $this->getSniffObjectForRuleset(); $this->assertSame($expected, $sniffObject->$propertyName); - - }//end testTypeHandlingWhenSetViaRuleset() + } /** @@ -74,8 +73,7 @@ public function testTypeHandlingWhenSetInline($propertyName, $expected) $sniffObject = $this->getSniffObjectAfterProcessingFile(); $this->assertSame($expected, $sniffObject->$propertyName); - - }//end testTypeHandlingWhenSetInline() + } /** @@ -189,8 +187,7 @@ public static function dataTypeHandling() 'expected' => [null], ], ]; - - }//end dataTypeHandling() + } /** @@ -296,8 +293,7 @@ public static function dataArrayPropertyExtending() 'expected' => 'some value', ], ]; - - }//end dataArrayPropertyExtending() + } /** @@ -326,8 +322,7 @@ private function getSniffObjectForRuleset() } return $sniffObject; - - }//end getSniffObjectForRuleset() + } /** @@ -363,8 +358,5 @@ private function getSniffObjectAfterProcessingFile() } return $sniffObject; - - }//end getSniffObjectAfterProcessingFile() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php index 580ff4e0c0..0e2f86234c 100644 --- a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php +++ b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php @@ -36,8 +36,7 @@ public function testNoNoticesForSniffsImplementingInterface() $this->expectOutputString(''); new Ruleset($config); - - }//end testNoNoticesForSniffsImplementingInterface() + } /** @@ -58,8 +57,5 @@ public function testErrorWhenSniffDoesntImplementInterface() $this->expectRuntimeExceptionMessage($expected); new Ruleset($config); - - }//end testErrorWhenSniffDoesntImplementInterface() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php index c06385faab..af647ac98c 100644 --- a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php +++ b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php @@ -39,8 +39,7 @@ public static function setUpBeforeClass(): void // Set up the ruleset. $standard = __DIR__ . '/RegisterSniffsRemovedTokenizersTest.xml'; self::$config = new ConfigDouble(["--standard=$standard"]); - - }//end setUpBeforeClass() + } /** @@ -66,8 +65,7 @@ public function testUnsupportedTokenizersTriggerError($expected) $this->expectRuntimeExceptionRegex($expected); new Ruleset(self::$config); - - }//end testUnsupportedTokenizersTriggerError() + } /** @@ -99,8 +97,5 @@ public static function dataUnsupportedTokenizersTriggerError() 'expected' => sprintf($message, 'TestStandard.SupportedTokenizers.ListensForUnrecognizedTokenizers', 'SCSS, TypeScript'), ], ]; - - }//end dataUnsupportedTokenizersTriggerError() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RegisterSniffsTest.php b/tests/Core/Ruleset/RegisterSniffsTest.php index 28af8f5dc2..8c7a9de27c 100644 --- a/tests/Core/Ruleset/RegisterSniffsTest.php +++ b/tests/Core/Ruleset/RegisterSniffsTest.php @@ -82,8 +82,7 @@ public static function setUpBeforeClass(): void $standardsDir .= 'src' . DIRECTORY_SEPARATOR . 'Standards' . DIRECTORY_SEPARATOR; self::$psr1SniffAbsolutePaths = self::relativeToAbsoluteSniffFiles($standardsDir, self::$psr1SniffFiles); - - }//end setUpBeforeClass() + } /** @@ -104,8 +103,7 @@ public static function relativeToAbsoluteSniffFiles($baseDir, $relativePaths) } return $fileList; - - }//end relativeToAbsoluteSniffFiles() + } /** @@ -117,8 +115,7 @@ protected function setUp(): void { // Clear out the Ruleset::$sniffs property. self::$ruleset->sniffs = []; - - }//end setUp() + } /** @@ -133,8 +130,7 @@ public function testRegisteredSniffsShouldBeTheSame() // Make sure the same sniff list was recreated (but without the objects having been created yet). $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs)); $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs)); - - }//end testRegisteredSniffsShouldBeTheSame() + } /** @@ -162,8 +158,7 @@ public function testRegisteredSniffsWithRestrictions() sort($actual); $this->assertSame($expected, $actual); - - }//end testRegisteredSniffsWithRestrictions() + } /** @@ -193,8 +188,7 @@ public function testRegisteredSniffsWithExclusions() sort($actual); $this->assertSame($expected, $actual); - - }//end testRegisteredSniffsWithExclusions() + } /** @@ -226,8 +220,7 @@ public function testRegisteredSniffsBothRestrictionsAndExclusions() self::$ruleset->registerSniffs(self::$psr1SniffAbsolutePaths, $restrictions, $exclusions); $this->assertSame($expected, array_keys(self::$ruleset->sniffs)); - - }//end testRegisteredSniffsBothRestrictionsAndExclusions() + } /** @@ -254,8 +247,7 @@ public function testRegisterSniffsFiltersOutAbstractClasses() // Make sure the same sniff list was recreated (but without the objects having been created yet). $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs)); $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs)); - - }//end testRegisterSniffsFiltersOutAbstractClasses() + } /** @@ -282,8 +274,5 @@ public function testRegisteredSniffsFiltersOutFilePathsWithoutSniffsDir() // Make sure the same sniff list was recreated (but without the objects having been created yet). $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs)); $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs)); - - }//end testRegisteredSniffsFiltersOutFilePathsWithoutSniffsDir() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php index f8e86f2939..2c0b9b7dbe 100644 --- a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php +++ b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php @@ -71,8 +71,7 @@ protected function setUp(): void // Initialize the config and ruleset objects for the test. $config = new ConfigDouble(["--standard={$this->standard}"]); $this->ruleset = new Ruleset($config); - - }//end setUp() + } /** @@ -83,8 +82,7 @@ protected function setUp(): void protected function tearDown(): void { file_put_contents($this->standard, $this->contents); - - }//end tearDown() + } /** @@ -108,8 +106,5 @@ public function testLinuxStylePathRuleInclusion() '10', $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff']->spacing ); - - }//end testLinuxStylePathRuleInclusion() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php index 589a983dd0..a7193d7728 100644 --- a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php +++ b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php @@ -68,8 +68,7 @@ protected function setUp(): void // Initialize the config and ruleset objects for the test. $config = new ConfigDouble(["--standard={$this->standard}"]); $this->ruleset = new Ruleset($config); - - }//end setUp() + } /** @@ -80,8 +79,7 @@ protected function setUp(): void protected function tearDown(): void { file_put_contents($this->standard, $this->contents); - - }//end tearDown() + } /** @@ -105,8 +103,5 @@ public function testWindowsStylePathRuleInclusion() '10', $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterCastSniff']->spacing ); - - }//end testWindowsStylePathRuleInclusion() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/RuleInclusionTest.php b/tests/Core/Ruleset/RuleInclusionTest.php index 672d596ca0..ce0fb95d6c 100644 --- a/tests/Core/Ruleset/RuleInclusionTest.php +++ b/tests/Core/Ruleset/RuleInclusionTest.php @@ -75,8 +75,7 @@ protected function setUp(): void $config = new ConfigDouble(["--standard=$standard"]); self::$ruleset = new Ruleset($config); }//end if - - }//end setUp() + } /** @@ -87,8 +86,7 @@ protected function setUp(): void public function tearDown(): void { file_put_contents(self::$standard, self::$contents); - - }//end tearDown() + } /** @@ -99,8 +97,7 @@ public function tearDown(): void public function testHasSniffCodes() { $this->assertCount(49, self::$ruleset->sniffCodes); - - }//end testHasSniffCodes() + } /** @@ -117,8 +114,7 @@ public function testRegisteredSniffCodes($key, $value) { $this->assertArrayHasKey($key, self::$ruleset->sniffCodes); $this->assertSame($value, self::$ruleset->sniffCodes[$key]); - - }//end testRegisteredSniffCodes() + } /** @@ -328,8 +324,7 @@ public static function dataRegisteredSniffCodes() 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff', ], ]; - - }//end dataRegisteredSniffCodes() + } /** @@ -351,8 +346,7 @@ public function testSettingProperties($sniffClass, $propertyName, $expectedValue $actualValue = self::$ruleset->sniffs[$sniffClass]->$propertyName; $this->assertSame($expectedValue, $actualValue); - - }//end testSettingProperties() + } /** @@ -418,8 +412,7 @@ public static function dataSettingProperties() 'expectedValue' => 10, ], ]; - - }//end dataSettingProperties() + } /** @@ -437,8 +430,7 @@ public function testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFail { $this->assertArrayHasKey($sniffClass, self::$ruleset->sniffs, 'Sniff class ' . $sniffClass . ' not listed in registered sniffs'); $this->assertXObjectNotHasProperty($propertyName, self::$ruleset->sniffs[$sniffClass]); - - }//end testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails() + } /** @@ -468,8 +460,5 @@ public static function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilen 'propertyName' => 'setforsquizfilessniffs', ], ]; - - }//end dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/SetSniffPropertyTest.php b/tests/Core/Ruleset/SetSniffPropertyTest.php index 723fa32feb..9ccaae6a31 100644 --- a/tests/Core/Ruleset/SetSniffPropertyTest.php +++ b/tests/Core/Ruleset/SetSniffPropertyTest.php @@ -63,8 +63,7 @@ public function testSniffPropertiesGetSetWhenAllowed($name) foreach ($properties as $name => $expectedValue) { $this->assertSame($expectedValue, $sniffObject->$name, 'Property value not set to expected value'); } - - }//end testSniffPropertiesGetSetWhenAllowed() + } /** @@ -81,8 +80,7 @@ public static function dataSniffPropertiesGetSetWhenAllowed() 'Property allowed as sniff extends stdClass' => ['AllowedViaStdClass'], 'Property allowed as sniff has magic __set() method' => ['AllowedViaMagicMethod'], ]; - - }//end dataSniffPropertiesGetSetWhenAllowed() + } /** @@ -123,8 +121,7 @@ public function testSetPropertyAppliesPropertyToMultipleSniffsInCategory() $hasProperty = (new ReflectionObject($ruleset->sniffs[$sniffClass]))->hasProperty($propertyName); $errorMsg = sprintf('Property %s registered for sniff %s which does not support it', $propertyName, $sniffClass); $this->assertFalse($hasProperty, $errorMsg); - - }//end testSetPropertyAppliesPropertyToMultipleSniffsInCategory() + } /** @@ -142,8 +139,7 @@ public function testSetPropertyThrowsErrorOnInvalidProperty() $standard = __DIR__ . '/SetPropertyThrowsErrorOnInvalidPropertyTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testSetPropertyThrowsErrorOnInvalidProperty() + } /** @@ -162,8 +158,7 @@ public function testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute() $standard = __DIR__ . '/SetPropertyNotAllowedViaAttributeTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute() + } /** @@ -180,8 +175,7 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStand $standard = __DIR__ . '/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandardTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandard() + } /** @@ -198,8 +192,7 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCateg $standard = __DIR__ . '/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategoryTest.xml'; $config = new ConfigDouble(["--standard=$standard"]); new Ruleset($config); - - }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategory() + } /** @@ -231,8 +224,7 @@ public function testDirectCallIgnoredPropertyForUnusedSniff() // Verify that our target sniff has NOT been registered after attempting to set the property. $this->assertArrayNotHasKey($sniffCode, $ruleset->sniffCodes, 'Unused sniff was registered in sniffCodes, but shouldn\'t have been'); $this->assertArrayNotHasKey($sniffClass, $ruleset->sniffs, 'Unused sniff was registered in sniffs, but shouldn\'t have been'); - - }//end testDirectCallIgnoredPropertyForUnusedSniff() + } /** @@ -276,8 +268,5 @@ public function testDirectCallWithNewArrayFormatSetsProperty() $sniffObject = $ruleset->sniffs[$sniffClass]; $this->assertSame($propertyValue, $sniffObject->$propertyName, 'Property value not set to expected value'); - - }//end testDirectCallWithNewArrayFormatSetsProperty() - - -}//end class + } +} diff --git a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php index 4f1c0300c3..8fe243690d 100644 --- a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php +++ b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php @@ -41,8 +41,7 @@ public function testHasSniffDeprecations($standard, $expected) $ruleset = new Ruleset($config); $this->assertSame($expected, $ruleset->hasSniffDeprecations()); - - }//end testHasSniffDeprecations() + } /** @@ -64,8 +63,7 @@ public static function dataHasSniffDeprecations() 'expected' => true, ], ]; - - }//end dataHasSniffDeprecations() + } /** @@ -92,8 +90,7 @@ public function testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs = $ruleset->showSniffDeprecations(); $this->assertStderrOutputSameString(''); - - }//end testDeprecatedSniffsListDoesNotShow() + } /** @@ -118,8 +115,7 @@ public static function dataDeprecatedSniffsListDoesNotShow() 'additionalArgs' => ['-q'], ], ]; - - }//end dataDeprecatedSniffsListDoesNotShow() + } /** @@ -141,8 +137,7 @@ public function testDeprecatedSniffsListDoesNotShowNeedsCsMode($standard, $addit } $this->testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs); - - }//end testDeprecatedSniffsListDoesNotShowNeedsCsMode() + } /** @@ -160,8 +155,7 @@ public static function dataDeprecatedSniffsListDoesNotShowNeedsCsMode() 'additionalArgs' => ['--generator=text'], ], ]; - - }//end dataDeprecatedSniffsListDoesNotShowNeedsCsMode() + } /** @@ -186,8 +180,7 @@ public function testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDepre $ruleset->showSniffDeprecations(); $this->assertStderrOutputSameString(''); - - }//end testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDeprecated() + } /** @@ -219,8 +212,7 @@ public function testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExc $ruleset->showSniffDeprecations(); $this->assertStderrOutputSameString(''); - - }//end testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExcluded() + } /** @@ -286,8 +278,7 @@ public function testDeprecatedSniffsWarning() $ruleset->showSniffDeprecations(); $this->assertStderrOutputSameString($expected); - - }//end testDeprecatedSniffsWarning() + } /** @@ -318,8 +309,7 @@ public function testReportWidthIsRespected($reportWidth, $expectedOutput) $ruleset->showSniffDeprecations(); $this->assertStderrOutputSameString($expectedOutput); - - }//end testReportWidthIsRespected() + } /** @@ -401,8 +391,7 @@ public static function dataReportWidthIsRespected() ], ]; // phpcs:enable - - }//end dataReportWidthIsRespected() + } /** @@ -447,8 +436,7 @@ public function testDeprecatedSniffsAreListedAlphabetically() $ruleset->sniffCodes, 'WithReplacement sniff not registered' ); - - }//end testDeprecatedSniffsAreListedAlphabetically() + } /** @@ -472,8 +460,7 @@ public function testExceptionIsThrownOnIncorrectlyImplementedInterface($standard $ruleset = new Ruleset($config); $ruleset->showSniffDeprecations(); - - }//end testExceptionIsThrownOnIncorrectlyImplementedInterface() + } /** @@ -507,8 +494,5 @@ public static function dataExceptionIsThrownOnIncorrectlyImplementedInterface() 'exceptionMessage' => 'ERROR: The Fixtures\TestStandard\Sniffs\DeprecatedInvalid\EmptyRemovalVersionSniff::getRemovalVersion() method must return a non-empty string, received ""', ], ]; - - }//end dataExceptionIsThrownOnIncorrectlyImplementedInterface() - - -}//end class + } +} diff --git a/tests/Core/Runner/AbstractRunnerTestCase.php b/tests/Core/Runner/AbstractRunnerTestCase.php index ae5905bc68..7f4f2c9e8b 100644 --- a/tests/Core/Runner/AbstractRunnerTestCase.php +++ b/tests/Core/Runner/AbstractRunnerTestCase.php @@ -16,4 +16,4 @@ abstract class AbstractRunnerTestCase extends AbstractRealConfigTestCase { -}//end class +} diff --git a/tests/Core/Runner/PrintProgressDotsTest.php b/tests/Core/Runner/PrintProgressDotsTest.php index d53cdb30c6..3ee3f8de54 100644 --- a/tests/Core/Runner/PrintProgressDotsTest.php +++ b/tests/Core/Runner/PrintProgressDotsTest.php @@ -44,8 +44,7 @@ public function testProgressDotCs($colors, $code, $sniffs, $expected) } $this->checkProgressDot($colors, $code, $sniffs, $expected); - - }//end testProgressDotCs() + } /** @@ -106,8 +105,7 @@ public static function dataProgressDotCs() 'expected' => "\033[32m" . 'W' . "\033[0m", ], ]; - - }//end dataProgressDotCs() + } /** @@ -131,8 +129,7 @@ public function testProgressDotCbf($colors, $code, $sniffs, $expected) } $this->checkProgressDot($colors, $code, $sniffs, $expected, true); - - }//end testProgressDotCbf() + } /** @@ -181,8 +178,7 @@ public static function dataProgressDotCbf() 'expected' => "\033[31m" . 'E' . "\033[0m", ], ]; - - }//end dataProgressDotCbf() + } /** @@ -219,8 +215,5 @@ private function checkProgressDot($colors, $code, $sniffs, $expected, $enableFix $runner->printProgress($file, 2, 1); $this->assertStderrOutputSameString($expected); - - }//end checkProgressDot() - - -}//end class + } +} diff --git a/tests/Core/Runner/PrintProgressTest.php b/tests/Core/Runner/PrintProgressTest.php index fed0fb0f1d..76c4d99b21 100644 --- a/tests/Core/Runner/PrintProgressTest.php +++ b/tests/Core/Runner/PrintProgressTest.php @@ -72,8 +72,7 @@ public static function setUpBeforeClass(): void $content = 'process(); - - }//end setUpBeforeClass() + } /** @@ -88,8 +87,7 @@ protected function tearDown(): void // Reset all static properties on the StatusWriter class. $this->resetStatusWriterProperties(); - - }//end tearDown() + } /** @@ -104,8 +102,7 @@ public static function tearDownAfterClass(): void // preventing the destructor from running the clean up (which without stray references would be // automagically triggered when this object is destroyed, but we can't definitively rely on that). self::$config->__destruct(); - - }//end tearDownAfterClass() + } /** @@ -124,8 +121,7 @@ public function testNoProgressIsShownWhenDisabled() } $this->assertStderrOutputSameString(''); - - }//end testNoProgressIsShownWhenDisabled() + } /** @@ -149,8 +145,7 @@ public function testProgressDotSkippedFiles() } $this->assertStderrOutputSameString('.S.S.S.S.S 10 / 10 (100%)' . PHP_EOL); - - }//end testProgressDotSkippedFiles() + } /** @@ -172,8 +167,7 @@ public function testEndOfLineSummary($nrOfFiles, $expected) } $this->assertStderrOutputSameString($expected); - - }//end testEndOfLineSummary() + } /** @@ -233,8 +227,5 @@ public static function dataEndOfLineSummary() ], ]; // phpcs:enable - - }//end dataEndOfLineSummary() - - -}//end class + } +} diff --git a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php index 9390b293e7..897ef3a260 100644 --- a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php +++ b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php @@ -44,8 +44,7 @@ public function testPhpcs($sourceDir, $extraArgs) $runner->runPHPCS(); $this->verifyOutput(); - - }//end testPhpcs() + } /** @@ -71,8 +70,7 @@ public function testPhpcbf($sourceDir, $extraArgs) $runner->runPHPCBF(); $this->verifyOutput(); - - }//end testPhpcbf() + } /** @@ -92,8 +90,7 @@ public static function data() 'extraArgs' => ['--ignore=/place*\.php'], ], ]; - - }//end data() + } /** @@ -118,8 +115,7 @@ private function setupTest($sourceDir, $extraArgs) } $this->expectNoStdoutOutput(); - - }//end setupTest() + } /** @@ -133,8 +129,5 @@ private function verifyOutput() $expected .= 'All specified files were excluded or did not match filtering rules.' . PHP_EOL . PHP_EOL; $this->assertStderrOutputSameString($expected); - - }//end verifyOutput() - - -}//end class + } +} diff --git a/tests/Core/Runner/RunPHPCSExplainTest.php b/tests/Core/Runner/RunPHPCSExplainTest.php index ea0eb71de1..d702028e52 100644 --- a/tests/Core/Runner/RunPHPCSExplainTest.php +++ b/tests/Core/Runner/RunPHPCSExplainTest.php @@ -66,8 +66,5 @@ public function testExplainWillExplainEachStandardSeparately() $runner = new Runner(); $runner->runPHPCS(); - - }//end testExplainWillExplainEachStandardSeparately() - - -}//end class + } +} diff --git a/tests/Core/Runner/RunPHPCSGeneratorTest.php b/tests/Core/Runner/RunPHPCSGeneratorTest.php index 803cf776f5..bd46cbb3cc 100644 --- a/tests/Core/Runner/RunPHPCSGeneratorTest.php +++ b/tests/Core/Runner/RunPHPCSGeneratorTest.php @@ -65,8 +65,5 @@ public function testGeneratorWillShowEachStandardSeparately() $runner = new Runner(); $runner->runPHPCS(); - - }//end testGeneratorWillShowEachStandardSeparately() - - -}//end class + } +} diff --git a/tests/Core/Sniffs/AbstractArraySniffTest.php b/tests/Core/Sniffs/AbstractArraySniffTest.php index 1280bacd73..a4710974c6 100644 --- a/tests/Core/Sniffs/AbstractArraySniffTest.php +++ b/tests/Core/Sniffs/AbstractArraySniffTest.php @@ -42,8 +42,7 @@ public static function setUpBeforeClass(): void { self::$sniff = new AbstractArraySniffTestable(); parent::setUpBeforeClass(); - - }//end setUpBeforeClass() + } /** @@ -63,8 +62,7 @@ public function testSimpleValues() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testSimpleValues() + } /** @@ -99,8 +97,7 @@ public function testSimpleKeyValues() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testSimpleKeyValues() + } /** @@ -132,8 +129,7 @@ public function testMissingKeys() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testMissingKeys() + } /** @@ -162,8 +158,7 @@ public function testMultiTokenKeys() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testMultiTokenKeys() + } /** @@ -192,8 +187,7 @@ public function testMissingKeysCoalesceTernary() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testMissingKeysCoalesceTernary() + } /** @@ -228,8 +222,7 @@ public function testTernaryValues() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testTernaryValues() + } /** @@ -252,8 +245,7 @@ public function testHeredocValues() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testHeredocValues() + } /** @@ -288,8 +280,5 @@ public function testArrowFunctionValue() ]; $this->assertSame($expected, self::$sniff->indicies); - - }//end testArrowFunctionValue() - - -}//end class + } +} diff --git a/tests/Core/Sniffs/AbstractArraySniffTestable.php b/tests/Core/Sniffs/AbstractArraySniffTestable.php index 124bb7e805..ca5ed4b87d 100644 --- a/tests/Core/Sniffs/AbstractArraySniffTestable.php +++ b/tests/Core/Sniffs/AbstractArraySniffTestable.php @@ -39,8 +39,7 @@ class AbstractArraySniffTestable extends AbstractArraySniff public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices) { $this->indicies = $indices; - - }//end processSingleLineArray() + } /** @@ -59,8 +58,5 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arra public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices) { $this->indicies = $indices; - - }//end processMultiLineArray() - - -}//end class + } +} diff --git a/tests/Core/Standards/StandardRulesetsQATest.php b/tests/Core/Standards/StandardRulesetsQATest.php index 3adba78133..b26a5b3ea3 100644 --- a/tests/Core/Standards/StandardRulesetsQATest.php +++ b/tests/Core/Standards/StandardRulesetsQATest.php @@ -48,8 +48,7 @@ public function testBuildInStandardsDoNotContainErrors($standard) // Make sure sniffs were registered. $this->assertGreaterThanOrEqual(1, count($ruleset->sniffCodes)); - - }//end testBuildInStandardsDoNotContainErrors() + } /** @@ -75,8 +74,5 @@ public static function dataBuildInStandards() } return $data; - - }//end dataBuildInStandards() - - -}//end class + } +} diff --git a/tests/Core/StatusWriterTestHelper.php b/tests/Core/StatusWriterTestHelper.php index 8fa25bbf33..081a39c42a 100644 --- a/tests/Core/StatusWriterTestHelper.php +++ b/tests/Core/StatusWriterTestHelper.php @@ -32,8 +32,7 @@ trait StatusWriterTestHelper protected function setUp(): void { $this->redirectStatusWriterOutputToStream(); - - }//end setUp() + } /** @@ -46,8 +45,7 @@ protected function setUp(): void protected function tearDown(): void { $this->resetStatusWriterProperties(); - - }//end tearDown() + } /** @@ -71,8 +69,7 @@ protected function redirectStatusWriterOutputToStream(): void (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(true); $streamProperty->setValue(null, $this->stream); (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false); - - }//end redirectStatusWriterOutputToStream() + } /** @@ -89,8 +86,7 @@ protected function resetStatusWriterStream(): void (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(true); $streamProperty->setValue(null, STDERR); (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false); - - }//end resetStatusWriterStream() + } /** @@ -105,8 +101,7 @@ protected function resetStatusWriterProperties(): void } $this->resetStatusWriterStream(); - - }//end resetStatusWriterProperties() + } /** @@ -117,8 +112,7 @@ protected function resetStatusWriterProperties(): void public function expectNoStdoutOutput() { $this->expectOutputString(''); - - }//end expectNoStdoutOutput() + } /** @@ -135,8 +129,7 @@ public function assertStderrOutputSameString($expected) $this->assertIsString($output); $this->assertSame($expected, $output); - - }//end assertStderrOutputSameString() + } /** @@ -159,8 +152,5 @@ public function assertStderrOutputMatchesRegex($regex) // PHPUnit < 9.1.0. $this->assertRegExp($regex, $output); } - - }//end assertStderrOutputMatchesRegex() - - -}//end trait + } +} diff --git a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php index 79fd22af6c..bb02c5f43c 100644 --- a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php +++ b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php @@ -67,8 +67,7 @@ protected function setUp(): void $this->phpcsFile = new LocalFile($pathToTestFile, $ruleset, $config); $this->phpcsFile->parse(); }//end if - - }//end setUp() + } /** @@ -88,8 +87,7 @@ protected function setUp(): void public function testTestMarkersAreUnique() { AbstractMethodTestCase::assertTestMarkersAreUnique($this->phpcsFile); - - }//end testTestMarkersAreUnique() + } /** @@ -107,8 +105,7 @@ public function testTestMarkersAreUnique() protected function getTargetToken($commentString, $tokenType, $tokenContent = null) { return AbstractMethodTestCase::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent); - - }//end getTargetToken() + } /** @@ -125,8 +122,5 @@ public static function clearResolvedTokensCache() (PHP_VERSION_ID < 80100) && $property->setAccessible(true); $property->setValue(null, []); (PHP_VERSION_ID < 80100) && $property->setAccessible(false); - - }//end clearResolvedTokensCache() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/CommentTestCase.php b/tests/Core/Tokenizers/Comment/CommentTestCase.php index 5f99b68bba..f0cf358625 100644 --- a/tests/Core/Tokenizers/Comment/CommentTestCase.php +++ b/tests/Core/Tokenizers/Comment/CommentTestCase.php @@ -67,8 +67,7 @@ public function testDocblockOpenerCloser($marker, $closerOffset, $expectedTags) 'Comment_closer not set to the expected stack pointer (for stackPtr ' . $i . ')' ); } - - }//end testDocblockOpenerCloser() + } /** @@ -121,8 +120,5 @@ protected function checkTokenSequence($startPtr, array $expectedSequence) 'Token content did not match expectations' . $errorMsgSuffix ); }//end for - - }//end checkTokenSequence() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php index 1fee11597e..af7f73b527 100644 --- a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php +++ b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php @@ -34,8 +34,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -62,8 +61,5 @@ public function testLiveCoding() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testLiveCoding() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php index fa31842613..f107f994a1 100644 --- a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php +++ b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php @@ -34,8 +34,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -61,8 +60,5 @@ public function testLiveCoding() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testLiveCoding() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php index 0653eb162f..637f800101 100644 --- a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php +++ b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php @@ -34,8 +34,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -55,8 +54,5 @@ public function testLiveCoding() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testLiveCoding() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php index 58c8e87762..95ba0f93d3 100644 --- a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php +++ b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php @@ -34,8 +34,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -69,8 +68,5 @@ public function testLiveCoding() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testLiveCoding() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php index b5138d72f8..7d61ed68b0 100644 --- a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php +++ b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php @@ -67,8 +67,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -90,8 +89,7 @@ public function testEmptyDocblock() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testEmptyDocblock() + } /** @@ -203,8 +201,7 @@ public function testMultilineDocblock() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblock() + } /** @@ -253,8 +250,7 @@ public function testMultilineDocblockNoStars() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblockNoStars() + } /** @@ -331,8 +327,7 @@ public function testMultilineDocblockIndented() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblockIndented() + } /** @@ -359,8 +354,7 @@ public function testMultilineDocblockOpenerNotOnOwnLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblockOpenerNotOnOwnLine() + } /** @@ -388,8 +382,7 @@ public function testMultilineDocblockCloserNotOnOwnLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblockCloserNotOnOwnLine() + } /** @@ -432,8 +425,5 @@ public function testMultilineDocblockStarsNotAligned() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultilineDocblockStarsNotAligned() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php index f21d2f4d32..cb61a56e45 100644 --- a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php +++ b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php @@ -112,8 +112,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -135,8 +134,7 @@ public function testSingleLineDocIgnoreFileAnnotation() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocIgnoreFileAnnotation() + } /** @@ -156,8 +154,7 @@ public function testSingleLineDocIgnoreAnnotation() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocIgnoreAnnotation() + } /** @@ -177,8 +174,7 @@ public function testSingleLineDocDisableAnnotation() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocDisableAnnotation() + } /** @@ -197,8 +193,7 @@ public function testSingleLineDocEnableAnnotationNoWhitespace() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocEnableAnnotationNoWhitespace() + } /** @@ -228,8 +223,7 @@ public function testMultiLineDocIgnoreFileAnnotationAtStart() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreFileAnnotationAtStart() + } /** @@ -259,8 +253,7 @@ public function testMultiLineDocIgnoreAnnotationAtStart() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreAnnotationAtStart() + } /** @@ -290,8 +283,7 @@ public function testMultiLineDocDisableAnnotationAtStart() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocDisableAnnotationAtStart() + } /** @@ -326,8 +318,7 @@ public function testMultiLineDocEnableAnnotationAtStart() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocEnableAnnotationAtStart() + } /** @@ -365,8 +356,7 @@ public function testMultiLineDocIgnoreFileAnnotationInMiddle() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreFileAnnotationInMiddle() + } /** @@ -406,8 +396,7 @@ public function testMultiLineDocIgnoreAnnotationInMiddle() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreAnnotationInMiddle() + } /** @@ -450,8 +439,7 @@ public function testMultiLineDocDisableAnnotationInMiddle() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocDisableAnnotationInMiddle() + } /** @@ -492,8 +480,7 @@ public function testMultiLineDocEnableAnnotationInMiddle() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocEnableAnnotationInMiddle() + } /** @@ -526,8 +513,7 @@ public function testMultiLineDocIgnoreFileAnnotationAtEnd() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreFileAnnotationAtEnd() + } /** @@ -560,8 +546,7 @@ public function testMultiLineDocIgnoreAnnotationAtEnd() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocIgnoreAnnotationAtEnd() + } /** @@ -596,8 +581,7 @@ public function testMultiLineDocDisableAnnotationAtEnd() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocDisableAnnotationAtEnd() + } /** @@ -630,8 +614,5 @@ public function testMultiLineDocEnableAnnotationAtEnd() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testMultiLineDocEnableAnnotationAtEnd() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php index ad4c205115..13449e5b02 100644 --- a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php +++ b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php @@ -59,8 +59,7 @@ public static function dataDocblockOpenerCloser() 'expectedTags' => [2], ], ]; - - }//end dataDocblockOpenerCloser() + } /** @@ -79,8 +78,7 @@ public function testEmptyBlockCommentNoWhiteSpace() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', [T_COMMENT, T_DOC_COMMENT_OPEN_TAG]); $this->checkTokenSequence($target, $expectedSequence); - - }//end testEmptyBlockCommentNoWhiteSpace() + } /** @@ -100,8 +98,7 @@ public function testEmptyDocblockNoWhiteSpace() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testEmptyDocblockNoWhiteSpace() + } /** @@ -120,8 +117,7 @@ public function testEmptyDocblockWithWhiteSpace() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testEmptyDocblockWithWhiteSpace() + } /** @@ -141,8 +137,7 @@ public function testSingleLineDocblockNoTag() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocblockNoTag() + } /** @@ -164,8 +159,7 @@ public function testSingleLineDocblockWithTag1() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocblockWithTag1() + } /** @@ -187,8 +181,7 @@ public function testSingleLineDocblockWithTag2() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocblockWithTag2() + } /** @@ -210,8 +203,5 @@ public function testSingleLineDocblockWithTag3() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG); $this->checkTokenSequence($target, $expectedSequence); - - }//end testSingleLineDocblockWithTag3() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php index c93ce85106..f7f14b220d 100644 --- a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php +++ b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php @@ -33,8 +33,7 @@ public function testAnonClassNoParentheses($testMarker) $this->assertArrayNotHasKey('parenthesis_owner', $tokens[$anonClass]); $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$anonClass]); $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$anonClass]); - - }//end testAnonClassNoParentheses() + } /** @@ -60,8 +59,7 @@ public function testAnonClassNoParenthesesNextOpenClose($testMarker) $closer = $this->getTargetToken($testMarker, T_CLOSE_PARENTHESIS); $this->assertArrayHasKey('parenthesis_owner', $tokens[$closer]); $this->assertSame($function, $tokens[$closer]['parenthesis_owner']); - - }//end testAnonClassNoParenthesesNextOpenClose() + } /** @@ -85,8 +83,7 @@ public static function dataAnonClassNoParentheses() 'testMarker' => '/* testNoParenthesesAndEmptyTokens */', ], ]; - - }//end dataAnonClassNoParentheses() + } /** @@ -127,8 +124,7 @@ public function testAnonClassWithParentheses($testMarker) $this->assertSame($anonClass, $tokens[$closer]['parenthesis_owner']); $this->assertSame($opener, $tokens[$closer]['parenthesis_opener']); $this->assertSame($closer, $tokens[$closer]['parenthesis_closer']); - - }//end testAnonClassWithParentheses() + } /** @@ -151,8 +147,5 @@ public static function dataAnonClassWithParentheses() 'testMarker' => '/* testWithParenthesesAndEmptyTokens */', ], ]; - - }//end dataAnonClassWithParentheses() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php index 84faa88a10..b7612f7a6d 100644 --- a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php +++ b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php @@ -35,8 +35,7 @@ public function testArrayKeyword($testMarker, $testContent = 'array') $this->assertSame(T_ARRAY, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_ARRAY (code)'); $this->assertSame('T_ARRAY', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_ARRAY (type)'); - - }//end testArrayKeyword() + } /** @@ -69,8 +68,7 @@ public static function dataArrayKeyword() 'testMarker' => '/* testOOConstDefault */', ], ]; - - }//end dataArrayKeyword() + } /** @@ -93,8 +91,7 @@ public function testArrayType($testMarker, $testContent = 'array') $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testArrayType() + } /** @@ -142,8 +139,7 @@ public static function dataArrayType() 'testContent' => 'Array', ], ]; - - }//end dataArrayType() + } /** @@ -167,8 +163,7 @@ public function testNotArrayKeyword($testMarker, $testContent = 'array') $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testNotArrayKeyword() + } /** @@ -193,8 +188,5 @@ public static function dataNotArrayKeyword() 'testContent' => 'ARRAY', ], ]; - - }//end dataNotArrayKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/AttributesTest.php b/tests/Core/Tokenizers/PHP/AttributesTest.php index 75d3b458f2..307826120e 100644 --- a/tests/Core/Tokenizers/PHP/AttributesTest.php +++ b/tests/Core/Tokenizers/PHP/AttributesTest.php @@ -57,8 +57,7 @@ function ($token) use ($attribute, $length) { ); $this->assertSame($tokenCodes, $map); - - }//end testAttribute() + } /** @@ -266,8 +265,7 @@ public static function dataAttribute() ], ], ]; - - }//end dataAttribute() + } /** @@ -290,8 +288,7 @@ public function testTwoAttributesOnTheSameLine() $this->assertSame(T_WHITESPACE, $tokens[($closer + 1)]['code']); $this->assertSame(T_ATTRIBUTE, $tokens[($closer + 2)]['code']); $this->assertArrayHasKey('attribute_closer', $tokens[($closer + 2)]); - - }//end testTwoAttributesOnTheSameLine() + } /** @@ -313,8 +310,7 @@ public function testAttributeAndLineComment() $closer = $tokens[$attribute]['attribute_closer']; $this->assertSame(T_WHITESPACE, $tokens[($closer + 1)]['code']); $this->assertSame(T_COMMENT, $tokens[($closer + 2)]['code']); - - }//end testAttributeAndLineComment() + } /** @@ -366,8 +362,7 @@ function ($token) use ($attribute, $length) { ); $this->assertSame($tokenCodes, $map); - - }//end testAttributeOnParameters() + } /** @@ -421,8 +416,7 @@ public static function dataAttributeOnParameters() ], ], ]; - - }//end dataAttributeOnParameters() + } /** @@ -473,8 +467,7 @@ public function testAttributeContainingTextLookingLikeCloseTag($testMarker, arra $this->assertSame($expectedCode, $tokens[$i]['code']); ++$i; } - - }//end testAttributeContainingTextLookingLikeCloseTag() + } /** @@ -572,8 +565,7 @@ public static function dataAttributeOnTextLookingLikeCloseTag() ], ], ]; - - }//end dataAttributeOnTextLookingLikeCloseTag() + } /** @@ -593,8 +585,7 @@ public function testInvalidAttribute() $this->assertArrayHasKey('attribute_closer', $tokens[$attribute]); $this->assertNull($tokens[$attribute]['attribute_closer']); - - }//end testInvalidAttribute() + } /** @@ -687,8 +678,5 @@ static function ($token) { ); $this->assertSame($tokenCodes, $map); - - }//end testNestedAttributes() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php index 24d5ca5034..4187203b4a 100644 --- a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php @@ -59,8 +59,7 @@ public function testAsymmetricVisibility($testMarker, $testType, $testContent) $tokenArray['content'], 'Token tokenized as ' . $tokenArray['type'] . ' (content)' ); - - }//end testAsymmetricVisibility() + } /** @@ -197,8 +196,7 @@ public static function dataAsymmetricVisibility() 'testContent' => 'PRIVATE(SET)', ], ]; - - }//end dataAsymmetricVisibility() + } /** @@ -233,8 +231,7 @@ public function testNotAsymmetricVisibility($testMarker, $testType, $testContent $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ' (code)' ); - - }//end testNotAsymmetricVisibility() + } /** @@ -324,8 +321,5 @@ public static function dataNotAsymmetricVisibility() 'testContent' => 'private', ], ]; - - }//end dataNotAsymmetricVisibility() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php index d411d697bb..a902d0c78c 100644 --- a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php @@ -65,8 +65,7 @@ public function testEnums($testMarker, $testContent, $openerOffset, $closerOffse $this->assertSame($enum, $tokens[$scopeCloser]['scope_condition']); $this->assertSame($scopeOpener, $tokens[$scopeCloser]['scope_opener']); $this->assertSame($scopeCloser, $tokens[$scopeCloser]['scope_closer']); - - }//end testEnums() + } /** @@ -122,8 +121,7 @@ public static function dataEnums() 'closerOffset' => 14, ], ]; - - }//end dataEnums() + } /** @@ -150,8 +148,7 @@ public function testNotEnums($testMarker, $testContent, $expectedType = 'T_STRIN $this->assertSame(constant($expectedType), $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (code)'); $this->assertSame($expectedType, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (type)'); - - }//end testNotEnums() + } /** @@ -227,8 +224,5 @@ public static function dataNotEnums() 'testContent' => 'enum', ], ]; - - }//end dataNotEnums() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php index d706083e91..8b4c25f353 100644 --- a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php @@ -38,8 +38,7 @@ public function testExplicitOctalNotation($marker, $value, $nextToken, $nextCont $this->assertSame($nextToken, $tokens[($number + 1)]['code'], 'Next token is not the expected type, but ' . $tokens[($number + 1)]['type']); $this->assertSame($nextContent, $tokens[($number + 1)]['content'], 'Next token did not have the expected contents'); - - }//end testExplicitOctalNotation() + } /** @@ -113,8 +112,5 @@ public static function dataExplicitOctalNotation() 'nextContent' => 'o', ], ]; - - }//end dataExplicitOctalNotation() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php index 92d567a7d3..e75bad666a 100644 --- a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php @@ -37,8 +37,5 @@ public function testUnfinishedArrowFunction() $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set'); - - }//end testUnfinishedArrowFunction() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php index de9e0c46d1..513dc5f782 100644 --- a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php @@ -31,8 +31,7 @@ public function testSimple($testMarker) $token = $this->getTargetToken($testMarker, T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 12); - - }//end testSimple() + } /** @@ -52,8 +51,7 @@ public static function dataSimple() 'testMarker' => '/* testMixedCase */', ], ]; - - }//end dataSimple() + } /** @@ -68,8 +66,7 @@ public function testWhitespace() $token = $this->getTargetToken('/* testWhitespace */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 6, 13); - - }//end testWhitespace() + } /** @@ -84,8 +81,7 @@ public function testComment() $token = $this->getTargetToken('/* testComment */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 8, 15); - - }//end testComment() + } /** @@ -100,8 +96,7 @@ public function testHeredoc() $token = $this->getTargetToken('/* testHeredoc */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 4, 9); - - }//end testHeredoc() + } /** @@ -116,8 +111,7 @@ public function testNestedOuter() $token = $this->getTargetToken('/* testNestedOuter */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 25); - - }//end testNestedOuter() + } /** @@ -147,8 +141,7 @@ public function testNestedInner() $closer = $tokens[$token]['scope_closer']; $this->assertSame(($token - 4), $tokens[$closer]['scope_opener'], 'Closer scope opener is not the arrow token of the "outer" arrow function (shared scope closer)'); $this->assertSame($expectedScopeCloser, $tokens[$closer]['scope_closer'], 'Closer scope closer is not the semicolon token'); - - }//end testNestedInner() + } /** @@ -182,8 +175,7 @@ public function testNestedSharedCloser() $closer = $tokens[$token]['scope_closer']; $this->assertSame(($token - 4), $tokens[$closer]['scope_opener'], 'Closer scope opener for "inner" arrow function is not the arrow token of the "outer" arrow function (shared scope closer)'); $this->assertSame($expectedScopeCloser, $tokens[$closer]['scope_closer'], 'Closer scope closer for "inner" arrow function is not the TRUE token'); - - }//end testNestedSharedCloser() + } /** @@ -198,8 +190,7 @@ public function testFunctionCall() $token = $this->getTargetToken('/* testFunctionCall */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 17); - - }//end testFunctionCall() + } /** @@ -214,8 +205,7 @@ public function testChainedFunctionCall() $token = $this->getTargetToken('/* testChainedFunctionCall */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 12, 'bracket'); - - }//end testChainedFunctionCall() + } /** @@ -230,8 +220,7 @@ public function testFunctionArgument() $token = $this->getTargetToken('/* testFunctionArgument */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 8, 15, 'comma'); - - }//end testFunctionArgument() + } /** @@ -246,8 +235,7 @@ public function testClosure() $token = $this->getTargetToken('/* testClosure */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 60, 'comma'); - - }//end testClosure() + } /** @@ -262,8 +250,7 @@ public function testArrayIndex() $token = $this->getTargetToken('/* testArrayIndex */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 8, 17, 'comma'); - - }//end testArrayIndex() + } /** @@ -278,8 +265,7 @@ public function testReturnType() $token = $this->getTargetToken('/* testReturnType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 18, 'comma'); - - }//end testReturnType() + } /** @@ -294,8 +280,7 @@ public function testReference() $token = $this->getTargetToken('/* testReference */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 6, 9); - - }//end testReference() + } /** @@ -310,8 +295,7 @@ public function testGrouped() $token = $this->getTargetToken('/* testGrouped */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 8); - - }//end testGrouped() + } /** @@ -326,8 +310,7 @@ public function testArrayValue() $token = $this->getTargetToken('/* testArrayValue */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 4, 9, 'comma'); - - }//end testArrayValue() + } /** @@ -342,8 +325,7 @@ public function testArrayValueNoTrailingComma() $token = $this->getTargetToken('/* testArrayValueNoTrailingComma */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 4, 8, 'closing parenthesis'); - - }//end testArrayValueNoTrailingComma() + } /** @@ -358,8 +340,7 @@ public function testYield() $token = $this->getTargetToken('/* testYield */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 14); - - }//end testYield() + } /** @@ -374,8 +355,7 @@ public function testReturnTypeNullableFullyQualifiedClassName() $token = $this->getTargetToken('/* testReturnTypeNullableFullyQualifiedClassName */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 10, 13); - - }//end testReturnTypeNullableFullyQualifiedClassName() + } /** @@ -390,8 +370,7 @@ public function testReturnTypeNullablePartiallyQualifiedClassName() $token = $this->getTargetToken('/* testReturnTypeNullablePartiallyQualifiedClassName */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 10, 13); - - }//end testReturnTypeNullablePartiallyQualifiedClassName() + } /** @@ -406,8 +385,7 @@ public function testNullableUnqualifiedClassName() $token = $this->getTargetToken('/* testNullableUnqualifiedClassName */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 13, 16); - - }//end testNullableUnqualifiedClassName() + } /** @@ -422,8 +400,7 @@ public function testNamespaceRelativeClassNameInTypes() $token = $this->getTargetToken('/* testNamespaceRelativeClassNameInTypes */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 12, 15); - - }//end testNamespaceRelativeClassNameInTypes() + } /** @@ -441,8 +418,7 @@ public function testKeywordReturnTypes($testMarker) $token = $this->getTargetToken($testMarker, T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 14); - - }//end testKeywordReturnTypes() + } /** @@ -489,8 +465,7 @@ public static function dataKeywordReturnTypes() 'testMarker' => '/* testFQNNullReturnType */', ], ]; - - }//end dataKeywordReturnTypes() + } /** @@ -505,8 +480,7 @@ public function testUnionParamType() $token = $this->getTargetToken('/* testUnionParamType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 13, 21); - - }//end testUnionParamType() + } /** @@ -521,8 +495,7 @@ public function testUnionReturnType() $token = $this->getTargetToken('/* testUnionReturnType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 18); - - }//end testUnionReturnType() + } /** @@ -537,8 +510,7 @@ public function testUnionReturnTypeWithTrue() $token = $this->getTargetToken('/* testUnionReturnTypeWithTrue */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 18); - - }//end testUnionReturnTypeWithTrue() + } /** @@ -553,8 +525,7 @@ public function testUnionReturnTypeWithFalse() $token = $this->getTargetToken('/* testUnionReturnTypeWithFalse */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 18); - - }//end testUnionReturnTypeWithFalse() + } /** @@ -569,8 +540,7 @@ public function testIntersectionParamType() $token = $this->getTargetToken('/* testIntersectionParamType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 13, 27); - - }//end testIntersectionParamType() + } /** @@ -585,8 +555,7 @@ public function testIntersectionReturnType() $token = $this->getTargetToken('/* testIntersectionReturnType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 11, 19); - - }//end testIntersectionReturnType() + } /** @@ -601,8 +570,7 @@ public function testDNFParamType() $token = $this->getTargetToken('/* testDNFParamType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 17, 29); - - }//end testDNFParamType() + } /** @@ -617,8 +585,7 @@ public function testDNFReturnType() $token = $this->getTargetToken('/* testDNFReturnType */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 15, 27); - - }//end testDNFReturnType() + } /** @@ -633,8 +600,7 @@ public function testDNFParamTypeWithReturnByRef() $token = $this->getTargetToken('/* testDNFParamTypeWithReturnByRef */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 15, 22); - - }//end testDNFParamTypeWithReturnByRef() + } /** @@ -685,8 +651,7 @@ public function testTernary() $closer = $tokens[$token]['scope_closer']; $this->assertSame(($token - 24), $tokens[$closer]['scope_opener'], 'Closer scope opener for ELSE is not the arrow token of the "outer" arrow function (shared scope closer)'); $this->assertSame($expectedScopeCloser, $tokens[$closer]['scope_closer'], 'Closer scope closer for ELSE is not the semicolon token'); - - }//end testTernary() + } /** @@ -701,8 +666,7 @@ public function testTernaryWithTypes() $token = $this->getTargetToken('/* testTernaryWithTypes */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 15, 27); - - }//end testTernaryWithTypes() + } /** @@ -717,8 +681,7 @@ public function testWithMatchValue() $token = $this->getTargetToken('/* testWithMatchValue */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 44); - - }//end testWithMatchValue() + } /** @@ -733,8 +696,7 @@ public function testWithMatchValueAndMore() $token = $this->getTargetToken('/* testWithMatchValueAndMore */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 48); - - }//end testWithMatchValueAndMore() + } /** @@ -761,8 +723,7 @@ public function testInMatchValue($testMarker, $openerOffset, $closerOffset, $exp $this->scopePositionTestHelper($token, $openerOffset, $closerOffset, $expectedCloserFriendlyName); $this->assertSame($expectedCloserType, $tokens[($token + $closerOffset)]['type'], 'Mismatched scope closer type'); - - }//end testInMatchValue() + } /** @@ -804,8 +765,7 @@ public static function dataInMatchValue() 'expectedCloserFriendlyName' => '$y variable', ], ]; - - }//end dataInMatchValue() + } /** @@ -820,8 +780,7 @@ public function testNestedInMethod() $token = $this->getTargetToken('/* testNestedInMethod */', T_FN); $this->backfillHelper($token); $this->scopePositionTestHelper($token, 5, 17); - - }//end testNestedInMethod() + } /** @@ -856,8 +815,7 @@ public function testNotAnArrowFunction($testMarker, $testContent = 'fn', $expect $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set'); - - }//end testNotAnArrowFunction() + } /** @@ -926,8 +884,7 @@ public static function dataNotAnArrowFunction() 'testMarker' => '/* testLiveCoding */', ], ]; - - }//end dataNotAnArrowFunction() + } /** @@ -978,8 +935,7 @@ private function backfillHelper($token, $skipScopeCloserCheck = false) $closer = $tokens[$token]['parenthesis_closer']; $this->assertArrayHasKey('parenthesis_owner', $tokens[$closer], 'Closing parenthesis owner is not set'); $this->assertSame($tokens[$closer]['parenthesis_owner'], $token, 'Closing parenthesis owner is not the T_FN token'); - - }//end backfillHelper() + } /** @@ -1010,8 +966,5 @@ private function scopePositionTestHelper($token, $openerOffset, $closerOffset, $ $closer = $tokens[$token]['scope_closer']; $this->assertSame($expectedScopeOpener, $tokens[$closer]['scope_opener'], 'Closer scope opener is not the arrow token'); $this->assertSame($expectedScopeCloser, $tokens[$closer]['scope_closer'], 'Closer scope closer is not the ' . $expectedCloserType . ' token'); - - }//end scopePositionTestHelper() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php index d587397095..762ab488cb 100644 --- a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php @@ -42,8 +42,7 @@ public function testMatchExpression($testMarker, $openerOffset, $closerOffset, $ $this->scopeTestHelper($token, $openerOffset, $closerOffset); $this->parenthesisTestHelper($token); - - }//end testMatchExpression() + } /** @@ -194,8 +193,7 @@ public static function dataMatchExpression() 'closerOffset' => 40, ], ]; - - }//end dataMatchExpression() + } /** @@ -236,8 +234,7 @@ public function testNotAMatchStructure($testMarker, $testContent = 'match', $exp if ($next !== false && $tokens[$next]['code'] === T_OPEN_PARENTHESIS) { $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set for opener after'); } - - }//end testNotAMatchStructure() + } /** @@ -347,8 +344,7 @@ public static function dataNotAMatchStructure() 'testMarker' => '/* testLiveCoding */', ], ]; - - }//end dataNotAMatchStructure() + } /** @@ -370,8 +366,7 @@ public function testSwitchExpression($testMarker, $openerOffset, $closerOffset) $this->scopeTestHelper($token, $openerOffset, $closerOffset); $this->parenthesisTestHelper($token); - - }//end testSwitchExpression() + } /** @@ -400,8 +395,7 @@ public static function dataSwitchExpression() 'closerOffset' => 63, ], ]; - - }//end dataSwitchExpression() + } /** @@ -423,8 +417,7 @@ public function testSwitchCaseVersusMatch($testMarker, $openerOffset, $closerOff $token = $this->getTargetToken($testMarker, [T_CASE, T_DEFAULT]); $this->scopeTestHelper($token, $openerOffset, $closerOffset); - - }//end testSwitchCaseVersusMatch() + } /** @@ -463,8 +456,7 @@ public static function dataSwitchCaseVersusMatch() 'closerOffset' => 20, ], ]; - - }//end dataSwitchCaseVersusMatch() + } /** @@ -527,8 +519,7 @@ private function scopeTestHelper($token, $openerOffset, $closerOffset, $skipScop ); } } - - }//end scopeTestHelper() + } /** @@ -557,8 +548,5 @@ private function parenthesisTestHelper($token) $closer = $tokenArray['parenthesis_closer']; $this->assertArrayHasKey('parenthesis_owner', $tokens[$closer], 'Closing parenthesis owner is not set'); $this->assertSame($token, $tokens[$closer]['parenthesis_owner'], 'Closing parenthesis owner is not the ' . $tokenType . ' token'); - - }//end parenthesisTestHelper() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php index 38cf3bb4e8..5585506df5 100644 --- a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php @@ -37,8 +37,7 @@ public function testBackfill($marker, $type, $value) $this->assertSame(constant($type), $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $type . ' (code)'); $this->assertSame($type, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $type . ' (type)'); $this->assertSame($value, $tokenArray['content']); - - }//end testBackfill() + } /** @@ -132,8 +131,7 @@ public static function dataTestBackfill() 'value' => '10_223_372_036_854_775_807', ], ]; - - }//end dataTestBackfill() + } /** @@ -162,8 +160,7 @@ public function testNoBackfill($testMarker, $expectedTokens) ); $this->assertSame($expectedToken['content'], $tokens[$i]['content']); } - - }//end testNoBackfill() + } /** @@ -395,8 +392,5 @@ public static function dataNoBackfill() ], ], ]; - - }//end dataNoBackfill() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php index bf02ba3a99..7460f15154 100644 --- a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php +++ b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php @@ -36,8 +36,7 @@ public function testReadonly($testMarker, $testContent = 'readonly') $this->assertSame(T_READONLY, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_READONLY (code)'); $this->assertSame('T_READONLY', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_READONLY (type)'); - - }//end testReadonly() + } /** @@ -169,8 +168,7 @@ public static function dataReadonly() 'testMarker' => '/* testParseErrorLiveCoding */', ], ]; - - }//end dataReadonly() + } /** @@ -198,8 +196,7 @@ public function testNotReadonly($testMarker, $testContent = 'readonly', $expecte $this->assertSame(constant($expectedType), $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (code)'); $this->assertSame($expectedType, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (type)'); - - }//end testNotReadonly() + } /** @@ -274,8 +271,5 @@ public static function dataNotReadonly() 'testMarker' => '/* testReadonlyUsedAsMethodNameWithDNFParam */', ], ]; - - }//end dataNotReadonly() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php index 78aeb7236c..301d1a8d70 100644 --- a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php +++ b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php @@ -33,8 +33,7 @@ public function testBitwiseOr($testMarker) $this->assertSame(T_BITWISE_OR, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_BITWISE_OR (code)'); $this->assertSame('T_BITWISE_OR', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_BITWISE_OR (type)'); - - }//end testBitwiseOr() + } /** @@ -67,8 +66,7 @@ public static function dataBitwiseOr() 'in parameter in function call' => ['/* testBitwiseOrNonArrowFnFunctionCall */'], 'live coding / undetermined' => ['/* testLiveCoding */'], ]; - - }//end dataBitwiseOr() + } /** @@ -89,8 +87,7 @@ public function testTypeUnion($testMarker) $this->assertSame(T_TYPE_UNION, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_TYPE_UNION (code)'); $this->assertSame('T_TYPE_UNION', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_TYPE_UNION (type)'); - - }//end testTypeUnion() + } /** @@ -166,8 +163,5 @@ public static function dataTypeUnion() 'return type for function with FQN false' => ['/* testTypeUnionFQNFalse */'], 'return type for closure with FQN null' => ['/* testTypeUnionFQNNull */'], ]; - - }//end dataTypeUnion() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php index 150dd74130..231e875388 100644 --- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php +++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php @@ -37,8 +37,7 @@ public function testStrings($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testStrings() + } /** @@ -123,8 +122,5 @@ public static function dataStrings() 'or' => ['/* testOr */'], 'xor' => ['/* testXor */'], ]; - - }//end dataStrings() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php index 093f7900f1..4478f5dc07 100644 --- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php +++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php @@ -34,8 +34,7 @@ public function testStrings($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testStrings() + } /** @@ -138,8 +137,7 @@ public static function dataStrings() 'method call: static' => ['/* testKeywordAsMethodCallNameShouldBeStringStatic */'], 'method call: static with dnf look a like param' => ['/* testKeywordAsFunctionCallNameShouldBeStringStaticDNFLookaLike */'], ]; - - }//end dataStrings() + } /** @@ -177,8 +175,7 @@ public function testKeywords($testMarker, $expectedTokenType) $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)' ); - - }//end testKeywords() + } /** @@ -565,8 +562,5 @@ public static function dataKeywords() 'expectedTokenType' => 'T_STATIC', ], ]; - - }//end dataKeywords() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php index 26dfd1476f..635596e257 100644 --- a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php +++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php @@ -43,8 +43,7 @@ public function testBrokenDNFTypeCantEndOnOpenParenthesis($testMarker) $this->assertSame(T_BITWISE_OR, $token['code'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_OR (code)'); $this->assertSame('T_BITWISE_OR', $token['type'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_OR (type)'); - - }//end testBrokenDNFTypeCantEndOnOpenParenthesis() + } /** @@ -62,8 +61,5 @@ public static function dataBrokenDNFTypeCantEndOnOpenParenthesis() 'Parameter type' => ['/* testBrokenParamDNFTypeEndOnOpenParenthesis */'], 'Return type' => ['/* testBrokenReturnDNFTypeEndOnOpenParenthesis */'], ]; - - }//end dataBrokenDNFTypeCantEndOnOpenParenthesis() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php index dafc789c9a..9c9ffa4279 100644 --- a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php +++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php @@ -52,8 +52,7 @@ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens($te $this->assertSame(T_BITWISE_AND, $token['code'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_AND (code)'); $this->assertSame('T_BITWISE_AND', $token['type'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_AND (type)'); - - }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens() + } /** @@ -71,8 +70,7 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingClosePar 'Parameter type' => ['/* testBrokenParamDNFTypeParensMissingClose */'], 'Return type' => ['/* testBrokenReturnDNFTypeParensMissingClose */'], ]; - - }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens() + } /** @@ -111,8 +109,7 @@ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens($tes $this->assertSame(T_BITWISE_AND, $token['code'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_AND (code)'); $this->assertSame('T_BITWISE_AND', $token['type'], 'Token tokenized as ' . $token['type'] . ', not T_BITWISE_AND (type)'); - - }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens() + } /** @@ -130,8 +127,7 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenPare 'Parameter type' => ['/* testBrokenParamDNFTypeParensMissingOpen */'], 'Return type' => ['/* testBrokenReturnDNFTypeParensMissingOpen */'], ]; - - }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens() + } /** @@ -192,8 +188,7 @@ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched($t break; }//end switch }//end for - - }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched() + } /** @@ -211,8 +206,5 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmat 'Parameter type - missing one close parenthesis' => ['/* testBrokenParamDNFTypeParensMissingOneClose */'], 'Return type - missing one open parenthesis' => ['/* testBrokenReturnDNFTypeParensMissingOneOpen */'], ]; - - }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DNFTypesTest.php b/tests/Core/Tokenizers/PHP/DNFTypesTest.php index 627a23890a..ee1df2dacb 100644 --- a/tests/Core/Tokenizers/PHP/DNFTypesTest.php +++ b/tests/Core/Tokenizers/PHP/DNFTypesTest.php @@ -89,8 +89,7 @@ public function testNormalParentheses($testMarker, $skipCheckInside = false) 'Token after tokenized as ' . $tokens[$after]['type'] . ', not T_BITWISE_OR (type)' ); } - - }//end testNormalParentheses() + } /** @@ -266,8 +265,7 @@ public static function dataNormalParentheses() 'testMarker' => '/* testParensNoOwnerInArrowReturnExpression */', ], ]; - - }//end dataNormalParentheses() + } /** @@ -371,8 +369,7 @@ public function testDNFTypeParentheses($testMarker) 'Token after tokenized as ' . $tokens[$after]['type'] . ', not T_TYPE_UNION (type)' ); } - - }//end testDNFTypeParentheses() + } /** @@ -559,8 +556,5 @@ public static function dataDNFTypeParentheses() 'testMarker' => '/* testDNFTypeParamIllegalNestedParens */', ], ]; - - }//end dataDNFTypeParentheses() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php index c06e43e781..076d80a0a3 100644 --- a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php +++ b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php @@ -40,8 +40,7 @@ public function testMatchDefault($testMarker, $testContent = 'default') $this->assertSame(T_MATCH_DEFAULT, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_MATCH_DEFAULT (code)'); $this->assertSame('T_MATCH_DEFAULT', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_MATCH_DEFAULT (type)'); - - }//end testMatchDefault() + } /** @@ -95,8 +94,7 @@ public static function dataMatchDefault() 'testContent' => 'DEFAULT', ], ]; - - }//end dataMatchDefault() + } /** @@ -120,8 +118,7 @@ public function testSwitchDefault($testMarker, $testContent = 'default') $this->assertSame(T_DEFAULT, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_DEFAULT (code)'); $this->assertSame('T_DEFAULT', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_DEFAULT (type)'); - - }//end testSwitchDefault() + } /** @@ -150,8 +147,7 @@ public static function dataSwitchDefault() 'testMarker' => '/* testSwitchDefaultNestedInMatchDefault */', ], ]; - - }//end dataSwitchDefault() + } /** @@ -183,8 +179,7 @@ public function testNotDefaultKeyword($testMarker, $testContent = 'DEFAULT', $ex $this->assertSame(constant($expectedType), $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (code)'); $this->assertSame($expectedType, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (type)'); - - }//end testNotDefaultKeyword() + } /** @@ -264,8 +259,5 @@ public static function dataNotDefaultKeyword() 'testContent' => 'default', ], ]; - - }//end dataNotDefaultKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php index 1e9163716c..ac874db03a 100644 --- a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php +++ b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php @@ -36,8 +36,7 @@ public function testDoubleArrow($testMarker) $this->assertSame(T_DOUBLE_ARROW, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_DOUBLE_ARROW (code)'); $this->assertSame('T_DOUBLE_ARROW', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_DOUBLE_ARROW (type)'); - - }//end testDoubleArrow() + } /** @@ -97,8 +96,7 @@ public static function dataDoubleArrow() 'long_array_with_default_in_key_with_match' => ['/* testLongArrayArrowWithClassConstantKeyWithNestedMatch */'], 'short_array_with_default_in_key_with_match' => ['/* testShortArrayArrowWithClassConstantKeyWithNestedMatch */'], ]; - - }//end dataDoubleArrow() + } /** @@ -121,8 +119,7 @@ public function testMatchArrow($testMarker) $this->assertSame(T_MATCH_ARROW, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_MATCH_ARROW (code)'); $this->assertSame('T_MATCH_ARROW', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_MATCH_ARROW (type)'); - - }//end testMatchArrow() + } /** @@ -184,8 +181,7 @@ public static function dataMatchArrow() 'in_long_array_value_with_default_key' => ['/* testMatchArrowNestedInLongArrayWithClassConstantKey */'], 'in_short_array_value_with_default_key' => ['/* testMatchArrowNestedInShortArrayWithClassConstantKey */'], ]; - - }//end dataMatchArrow() + } /** @@ -208,8 +204,7 @@ public function testFnArrow($testMarker) $this->assertSame(T_FN_ARROW, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_FN_ARROW (code)'); $this->assertSame('T_FN_ARROW', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_FN_ARROW (type)'); - - }//end testFnArrow() + } /** @@ -230,8 +225,5 @@ public static function dataFnArrow() 'in_complex_match_value_in_short_array' => ['/* testFnArrowInComplexMatchValueInShortArrayValue */'], ]; - - }//end dataFnArrow() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php index aa0817a466..8a18de2041 100644 --- a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php +++ b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php @@ -33,8 +33,7 @@ public function testDoubleQuotedString($testMarker, $expectedContent) $target = $this->getTargetToken($testMarker, T_DOUBLE_QUOTED_STRING); $this->assertSame($expectedContent, $tokens[$target]['content']); - - }//end testDoubleQuotedString() + } /** @@ -137,8 +136,5 @@ public static function dataDoubleQuotedString() ', ], ]; - - }//end dataDoubleQuotedString() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/EnumCaseTest.php b/tests/Core/Tokenizers/PHP/EnumCaseTest.php index 0d3ae60a8a..30c5e6d369 100644 --- a/tests/Core/Tokenizers/PHP/EnumCaseTest.php +++ b/tests/Core/Tokenizers/PHP/EnumCaseTest.php @@ -33,8 +33,7 @@ public function testEnumCases($testMarker) $this->assertSame(T_ENUM_CASE, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_ENUM_CASE (code)'); $this->assertSame('T_ENUM_CASE', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_ENUM_CASE (type)'); - - }//end testEnumCases() + } /** @@ -55,8 +54,7 @@ public static function dataEnumCases() 'enum case, after switch statement' => ['/* testEnumCaseAfterSwitch */'], 'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'], ]; - - }//end dataEnumCases() + } /** @@ -77,8 +75,7 @@ public function testNotEnumCases($testMarker) $this->assertSame(T_CASE, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CASE (code)'); $this->assertSame('T_CASE', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CASE (type)'); - - }//end testNotEnumCases() + } /** @@ -99,8 +96,7 @@ public static function dataNotEnumCases() 'switch case, body in curlies declares enum' => ['/* testCaseInSwitchWhenCreatingEnumInSwitch1 */'], 'switch case, body after semicolon declares enum' => ['/* testCaseInSwitchWhenCreatingEnumInSwitch2 */'], ]; - - }//end dataNotEnumCases() + } /** @@ -121,8 +117,7 @@ public function testKeywordAsEnumCaseNameShouldBeString($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testKeywordAsEnumCaseNameShouldBeString() + } /** @@ -144,8 +139,5 @@ public static function dataKeywordAsEnumCaseNameShouldBeString() '"array" as case name' => ['/* testKeywordAsEnumCaseNameShouldBeString7 */'], '"exit" as case name' => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'], ]; - - }//end dataKeywordAsEnumCaseNameShouldBeString() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php index b42c20db28..72a2fb7535 100644 --- a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php +++ b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php @@ -35,8 +35,7 @@ public function testExitIsKeyword($testMarker, $testContent) $this->assertSame(T_EXIT, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_EXIT (code)'); $this->assertSame('T_EXIT', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_EXIT (type)'); - - }//end testExitIsKeyword() + } /** @@ -106,8 +105,7 @@ public static function dataExitIsKeyword() 'testContent' => '\die', ], ]; - - }//end dataExitIsKeyword() + } /** @@ -133,8 +131,7 @@ public function testNotExitKeyword($testMarker, $testContent, $expected = 'T_STR $this->assertSame($tokenCode, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expected . ' (code)'); $this->assertSame($expected, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expected . ' (type)'); - - }//end testNotExitKeyword() + } /** @@ -242,8 +239,5 @@ public static function dataNotExitKeyword() 'expected' => 'T_GOTO_LABEL', ], ]; - - }//end dataNotExitKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/FinallyTest.php b/tests/Core/Tokenizers/PHP/FinallyTest.php index 2466a50ea2..e12c9bb98a 100644 --- a/tests/Core/Tokenizers/PHP/FinallyTest.php +++ b/tests/Core/Tokenizers/PHP/FinallyTest.php @@ -33,8 +33,7 @@ public function testFinallyNonKeyword($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testFinallyNonKeyword() + } /** @@ -51,8 +50,5 @@ public static function dataFinallyNonKeyword() 'finally used as method name' => ['/* testFinallyUsedAsMethodName */'], 'finally used as property name' => ['/* testFinallyUsedAsPropertyName */'], ]; - - }//end dataFinallyNonKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/GotoLabelTest.php b/tests/Core/Tokenizers/PHP/GotoLabelTest.php index 5a5590c371..4de3248abf 100644 --- a/tests/Core/Tokenizers/PHP/GotoLabelTest.php +++ b/tests/Core/Tokenizers/PHP/GotoLabelTest.php @@ -39,8 +39,7 @@ public function testGotoStatement($testMarker, $testContent) $this->assertIsInt($label); $this->assertSame($testContent, $tokens[$label]['content']); - - }//end testGotoStatement() + } /** @@ -91,8 +90,7 @@ public static function dataGotoStatement() 'testContent' => 'null', ], ]; - - }//end dataGotoStatement() + } /** @@ -121,8 +119,7 @@ public function testGotoDeclaration($testMarker, $testContent) $this->assertSame(T_GOTO_COLON, $tokens[$next]['code']); $this->assertSame('T_GOTO_COLON', $tokens[$next]['type']); $this->assertSame(':', $tokens[$next]['content']); - - }//end testGotoDeclaration() + } /** @@ -173,8 +170,7 @@ public static function dataGotoDeclaration() 'testContent' => 'null', ], ]; - - }//end dataGotoDeclaration() + } /** @@ -207,8 +203,7 @@ public function testNotAGotoDeclaration($testMarker, $testContent, $expectedType $this->assertSame($expectedCode, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (code)'); $this->assertSame($expectedType, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedType . ' (type)'); - - }//end testNotAGotoDeclaration() + } /** @@ -274,8 +269,5 @@ public static function dataNotAGotoDeclaration() 'testContent' => 'Suit', ], ]; - - }//end dataNotAGotoDeclaration() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php index 868a8c315c..3b912a15eb 100644 --- a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php +++ b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php @@ -44,8 +44,7 @@ public function testHeredocSingleLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testHeredocSingleLine() + } /** @@ -66,8 +65,7 @@ public function testNowdocSingleLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testNowdocSingleLine() + } /** @@ -90,8 +88,7 @@ public function testHeredocMultiLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testHeredocMultiLine() + } /** @@ -114,8 +111,7 @@ public function testNowdocMultiLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testNowdocMultiLine() + } /** @@ -138,8 +134,7 @@ public function testHeredocEndsOnBlankLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testHeredocEndsOnBlankLine() + } /** @@ -162,8 +157,7 @@ public function testNowdocEndsOnBlankLine() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC); $this->checkTokenSequence($target, $expectedSequence); - - }//end testNowdocEndsOnBlankLine() + } /** @@ -206,8 +200,5 @@ private function checkTokenSequence($startPtr, array $expectedSequence) 'Token content did not match expectations' . $errorMsgSuffix ); }//end for - - }//end checkTokenSequence() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php index 2966792137..63df7ec84e 100644 --- a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php +++ b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php @@ -34,8 +34,5 @@ public function testMergeConflict() $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_START_HEREDOC (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_START_HEREDOC (type)'); - - }//end testMergeConflict() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/HeredocStringTest.php b/tests/Core/Tokenizers/PHP/HeredocStringTest.php index d87aab77fe..ca16adcc40 100644 --- a/tests/Core/Tokenizers/PHP/HeredocStringTest.php +++ b/tests/Core/Tokenizers/PHP/HeredocStringTest.php @@ -33,8 +33,7 @@ public function testHeredocString($testMarker, $expectedContent) $target = $this->getTargetToken($testMarker, T_HEREDOC); $this->assertSame($expectedContent . "\n", $tokens[$target]['content']); - - }//end testHeredocString() + } /** @@ -55,8 +54,7 @@ public function testHeredocStringWrapped($testMarker, $expectedContent) $testMarker = substr($testMarker, 0, -3) . 'Wrapped */'; $target = $this->getTargetToken($testMarker, T_HEREDOC); $this->assertSame('Do ' . $expectedContent . " Something\n", $tokens[$target]['content']); - - }//end testHeredocStringWrapped() + } /** @@ -154,8 +152,5 @@ public static function dataHeredocString() 'expectedContent' => '${foo->{"${\'a\'}"}}', ], ]; - - }//end dataHeredocString() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php index d6084d8e58..624a556a58 100644 --- a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php +++ b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php @@ -65,8 +65,7 @@ public function testNamedFunctionCallArguments($testMarker, $parameters) 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); }//end foreach - - }//end testNamedFunctionCallArguments() + } /** @@ -296,8 +295,7 @@ public static function dataNamedFunctionCallArguments() ], ], ]; - - }//end dataNamedFunctionCallArguments() + } /** @@ -327,8 +325,7 @@ public function testOtherTstringInFunctionCall($testMarker, $content) $tokens[$label]['type'], 'Token tokenized as ' . $tokens[$label]['type'] . ', not T_STRING (type)' ); - - }//end testOtherTstringInFunctionCall() + } /** @@ -358,8 +355,7 @@ public static function dataOtherTstringInFunctionCall() 'content' => 'count', ], ]; - - }//end dataOtherTstringInFunctionCall() + } /** @@ -410,8 +406,7 @@ public function testMixedPositionalAndNamedArgsWithTernary() $tokens[$colon]['type'], 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); - - }//end testMixedPositionalAndNamedArgsWithTernary() + } /** @@ -507,8 +502,7 @@ public function testNamedArgWithTernary() $tokens[$colon]['type'], 'Second arg ternary: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)' ); - - }//end testNamedArgWithTernary() + } /** @@ -588,8 +582,7 @@ public function testTernaryWithFunctionCallsInThenElse() $tokens[$colon]['type'], 'Function in else: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); - - }//end testTernaryWithFunctionCallsInThenElse() + } /** @@ -618,8 +611,7 @@ public function testTernaryWithConstantsInThenElse() $tokens[$colon]['type'], 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)' ); - - }//end testTernaryWithConstantsInThenElse() + } /** @@ -680,8 +672,7 @@ public function testSwitchStatement() $tokens[$colon]['type'], 'Default case: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); - - }//end testSwitchStatement() + } /** @@ -726,8 +717,7 @@ public function testParseErrorVariableLabel() $tokens[$colon]['type'], 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); - - }//end testParseErrorVariableLabel() + } /** @@ -770,8 +760,7 @@ public function testOtherColonsInTernary($testMarker) } } } - - }//end testOtherColonsInTernary() + } /** @@ -791,8 +780,7 @@ public static function dataOtherColonsInTernary() 'testMarker' => '/* testTernaryWithArrowFunctionsAndReturnTypes */', ], ]; - - }//end dataOtherColonsInTernary() + } /** @@ -842,8 +830,7 @@ public function testReservedKeywordsAsName($testMarker, $tokenTypes, $tokenConte $tokens[$colon]['type'], 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)' ); - - }//end testReservedKeywordsAsName() + } /** @@ -985,8 +972,5 @@ public static function dataReservedKeywordsAsName() }//end foreach return $data; - - }//end dataReservedKeywordsAsName() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php index 55612b338e..14b68dfeb6 100644 --- a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php +++ b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php @@ -56,8 +56,7 @@ public function testIdentifierTokenization($testMarker, $expectedTokens) ++$identifier; } - - }//end testIdentifierTokenization() + } /** @@ -1285,8 +1284,5 @@ public static function dataIdentifierTokenization() ], ], ]; - - }//end dataIdentifierTokenization() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php index 01dda1b72a..2d7abbc83e 100644 --- a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php +++ b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php @@ -36,8 +36,7 @@ public function testNullable($testMarker) $this->assertSame(T_NULLABLE, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_NULLABLE (code)'); $this->assertSame('T_NULLABLE', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_NULLABLE (type)'); - - }//end testNullable() + } /** @@ -61,8 +60,7 @@ public static function dataNullable() 'closure return type, nullable int' => ['/* testClosureReturnTypeNullableInt */'], 'function return type, nullable callable' => ['/* testFunctionReturnTypeNullableCallable */'], ]; - - }//end dataNullable() + } /** @@ -82,8 +80,7 @@ public function testInlineThen($testMarker) $this->assertSame(T_INLINE_THEN, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_INLINE_THEN (code)'); $this->assertSame('T_INLINE_THEN', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_INLINE_THEN (type)'); - - }//end testInlineThen() + } /** @@ -116,8 +113,5 @@ public static function dataInlineThen() 'ternary ? followed by namespace relative function call' => ['/* testInlineThenWithNamespaceRelativeNameAndParens */'], 'ternary ? followed by namespace relative static method call' => ['/* testInlineThenWithNamespaceRelativeNameAndDoubleColon */'], ]; - - }//end dataInlineThen() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php index aba26f2dd5..50f268b616 100644 --- a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php +++ b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php @@ -41,8 +41,7 @@ public function testObjectOperator() $operator = $this->getTargetToken('/* testObjectOperator */', self::TARGET_TOKENS); $this->assertSame(T_OBJECT_OPERATOR, $tokens[$operator]['code'], 'Failed asserting code is object operator'); $this->assertSame('T_OBJECT_OPERATOR', $tokens[$operator]['type'], 'Failed asserting type is object operator'); - - }//end testObjectOperator() + } /** @@ -62,8 +61,7 @@ public function testNullsafeObjectOperator($testMarker) $operator = $this->getTargetToken($testMarker, self::TARGET_TOKENS); $this->assertSame(T_NULLSAFE_OBJECT_OPERATOR, $tokens[$operator]['code'], 'Failed asserting code is nullsafe object operator'); $this->assertSame('T_NULLSAFE_OBJECT_OPERATOR', $tokens[$operator]['type'], 'Failed asserting type is nullsafe object operator'); - - }//end testNullsafeObjectOperator() + } /** @@ -79,8 +77,7 @@ public static function dataNullsafeObjectOperator() 'nullsafe operator' => ['/* testNullsafeObjectOperator */'], 'illegal nullsafe operator (write context)' => ['/* testNullsafeObjectOperatorWriteContext */'], ]; - - }//end dataNullsafeObjectOperator() + } /** @@ -108,8 +105,7 @@ public function testTernaryThen($testMarker, $testObjectOperator = false) $this->assertSame(T_OBJECT_OPERATOR, $tokens[$next]['code'], 'Failed asserting code is object operator'); $this->assertSame('T_OBJECT_OPERATOR', $tokens[$next]['type'], 'Failed asserting type is object operator'); } - - }//end testTernaryThen() + } /** @@ -137,8 +133,5 @@ public static function dataTernaryThen() 'testMarker' => '/* testLiveCoding */', ], ]; - - }//end dataTernaryThen() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php index acaabab82b..ffe0758a18 100644 --- a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php +++ b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php @@ -30,8 +30,7 @@ final class OtherContextSensitiveKeywordsTest extends AbstractTokenizerTestCase public static function setUpBeforeClass(): void { parent::clearResolvedTokensCache(); - - }//end setUpBeforeClass() + } /** @@ -51,8 +50,7 @@ public function testStrings($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testStrings() + } /** @@ -93,8 +91,7 @@ public static function dataStrings() 'constant declaration: self as name after type' => ['/* testSelfIsNameForTypedConstant */'], 'constant declaration: parent as name after type' => ['/* testParentIsNameForTypedConstant */'], ]; - - }//end dataStrings() + } /** @@ -123,8 +120,7 @@ public function testKeywords($testMarker, $expectedTokenType) $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)' ); - - }//end testKeywords() + } /** @@ -736,8 +732,5 @@ public static function dataKeywords() 'expectedTokenType' => 'T_NULL', ], ]; - - }//end dataKeywords() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php index d5cc6e7538..3cf87a1f3c 100644 --- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php +++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php @@ -55,8 +55,5 @@ public function testLongOpenTagAtEndOfFile() // Now make sure that this is the very last token in the file and there are no tokens after it. $this->assertArrayNotHasKey(($stackPtr + 2), $tokens); - - }//end testLongOpenTagAtEndOfFile() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php index 24d3417c32..59bb8c3183 100644 --- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php +++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php @@ -47,8 +47,5 @@ public function testLongOpenTagAtEndOfFile() // Now make sure that this is the very last token in the file and there are no tokens after it. $this->assertArrayNotHasKey(($stackPtr + 1), $tokens); - - }//end testLongOpenTagAtEndOfFile() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php index c64526e6eb..96bb12e639 100644 --- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php +++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php @@ -47,8 +47,5 @@ public function testLongOpenTagAtEndOfFile() // Now make sure that this is the very last token in the file and there are no tokens after it. $this->assertArrayNotHasKey(($stackPtr + 1), $tokens); - - }//end testLongOpenTagAtEndOfFile() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php index 084283d48e..91108ca282 100644 --- a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php +++ b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php @@ -33,8 +33,7 @@ final class PHPOpenTagTest extends AbstractTokenizerTestCase public function testLongOpenTag($testMarker, array $expectedTokens) { $this->checkTokenSequence($testMarker, $expectedTokens); - - }//end testLongOpenTag() + } /** @@ -131,8 +130,7 @@ public static function dataLongOpenTag() ]; return $data; - - }//end dataLongOpenTag() + } /** @@ -149,8 +147,7 @@ public static function dataLongOpenTag() public function testCaseLongOpenTag($testMarker, array $expectedTokens) { $this->checkTokenSequence($testMarker, $expectedTokens); - - }//end testCaseLongOpenTag() + } /** @@ -173,8 +170,7 @@ public static function dataCaseLongOpenTag() $data['open tag, multi space']['expectedTokens'][0]['content'] = 'checkTokenSequence($testMarker, $expectedTokens); - - }//end testShortOpenEchoTag() + } /** @@ -202,8 +197,7 @@ public function testShortOpenEchoTag($testMarker, array $expectedTokens) public static function dataShortOpenEchoTag() { return self::getOpenTagTokenizationProvider('ShortOpenEcho', 'T_OPEN_TAG_WITH_ECHO', 'checkTokenSequence($testMarker, $expectedTokens); - - }//end testShortOpenTag() + } /** @@ -235,8 +228,7 @@ public function testShortOpenTag($testMarker, array $expectedTokens) public static function dataShortOpenTag() { return self::getOpenTagTokenizationProvider('ShortOpen', 'T_OPEN_TAG', 'getTargetToken('/* ' . __FUNCTION__ . ' */', T_SWITCH); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testBracesAndColon() + } /** @@ -83,8 +81,7 @@ public function testNamedParamColon() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_STRING); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testNamedParamColon() + } /** @@ -109,8 +106,7 @@ public function testReturnTypeColon() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testReturnTypeColon() + } /** @@ -129,8 +125,7 @@ public function testConcat() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_CONSTANT_ENCAPSED_STRING); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testConcat() + } /** @@ -159,8 +154,7 @@ public function testSimpleMathTokens() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testSimpleMathTokens() + } /** @@ -183,8 +177,7 @@ public function testUnaryPlusMinus() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testUnaryPlusMinus() + } /** @@ -211,8 +204,7 @@ public function testBitwiseTokens() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testBitwiseTokens() + } /** @@ -236,8 +228,7 @@ public function testBitwiseOrInCatch() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_CATCH); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testBitwiseOrInCatch() + } /** @@ -256,8 +247,7 @@ public function testLessThan() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_LNUMBER); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testLessThan() + } /** @@ -276,8 +266,7 @@ public function testGreaterThan() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_LNUMBER); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testGreaterThan() + } /** @@ -296,8 +285,7 @@ public function testBooleanNot() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testBooleanNot() + } /** @@ -318,8 +306,7 @@ public function testComma() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testComma() + } /** @@ -340,8 +327,7 @@ public function testAsperand() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testAsperand() + } /** @@ -362,8 +348,7 @@ public function testDollarAndCurlies() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_ECHO); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testDollarAndCurlies() + } /** @@ -383,8 +368,7 @@ public function testBacktick() $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL); $this->checkTokenSequence(($target + 1), $expectedSequence); - - }//end testBacktick() + } /** @@ -424,8 +408,5 @@ private function checkTokenSequence($startPtr, array $expectedSequence) ++$sequenceKey; }//end for - - }//end checkTokenSequence() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/ShortArrayTest.php b/tests/Core/Tokenizers/PHP/ShortArrayTest.php index 625c8436c2..df44e37928 100644 --- a/tests/Core/Tokenizers/PHP/ShortArrayTest.php +++ b/tests/Core/Tokenizers/PHP/ShortArrayTest.php @@ -41,8 +41,7 @@ public function testSquareBrackets($testMarker) $this->assertSame(T_CLOSE_SQUARE_BRACKET, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SQUARE_BRACKET (code)'); $this->assertSame('T_CLOSE_SQUARE_BRACKET', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SQUARE_BRACKET (type)'); } - - }//end testSquareBrackets() + } /** @@ -86,8 +85,7 @@ public static function dataSquareBrackets() 'new anonymous class expression dereferencing 4' => ['/* testNewAnonClassImplementsExpressionDereferencing */'], 'live coding' => ['/* testLiveCoding */'], ]; - - }//end dataSquareBrackets() + } /** @@ -116,8 +114,7 @@ public function testShortArrays($testMarker) $this->assertSame(T_CLOSE_SHORT_ARRAY, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SHORT_ARRAY (code)'); $this->assertSame('T_CLOSE_SHORT_ARRAY', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SHORT_ARRAY (type)'); } - - }//end testShortArrays() + } /** @@ -142,8 +139,5 @@ public static function dataShortArrays() 'short list after alternative control structure' => ['/* testShortListDeclarationAfterAlternativeControlStructure */'], 'short list after class declaration' => ['/* testShortListDeclarationAfterClassDeclaration */'], ]; - - }//end dataShortArrays() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php index fb40685581..ec27013fa6 100644 --- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php +++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php @@ -53,8 +53,7 @@ public function testCommentTokenization($testMarker, $expectedTokens) ++$comment; } - - }//end testCommentTokenization() + } /** @@ -1057,8 +1056,5 @@ public static function dataCommentTokenization() ], ], ]; - - }//end dataCommentTokenization() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php index d6ed553d45..422827816a 100644 --- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php +++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php @@ -50,8 +50,7 @@ public function testCommentTokenization($testMarker, $expectedTokens) ++$comment; } - - }//end testCommentTokenization() + } /** @@ -368,8 +367,5 @@ public static function dataCommentTokenization() ], ], ]; - - }//end dataCommentTokenization() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php index d076a31af4..aede69e1ef 100644 --- a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php +++ b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php @@ -34,8 +34,7 @@ public function testBitwiseAnd($testMarker) $this->assertSame(T_BITWISE_AND, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_BITWISE_AND (code)'); $this->assertSame('T_BITWISE_AND', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_BITWISE_AND (type)'); - - }//end testBitwiseAnd() + } /** @@ -70,8 +69,7 @@ public static function dataBitwiseAnd() 'function return by reference' => ['/* testBitwiseAnd6 */'], 'live coding / undetermined' => ['/* testLiveCoding */'], ]; - - }//end dataBitwiseAnd() + } /** @@ -92,8 +90,7 @@ public function testTypeIntersection($testMarker) $this->assertSame(T_TYPE_INTERSECTION, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_TYPE_INTERSECTION (code)'); $this->assertSame('T_TYPE_INTERSECTION', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_TYPE_INTERSECTION (type)'); - - }//end testTypeIntersection() + } /** @@ -161,8 +158,5 @@ public static function dataTypeIntersection() 'return type for method, includes (invalid) FQN false' => ['/* testTypeIntersectionInvalidFQNFalse */'], 'return type for closure, includes (invalid) FQN null' => ['/* testTypeIntersectionInvalidFQNNull */'], ]; - - }//end dataTypeIntersection() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php index 26fd365375..05d2c5cbd8 100644 --- a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php +++ b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php @@ -43,8 +43,7 @@ public function testTernaryIsInlineThen() $tokens[$target]['type'], 'Token tokenized as ' . $tokens[$target]['type'] . ', not T_INLINE_THEN (type)' ); - - }//end testTernaryIsInlineThen() + } /** @@ -79,8 +78,7 @@ public function testUntypedConstant($testMarker) 'Token tokenized as ' . $tokens[$i]['type'] . ', not T_STRING (type)' ); } - - }//end testUntypedConstant() + } /** @@ -103,8 +101,7 @@ public static function dataUntypedConstant() 'testMarker' => '/* testClassConstVisibilityUntyped */', ], ]; - - }//end dataUntypedConstant() + } /** @@ -143,8 +140,7 @@ public function testTypedConstant($testMarker, array $sequence) ++$current; } - - }//end testTypedConstant() + } /** @@ -257,8 +253,7 @@ public static function dataTypedConstant() } return $data; - - }//end dataTypedConstant() + } /** @@ -367,8 +362,7 @@ public static function dataNullableTypedConstant() } return $data; - - }//end dataNullableTypedConstant() + } /** @@ -449,8 +443,7 @@ public static function dataUnionTypedConstant() } return $data; - - }//end dataUnionTypedConstant() + } /** @@ -487,8 +480,7 @@ public static function dataIntersectionTypedConstant() } return $data; - - }//end dataIntersectionTypedConstant() + } /** @@ -632,8 +624,5 @@ public static function dataDNFTypedConstant() } return $data; - - }//end dataDNFTypedConstant() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/PHP/YieldTest.php b/tests/Core/Tokenizers/PHP/YieldTest.php index 6ffe9c8c7d..32b81debfd 100644 --- a/tests/Core/Tokenizers/PHP/YieldTest.php +++ b/tests/Core/Tokenizers/PHP/YieldTest.php @@ -41,8 +41,7 @@ public function testYieldKeyword($testMarker, $expectedContent) $this->assertSame('T_YIELD', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_YIELD (type)'); $this->assertSame($expectedContent, $tokenArray['content'], 'Token content does not match expectation'); - - }//end testYieldKeyword() + } /** @@ -60,8 +59,7 @@ public static function dataYieldKeyword() 'expectedContent' => 'yield', ], ]; - - }//end dataYieldKeyword() + } /** @@ -89,8 +87,7 @@ public function testYieldFromKeywordSingleToken($testMarker, $expectedContent) } else { $this->assertSame($expectedContent, $tokenArray['content'], 'Token content does not match expectation'); } - - }//end testYieldFromKeywordSingleToken() + } /** @@ -116,8 +113,7 @@ public static function dataYieldFromKeywordSingleToken() 'expectedContent' => 'yield from', ], ]; - - }//end dataYieldFromKeywordSingleToken() + } /** @@ -155,8 +151,7 @@ public function testYieldFromKeywordMultiToken($testMarker, $expectedTokens) ++$target; } - - }//end testYieldFromKeywordMultiToken() + } /** @@ -381,8 +376,7 @@ public static function dataYieldFromKeywordMultiToken() ], ], ]; - - }//end dataYieldFromKeywordMultiToken() + } /** @@ -402,8 +396,7 @@ public function testYieldNonKeyword($testMarker) $this->assertSame(T_STRING, $tokenArray['code'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (code)'); $this->assertSame('T_STRING', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_STRING (type)'); - - }//end testYieldNonKeyword() + } /** @@ -425,8 +418,5 @@ public static function dataYieldNonKeyword() 'from used as class constant access' => ['/* testFromUsedForClassConstantAccess1 */'], 'yield used as method name with ref' => ['/* testYieldUsedAsMethodNameReturnByRef */'], ]; - - }//end dataYieldNonKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php index 38e7a3f84c..3eca64eb30 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php @@ -69,8 +69,7 @@ public function testNormalParentheses($testMarker, $owner = false) $this->assertArrayHasKey($openPtr, $tokens[$i]['nested_parenthesis'], 'Nested parenthesis is missing target parentheses set'); $this->assertSame($closePtr, $tokens[$i]['nested_parenthesis'][$openPtr], 'Nested parenthesis closer not set correctly'); } - - }//end testNormalParentheses() + } /** @@ -174,8 +173,7 @@ public static function dataNormalParentheses() 'testMarker' => '/* testParensNoOwnerInArrowReturnExpression */', ], ]; - - }//end dataNormalParentheses() + } /** @@ -223,8 +221,7 @@ public function testDNFTypeParentheses($testMarker) $this->assertArrayHasKey($openPtr, $tokens[$i]['nested_parenthesis'], 'Nested parenthesis is missing target parentheses set'); $this->assertSame($closePtr, $tokens[$i]['nested_parenthesis'][$openPtr], 'Nested parenthesis closer not set correctly'); }//end for - - }//end testDNFTypeParentheses() + } /** @@ -367,8 +364,5 @@ public static function dataDNFTypeParentheses() 'testMarker' => '/* testDNFTypeParamIllegalNestedParens */', ], ]; - - }//end dataDNFTypeParentheses() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php index fb9f049396..8e43db00a5 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php @@ -47,8 +47,7 @@ public function testHeredocNowdocCloserTabReplacement($testMarker, $expected) $this->assertArrayHasKey($key, $tokens[$closer], "Key $key not found in the token array."); $this->assertSame($value, $tokens[$closer][$key], "Value for key $key does not match expectation."); } - - }//end testHeredocNowdocCloserTabReplacement() + } /** @@ -110,8 +109,5 @@ public static function dataHeredocNowdocCloserTabReplacement() ], ], ]; - - }//end dataHeredocNowdocCloserTabReplacement() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php index 2da5670314..4c694d4523 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php @@ -44,8 +44,7 @@ public function testHeredocNowdocOpenerTabReplacement($testMarker, $expected) $this->assertArrayHasKey($key, $tokens[$opener], "Key $key not found in the token array."); $this->assertSame($value, $tokens[$opener][$key], "Value for key $key does not match expectation."); } - - }//end testHeredocNowdocOpenerTabReplacement() + } /** @@ -115,8 +114,5 @@ public static function dataHeredocNowdocOpenerTabReplacement() ], ], ]; - - }//end dataHeredocNowdocOpenerTabReplacement() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php index fd47bf7da5..ebc91359c8 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php +++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php @@ -100,8 +100,5 @@ public static function getTabReplacementExpected() 'orig_content' => null, ], ]; - - }//end getTabReplacementExpected() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php index 75dbbf4c16..d21a5d218b 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php @@ -46,8 +46,7 @@ public function testYieldFromTabReplacement($testMarker, $expected, $content = n $this->assertArrayHasKey($key, $tokens[$target], "Key $key not found in the token array."); $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation."); } - - }//end testYieldFromTabReplacement() + } /** @@ -93,8 +92,5 @@ public static function dataYieldFromTabReplacement() ], ], ]; - - }//end dataYieldFromTabReplacement() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php index 22e6b11f10..76e8a2c2cd 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php @@ -39,8 +39,7 @@ public function testArrayKeyword($testMarker, $testContent = 'array') $this->assertArrayHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is not set'); $this->assertArrayHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is not set'); $this->assertArrayHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is not set'); - - }//end testArrayKeyword() + } /** @@ -73,8 +72,7 @@ public static function dataArrayKeyword() 'testMarker' => '/* testOOConstDefault */', ], ]; - - }//end dataArrayKeyword() + } /** @@ -101,8 +99,7 @@ public function testArrayType($testMarker, $testContent = 'array') $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set'); - - }//end testArrayType() + } /** @@ -150,8 +147,7 @@ public static function dataArrayType() 'testContent' => 'Array', ], ]; - - }//end dataArrayType() + } /** @@ -179,8 +175,7 @@ public function testNotArrayKeyword($testMarker, $testContent = 'array') $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set'); - - }//end testNotArrayKeyword() + } /** @@ -205,8 +200,5 @@ public static function dataNotArrayKeyword() 'testContent' => 'ARRAY', ], ]; - - }//end dataNotArrayKeyword() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php index f0b449f6d3..3ab3764a98 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php @@ -33,8 +33,5 @@ public function testLiveCoding() $this->assertArrayNotHasKey('parenthesis_owner', $tokens[$use], 'parenthesis_owner key is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$use], 'parenthesis_opener key is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$use], 'parenthesis_closer key is set'); - - }//end testLiveCoding() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php index 5c5879b028..4668d9110f 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php @@ -36,8 +36,7 @@ public function testUseNotClosure($testMarker) $this->assertArrayNotHasKey('parenthesis_owner', $tokens[$use], 'parenthesis_owner key is set'); $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$use], 'parenthesis_opener key is set'); $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$use], 'parenthesis_closer key is set'); - - }//end testUseNotClosure() + } /** @@ -61,8 +60,7 @@ public static function dataUseNotClosure() 'testMarker' => '/* testUseTraitInNestedAnonClass */', ], ]; - - }//end dataUseNotClosure() + } /** @@ -115,8 +113,7 @@ public function testUseNotClosureNextOpenClose($testMarker, $expectedOwnerCode = 'Closer "parenthesis_owner" key set to unexpected owner' ); } - - }//end testUseNotClosureNextOpenClose() + } /** @@ -132,8 +129,7 @@ public static function dataUseNotClosureNextOpenClose() $data['Trait use statement']['expectedOwnerCode'] = T_FUNCTION; return $data; - - }//end dataUseNotClosureNextOpenClose() + } /** @@ -173,8 +169,7 @@ public function testClosureUse($testMarker) $this->assertSame($use, $tokens[$closer]['parenthesis_owner'], 'Closer "parenthesis_owner" key set incorrectly'); $this->assertSame($opener, $tokens[$closer]['parenthesis_opener'], 'Closer "parenthesis_opener" key set incorrectly'); $this->assertSame($closer, $tokens[$closer]['parenthesis_closer'], 'Closer "parenthesis_closer" key set incorrectly'); - - }//end testClosureUse() + } /** @@ -188,8 +183,5 @@ public static function dataClosureUse() 'Plain closure use' => ['/* testClosureUse */'], 'Closure use nested in class' => ['/* testClosureUseNestedInClass */'], ]; - - }//end dataClosureUse() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php index e6ce7936eb..838e33036f 100644 --- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php +++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php @@ -63,8 +63,7 @@ public function testParenthesesWithOwner($testMarker, $tokenCode) $this->assertSame($owner, $closerArray['parenthesis_owner'], $tokenType . ' closer "parenthesis_owner" key set incorrectly'); $this->assertSame($opener, $closerArray['parenthesis_opener'], $tokenType . ' closer "parenthesis_opener" key set incorrectly'); $this->assertSame($closer, $closerArray['parenthesis_closer'], $tokenType . ' closer "parenthesis_closer" key set incorrectly'); - - }//end testParenthesesWithOwner() + } /** @@ -225,8 +224,7 @@ public static function dataParenthesesWithOwner() 'tokenCode' => T_ANON_CLASS, ], ]; - - }//end dataParenthesesWithOwner() + } /** @@ -259,8 +257,7 @@ public function testParenthesesWithoutOwner($testMarker) $this->assertArrayHasKey('parenthesis_closer', $closerArray, 'Closer does not have "parenthesis_closer" key'); $this->assertSame($opener, $closerArray['parenthesis_opener'], 'Closer "parenthesis_opener" key set incorrectly'); $this->assertSame($closer, $closerArray['parenthesis_closer'], 'Closer "parenthesis_closer" key set incorrectly'); - - }//end testParenthesesWithoutOwner() + } /** @@ -287,8 +284,7 @@ public static function dataParenthesesWithoutOwner() 'testMarker' => '/* testNestedFunctionCallCParenthesesOpener */', ], ]; - - }//end dataParenthesesWithoutOwner() + } /** @@ -312,8 +308,7 @@ public function testParenthesesOwnerWithoutParentheses($testMarker, $tokenCode) $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, $tokenType . ' token has "parenthesis_owner" key'); $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, $tokenType . ' token has "parenthesis_opener" key'); $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, $tokenType . ' token has "parenthesis_closer" key'); - - }//end testParenthesesOwnerWithoutParentheses() + } /** @@ -337,8 +332,5 @@ public static function dataParenthesesOwnerWithoutParentheses() 'tokenCode' => T_EXIT, ], ]; - - }//end dataParenthesesOwnerWithoutParentheses() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php index 9af2915515..d61b5d9462 100644 --- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php +++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php @@ -37,8 +37,7 @@ public function testEnumCases($testMarker) $this->assertArrayNotHasKey('scope_condition', $tokenArray, 'Scope condition is set'); $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set'); $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set'); - - }//end testEnumCases() + } /** @@ -59,8 +58,7 @@ public static function dataEnumCases() 'enum case, after switch statement' => ['/* testEnumCaseAfterSwitch */'], 'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'], ]; - - }//end dataEnumCases() + } /** @@ -125,8 +123,7 @@ public function testNotEnumCases($testMarker, $expectedTokens, $testCloserMarker $tokens[$tokenArray['scope_closer']]['type'] ) ); - - }//end testNotEnumCases() + } /** @@ -216,8 +213,7 @@ public static function dataNotEnumCases() ], ], ]; - - }//end dataNotEnumCases() + } /** @@ -242,8 +238,7 @@ public function testKeywordAsEnumCaseNameShouldBeString($testMarker) $this->assertArrayNotHasKey('scope_condition', $tokenArray, 'Scope condition is set'); $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set'); $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set'); - - }//end testKeywordAsEnumCaseNameShouldBeString() + } /** @@ -265,8 +260,5 @@ public static function dataKeywordAsEnumCaseNameShouldBeString() '"array" as case name' => ['/* testKeywordAsEnumCaseNameShouldBeString7 */'], '"exit" as case name' => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'], ]; - - }//end dataKeywordAsEnumCaseNameShouldBeString() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php index 0fdf869730..a647ef9f2d 100644 --- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php +++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php @@ -73,8 +73,7 @@ public function testMatchDefault($testMarker, $testContent = 'default') $tokenArray, sprintf('Scope closer is set. Marker: %s.', $testMarker) ); - - }//end testMatchDefault() + } /** @@ -128,8 +127,7 @@ public static function dataMatchDefault() 'testContent' => 'DEFAULT', ], ]; - - }//end dataMatchDefault() + } /** @@ -283,8 +281,7 @@ public function testSwitchDefault($testMarker, $openerMarker, $closerMarker, $co ); } }//end if - - }//end testSwitchDefault() + } /** @@ -341,8 +338,7 @@ public static function dataSwitchDefault() 'closerMarker' => '/* testSwitchDefaultNestedIfWithAndWithoutBracesScopeCloser */', ], ]; - - }//end dataSwitchDefault() + } /** @@ -390,8 +386,7 @@ public function testNotDefaultKeyword($testMarker, $testContent = 'DEFAULT') $tokenArray, sprintf('Scope closer is set. Marker: %s.', $testMarker) ); - - }//end testNotDefaultKeyword() + } /** @@ -467,8 +462,7 @@ public static function dataNotDefaultKeyword() 'testContent' => 'default', ], ]; - - }//end dataNotDefaultKeyword() + } /** @@ -490,8 +484,5 @@ public function testIssue3326() $this->assertArrayNotHasKey('scope_condition', $tokenArray, 'Scope condition is set'); $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set'); $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set'); - - }//end testIssue3326() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php index 4eac006929..605891e786 100644 --- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php +++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php @@ -69,8 +69,5 @@ public function testIfElseWithNestedCaseMissingBreakSharedClosers() $tokens[$tokenArray['scope_closer']]['type'] ) ); - - }//end testIfElseWithNestedCaseMissingBreakSharedClosers() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php index 7b4b9f6d94..3de81f8837 100644 --- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php +++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php @@ -83,8 +83,7 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker $tokens[$tokenArray['scope_closer']]['type'] ) ); - - }//end testSwitchScope() + } /** @@ -153,8 +152,5 @@ public static function dataSwitchScope() ], ]; - - }//end dataSwitchScope() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php index 79c1cf84f3..c8eef9fe77 100644 --- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php +++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php @@ -50,8 +50,7 @@ public function testScopeSetting($testMarker, $tokenTypes, $open = [T_OPEN_CURLY $this->assertArrayHasKey('scope_closer', $tokens[$closer], 'Scope closer missing for close curly'); $this->assertSame($opener, $tokens[$closer]['scope_opener'], 'Scope opener not same for close curly'); $this->assertSame($closer, $tokens[$closer]['scope_closer'], 'Scope closer not same for close curly'); - - }//end testScopeSetting() + } /** @@ -91,8 +90,5 @@ public static function dataScopeSetting() 'close' => [T_SEMICOLON], ], ]; - - }//end dataScopeSetting() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php index fbe95c4130..cc9855b5cf 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php @@ -54,8 +54,7 @@ public function testTabWidthNotSet() $this->assertSame(' ', $tokens[$target]['content'], 'Content after tab replacement is not as expected'); $this->assertSame(2, $tokens[$target]['length'], 'Length after tab replacement is not as expected'); $this->assertArrayHasKey('orig_content', $tokens[$target], "Key 'orig_content' not found in the token array."); - - }//end testTabWidthNotSet() + } /** @@ -86,8 +85,7 @@ public function testLengthSettingRespectsEncoding() $this->assertSame(17, $tokens[$target]['length'], 'Length is not as expected'); $this->assertArrayHasKey('orig_content', $tokens[$target], "Key 'orig_content' not found in the token array."); $this->assertSame("'пасха пасха'", $tokens[$target]['orig_content'], 'Orig_content is not as expected'); - - }//end testLengthSettingRespectsEncoding() + } /** @@ -116,8 +114,5 @@ public function testLengthSettingFallsBackToBytesWhenTextContainsIllegalChars() $this->assertIsInt($target, 'Target token was not found'); $this->assertSame(11, $tokens[$target]['length'], 'Length is not as expected'); $this->assertArrayHasKey('orig_content', $tokens[$target], "Key 'orig_content' not found in the token array."); - - }//end testLengthSettingFallsBackToBytesWhenTextContainsIllegalChars() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php index 2962153454..ea105b20b0 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php @@ -104,8 +104,5 @@ public static function getTabReplacementExpected() ', ], ]; - - }//end getTabReplacementExpected() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php index 92de221d89..4ebac3346d 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php @@ -104,8 +104,5 @@ public static function getTabReplacementExpected() ', ], ]; - - }//end getTabReplacementExpected() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php index 5f74187989..058770bbaf 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php @@ -104,8 +104,5 @@ public static function getTabReplacementExpected() ', ], ]; - - }//end getTabReplacementExpected() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php index 361894fb94..8ed7a3c107 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php @@ -104,8 +104,5 @@ public static function getTabReplacementExpected() ', ], ]; - - }//end getTabReplacementExpected() - - -}//end class + } +} diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php index 877d04a51a..0b6e117954 100644 --- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php +++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php @@ -48,8 +48,7 @@ public static function setUpBeforeClass(): void if (copy($baseFileName, self::$caseFileName) === false) { throw new Exception(sprintf('Failed to copy test case file "ReplaceTabsInTokenTest.inc" to %s', self::$caseFileName)); } - - }//end setUpBeforeClass() + } /** @@ -60,8 +59,7 @@ public static function setUpBeforeClass(): void public static function tearDownAfterClass(): void { @unlink(self::$caseFileName); - - }//end tearDownAfterClass() + } /** @@ -93,8 +91,7 @@ public function testNoReplacementsAreMadeWhenNoTabsAreFound($testMarker, $testTa $this->assertArrayHasKey($key, $tokens[$target], "Key $key not found in the token array."); $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation."); } - - }//end testNoReplacementsAreMadeWhenNoTabsAreFound() + } /** @@ -128,8 +125,7 @@ public static function dataNoReplacementsAreMadeWhenNoTabsAreFound() ], ], ]; - - }//end dataNoReplacementsAreMadeWhenNoTabsAreFound() + } /** @@ -160,8 +156,7 @@ public function testTabReplacement($testMarker, $testTarget, $expected, $offset $this->assertArrayHasKey($key, $tokens[$target], "Key $key not found in the token array."); $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation."); } - - }//end testTabReplacement() + } /** @@ -251,8 +246,7 @@ public static function dataTabReplacement() $data['Mixed tab/space indentation']['offset'] = 1; return $data; - - }//end dataTabReplacement() + } /** @@ -265,6 +259,4 @@ public static function dataTabReplacement() * @return array> */ abstract public static function getTabReplacementExpected(); - - -}//end class +} diff --git a/tests/Core/Util/Common/EscapeshellcmdTest.php b/tests/Core/Util/Common/EscapeshellcmdTest.php index dab28e2299..33368bea55 100644 --- a/tests/Core/Util/Common/EscapeshellcmdTest.php +++ b/tests/Core/Util/Common/EscapeshellcmdTest.php @@ -41,8 +41,7 @@ public function testEscapeshellcmd($command, $expected, $expectedWin = null) } $this->assertSame($expected, Common::escapeshellcmd($command)); - - }//end testEscapeshellcmd() + } /** @@ -84,8 +83,5 @@ public static function dataEscapeshellcmd() 'expectedWin' => 'php^ -f^ ./^~home/path^ to/file.php', ], ]; - - }//end dataEscapeshellcmd() - - -}//end class + } +} diff --git a/tests/Core/Util/Common/GetSniffCodeTest.php b/tests/Core/Util/Common/GetSniffCodeTest.php index 36002b05b9..fe15b97d69 100644 --- a/tests/Core/Util/Common/GetSniffCodeTest.php +++ b/tests/Core/Util/Common/GetSniffCodeTest.php @@ -39,8 +39,7 @@ public function testGetSniffCodeThrowsExceptionOnInvalidInput($input) $this->expectExceptionMessage($message); Common::getSniffCode($input); - - }//end testGetSniffCodeThrowsExceptionOnInvalidInput() + } /** @@ -56,8 +55,7 @@ public static function dataGetSniffCodeThrowsExceptionOnInvalidInput() 'Class name is not a string' => [true], 'Class name is empty' => [''], ]; - - }//end dataGetSniffCodeThrowsExceptionOnInvalidInput() + } /** @@ -78,8 +76,7 @@ public function testGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass( $this->expectExceptionMessage($message); Common::getSniffCode($input); - - }//end testGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass() + } /** @@ -103,8 +100,7 @@ public static function dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTes 'Fully qualified class name, no Sniffs or Tests leaf' => ['CompanyName\\CustomSniffs\\Whatever\\CheckMeSniff'], 'Fully qualified class name, category called Sniffs' => ['CompanyName\\Sniffs\\Sniffs\\InvalidCategorySniff'], ]; - - }//end dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass() + } /** @@ -120,8 +116,7 @@ public static function dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTes public function testGetSniffCode($fqnClass, $expected) { $this->assertSame($expected, Common::getSniffCode($fqnClass)); - - }//end testGetSniffCode() + } /** @@ -159,8 +154,5 @@ public static function dataGetSniffCode() 'expected' => 'MyStandard.Category.AnalyzeMe', ], ]; - - }//end dataGetSniffCode() - - -}//end class + } +} diff --git a/tests/Core/Util/Common/IsCamelCapsTest.php b/tests/Core/Util/Common/IsCamelCapsTest.php index ef12b322a8..172b7890cf 100644 --- a/tests/Core/Util/Common/IsCamelCapsTest.php +++ b/tests/Core/Util/Common/IsCamelCapsTest.php @@ -34,8 +34,7 @@ final class IsCamelCapsTest extends TestCase public function testValidNotClassFormatPublic($name, $strict) { $this->assertTrue(Common::isCamelCaps($name, false, true, $strict)); - - }//end testValidNotClassFormatPublic() + } /** @@ -61,8 +60,7 @@ public static function dataValidNotClassFormatPublic() 'strict' => false, ], ]; - - }//end dataValidNotClassFormatPublic() + } /** @@ -77,8 +75,7 @@ public static function dataValidNotClassFormatPublic() public function testInvalidNotClassFormatPublic($name) { $this->assertFalse(Common::isCamelCaps($name, false, true, true)); - - }//end testInvalidNotClassFormatPublic() + } /** @@ -135,8 +132,7 @@ public static function dataInvalidNotClassFormatPublic() 'name' => '', ], ]; - - }//end dataInvalidNotClassFormatPublic() + } /** @@ -152,8 +148,7 @@ public static function dataInvalidNotClassFormatPublic() public function testValidNotClassFormatPrivate($name, $strict) { $this->assertTrue(Common::isCamelCaps($name, false, false, $strict)); - - }//end testValidNotClassFormatPrivate() + } /** @@ -187,8 +182,7 @@ public static function dataValidNotClassFormatPrivate() 'strict' => true, ], ]; - - }//end dataValidNotClassFormatPrivate() + } /** @@ -204,8 +198,7 @@ public static function dataValidNotClassFormatPrivate() public function testInvalidNotClassFormatPrivate($name, $strict) { $this->assertFalse(Common::isCamelCaps($name, false, false, $strict)); - - }//end testInvalidNotClassFormatPrivate() + } /** @@ -267,8 +260,7 @@ public static function dataInvalidNotClassFormatPrivate() 'strict' => true, ], ]; - - }//end dataInvalidNotClassFormatPrivate() + } /** @@ -284,8 +276,7 @@ public static function dataInvalidNotClassFormatPrivate() public function testValidClassFormatPublic($name, $strict) { $this->assertTrue(Common::isCamelCaps($name, true, true, $strict)); - - }//end testValidClassFormatPublic() + } /** @@ -331,8 +322,7 @@ public static function dataValidClassFormatPublic() 'strict' => false, ], ]; - - }//end dataValidClassFormatPublic() + } /** @@ -347,8 +337,7 @@ public static function dataValidClassFormatPublic() public function testInvalidClassFormat($name) { $this->assertFalse(Common::isCamelCaps($name, true)); - - }//end testInvalidClassFormat() + } /** @@ -374,8 +363,7 @@ public static function dataInvalidClassFormat() 'name' => '', ], ]; - - }//end dataInvalidClassFormat() + } /** @@ -394,8 +382,7 @@ public static function dataInvalidClassFormat() public function testInvalidClassFormatWithVisibilityPublicFlag($name, $visibilityPublic) { $this->assertFalse(Common::isCamelCaps($name, true, $visibilityPublic)); - - }//end testInvalidClassFormatWithVisibilityPublicFlag() + } /** @@ -425,8 +412,7 @@ public static function dataInvalidClassFormatWithVisibilityPublicFlag() 'visibilityPublic' => false, ], ]; - - }//end dataInvalidClassFormatWithVisibilityPublicFlag() + } /** @@ -441,8 +427,7 @@ public static function dataInvalidClassFormatWithVisibilityPublicFlag() public function testValidDefaultArguments($name) { $this->assertTrue(Common::isCamelCaps($name)); - - }//end testValidDefaultArguments() + } /** @@ -462,8 +447,7 @@ public static function dataValidDefaultArguments() 'name' => 'this3IsCamelCaps', ], ]; - - }//end dataValidDefaultArguments() + } /** @@ -478,8 +462,7 @@ public static function dataValidDefaultArguments() public function testInvalidDefaultArguments($name) { $this->assertFalse(Common::isCamelCaps($name)); - - }//end testInvalidDefaultArguments() + } /** @@ -505,8 +488,5 @@ public static function dataInvalidDefaultArguments() 'name' => 'thisISCamelCaps', ], ]; - - }//end dataInvalidDefaultArguments() - - -}//end class + } +} diff --git a/tests/Core/Util/Common/PrepareForOutputTest.php b/tests/Core/Util/Common/PrepareForOutputTest.php index f9ad07af51..e70e3b7fd6 100644 --- a/tests/Core/Util/Common/PrepareForOutputTest.php +++ b/tests/Core/Util/Common/PrepareForOutputTest.php @@ -37,8 +37,7 @@ final class PrepareForOutputTest extends TestCase public function testPrepareForOutput($content, $exclude, $expected, $expectedWin) { $this->assertSame($expected, Common::prepareForOutput($content, $exclude)); - - }//end testPrepareForOutput() + } /** @@ -57,8 +56,7 @@ public function testPrepareForOutput($content, $exclude, $expected, $expectedWin public function testPrepareForOutputWindows($content, $exclude, $expected, $expectedWin) { $this->assertSame($expectedWin, Common::prepareForOutput($content, $exclude)); - - }//end testPrepareForOutputWindows() + } /** @@ -106,8 +104,5 @@ public static function dataPrepareForOutput() 'expectedWin' => "\r\n\\t ", ], ]; - - }//end dataPrepareForOutput() - - -}//end class + } +} diff --git a/tests/Core/Util/Common/StripColorsTest.php b/tests/Core/Util/Common/StripColorsTest.php index ff253b8b8e..38b83ffcb1 100644 --- a/tests/Core/Util/Common/StripColorsTest.php +++ b/tests/Core/Util/Common/StripColorsTest.php @@ -34,8 +34,7 @@ final class StripColorsTest extends TestCase public function testStripColors($text, $expected) { $this->assertSame($expected, Common::stripColors($text)); - - }//end testStripColors() + } /** @@ -89,8 +88,5 @@ public static function dataStripColors() Next line Last', ], ]; - - }//end dataStripColors() - - -}//end class + } +} diff --git a/tests/Core/Util/Common/SuggestTypeTest.php b/tests/Core/Util/Common/SuggestTypeTest.php index 8061ae2593..948decc964 100644 --- a/tests/Core/Util/Common/SuggestTypeTest.php +++ b/tests/Core/Util/Common/SuggestTypeTest.php @@ -29,8 +29,7 @@ final class SuggestTypeTest extends TestCase public function testSuggestTypeEmpty() { $this->assertSame('', Common::suggestType('')); - - }//end testSuggestTypeEmpty() + } /** @@ -46,8 +45,7 @@ public function testSuggestTypeAllowedType($varType) { $result = Common::suggestType($varType); $this->assertSame($varType, $result); - - }//end testSuggestTypeAllowedType() + } /** @@ -65,8 +63,7 @@ public static function dataSuggestTypeAllowedType() } return $data; - - }//end dataSuggestTypeAllowedType() + } /** @@ -83,8 +80,7 @@ public function testSuggestTypeAllowedTypeWrongCase($varType, $expected) { $result = Common::suggestType($varType); $this->assertSame($expected, $result); - - }//end testSuggestTypeAllowedTypeWrongCase() + } /** @@ -109,8 +105,7 @@ public static function dataSuggestTypeAllowedTypeWrongCase() } return $data; - - }//end dataSuggestTypeAllowedTypeWrongCase() + } /** @@ -127,8 +122,7 @@ public function testSuggestTypeOther($varType, $expected) { $result = Common::suggestType($varType); $this->assertSame($expected, $result); - - }//end testSuggestTypeOther() + } /** @@ -217,8 +211,5 @@ public static function dataSuggestTypeOther() 'expected' => '\DateTime', ], ]; - - }//end dataSuggestTypeOther() - - -}//end class + } +} diff --git a/tests/Core/Util/ExitCode/ExitCodeTest.php b/tests/Core/Util/ExitCode/ExitCodeTest.php index c95a34e30d..bff490872f 100644 --- a/tests/Core/Util/ExitCode/ExitCodeTest.php +++ b/tests/Core/Util/ExitCode/ExitCodeTest.php @@ -49,8 +49,7 @@ protected function setUp(): void // Reset static properties on the Config class. AbstractRunnerTestCase::setUp(); - - }//end setUp() + } /** @@ -68,8 +67,7 @@ protected function tearDown(): void // Delete the cache file between tests to prevent a cache from an earlier test run influencing the results of the tests. @unlink(self::CACHE_FILE); - - }//end tearDown() + } /** @@ -91,8 +89,7 @@ public static function tearDownAfterClass(): void } AbstractRunnerTestCase::tearDownAfterClass(); - - }//end tearDownAfterClass() + } /** @@ -110,8 +107,7 @@ public function testPhpcsNoParallel($extraArgs, $expected) $extraArgs[] = self::SOURCE_DIR . 'mix-errors-warnings.inc'; $this->runPhpcsAndCheckExitCode($extraArgs, $expected); - - }//end testPhpcsNoParallel() + } /** @@ -136,8 +132,7 @@ public function testPhpcsParallel($extraArgs, $expected) $extraArgs[] = '--parallel=3'; $this->runPhpcsAndCheckExitCode($extraArgs, $expected); - - }//end testPhpcsParallel() + } /** @@ -171,8 +166,7 @@ public function testPhpcsWithCache($extraArgs, $expected) // Second run to verify the exit code is the same when the results are taking from the cache. $this->runPhpcsAndCheckExitCode($extraArgs, $expected); - - }//end testPhpcsWithCache() + } /** @@ -198,8 +192,7 @@ private function runPhpcsAndCheckExitCode($extraArgs, $expected) ob_end_clean(); $this->assertSame($expected, $actual); - - }//end runPhpcsAndCheckExitCode() + } /** @@ -368,8 +361,7 @@ public static function dataPhpcs() 'expected' => 1, ], ]; - - }//end dataPhpcs() + } /** @@ -388,8 +380,7 @@ public function testPhpcbfNoParallel($extraArgs, $expected) $extraArgs[] = self::SOURCE_DIR . 'mix-errors-warnings.inc'; $this->runPhpcbfAndCheckExitCode($extraArgs, $expected); - - }//end testPhpcbfNoParallel() + } /** @@ -415,8 +406,7 @@ public function testPhpcbfParallel($extraArgs, $expected) $extraArgs[] = '--parallel=3'; $this->runPhpcbfAndCheckExitCode($extraArgs, $expected); - - }//end testPhpcbfParallel() + } /** @@ -442,8 +432,7 @@ private function runPhpcbfAndCheckExitCode($extraArgs, $expected) ob_end_clean(); $this->assertSame($expected, $actual); - - }//end runPhpcbfAndCheckExitCode() + } /** @@ -640,8 +629,7 @@ public static function dataPhpcbf() 'expected' => 0, ], ]; - - }//end dataPhpcbf() + } /** @@ -666,8 +654,5 @@ private function setServerArgs($cmd, $extraArgs) foreach ($extraArgs as $arg) { $_SERVER['argv'][] = $arg; } - - }//end setServerArgs() - - -}//end class + } +} diff --git a/tests/Core/Util/Help/HelpTest.php b/tests/Core/Util/Help/HelpTest.php index cfad8d4755..a328ab34f7 100644 --- a/tests/Core/Util/Help/HelpTest.php +++ b/tests/Core/Util/Help/HelpTest.php @@ -65,8 +65,7 @@ public function testQaArgumentNamesAreWithinAcceptableBounds() ); } } - - }//end testQaArgumentNamesAreWithinAcceptableBounds() + } /** @@ -129,8 +128,7 @@ public function testQaValidCategoryOptionDefinitions() } }//end foreach }//end foreach - - }//end testQaValidCategoryOptionDefinitions() + } /** @@ -143,8 +141,7 @@ public function testConstructorTypeError() $this->expectException(TypeError::class); new Help(new ConfigDouble(), [], []); - - }//end testConstructorTypeError() + } /** @@ -176,8 +173,7 @@ public function testOptionFiltering($longOptions, $shortOptions, $expected) } $this->assertSame($expected, $activeOptions, 'Option count per category does not match'); - - }//end testOptionFiltering() + } /** @@ -282,8 +278,7 @@ public static function dataOptionFiltering() ], ], ]; - - }//end dataOptionFiltering() + } /** @@ -321,8 +316,7 @@ public function testOptionFilteringSpacerHandling($longOptions, $shortOptions) $previousWasSpacer = isset($option['spacer']); } } - - }//end testOptionFilteringSpacerHandling() + } /** @@ -358,8 +352,7 @@ public static function dataOptionFilteringSpacerHandling() 'shortOptions' => 'spqm', ], ]; - - }//end dataOptionFilteringSpacerHandling() + } /** @@ -380,8 +373,7 @@ public function testDisplayUsageCS($cliArgs, $expectedRegex) $expectedRegex = str_replace('phpc(bf|s)', 'phpcs', $expectedRegex); $this->verifyDisplayUsage($cliArgs, $expectedRegex); - - }//end testDisplayUsageCS() + } /** @@ -403,8 +395,7 @@ public function testDisplayUsageCBF($cliArgs, $expectedRegex) $expectedRegex = str_replace('phpc(bf|s)', 'phpcbf', $expectedRegex); $this->verifyDisplayUsage($cliArgs, $expectedRegex); - - }//end testDisplayUsageCBF() + } /** @@ -423,8 +414,7 @@ private function verifyDisplayUsage($cliArgs, $expectedRegex) $this->expectOutputRegex($expectedRegex); $help->display(); - - }//end verifyDisplayUsage() + } /** @@ -444,8 +434,7 @@ public static function dataDisplayUsage() 'expectedRegex' => '`^\s*\\033\[33mUsage:\\033\[0m\s+phpc(bf|s) \[options\] \\s+$`', ], ]; - - }//end dataDisplayUsage() + } /** @@ -473,8 +462,7 @@ public function testReportWidthCalculations($reportWidth, $longOptions, $expecte $this->invokeReflectionMethod($help, 'printCategories'); $this->expectOutputString($expectedOutput); - - }//end testReportWidthCalculations() + } /** @@ -530,8 +518,7 @@ public static function dataReportWidthCalculations() ], ]; // phpcs:enable - - }//end dataReportWidthCalculations() + } /** @@ -550,8 +537,7 @@ public function testColorizeVariableInput($input, $expected) $result = $this->invokeReflectionMethod($help, 'colorizeVariableInput', $input); $this->assertSame($expected, $result); - - }//end testColorizeVariableInput() + } /** @@ -591,8 +577,7 @@ public static function dataColorizeVariableInput() 'expected' => "Start \033[36m text>\033[32m end", ], ]; - - }//end dataColorizeVariableInput() + } /** @@ -615,8 +600,7 @@ public function testPrintCategoryOptionsNoColor($input, $expectedRegex) $this->invokeReflectionMethod($help, 'printCategoryOptions', $input); $this->expectOutputRegex($expectedRegex['no-color']); - - }//end testPrintCategoryOptionsNoColor() + } /** @@ -639,8 +623,7 @@ public function testPrintCategoryOptionsColor($input, $expectedRegex) $this->invokeReflectionMethod($help, 'printCategoryOptions', $input); $this->expectOutputRegex($expectedRegex['color']); - - }//end testPrintCategoryOptionsColor() + } /** @@ -710,8 +693,7 @@ public static function dataPrintCategoryOptions() ], ]; // phpcs:enable - - }//end dataPrintCategoryOptions() + } /** @@ -737,8 +719,7 @@ private function invokeReflectionMethod(Help $help, $methodName, $params = null) (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(false); return $returnValue; - - }//end invokeReflectionMethod() + } /** @@ -757,8 +738,7 @@ private function getReflectionProperty(Help $help, $properyName) (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false); return $returnValue; - - }//end getReflectionProperty() + } /** @@ -776,8 +756,5 @@ private function setReflectionProperty(Help $help, $properyName, $value) (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(true); $reflProperty->setValue($help, $value); (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false); - - }//end setReflectionProperty() - - -}//end class + } +} diff --git a/tests/Core/Util/IgnoreList/CheckAndSetTest.php b/tests/Core/Util/IgnoreList/CheckAndSetTest.php index 3d521ae947..82aae4bbef 100644 --- a/tests/Core/Util/IgnoreList/CheckAndSetTest.php +++ b/tests/Core/Util/IgnoreList/CheckAndSetTest.php @@ -41,8 +41,7 @@ public function testCheckAndSet($toSet, $toCheck) foreach ($toCheck as $code => $expect) { $this->assertSame($expect, $ignoreList->isIgnored($code), "$code is ignored"); } - - }//end testCheckAndSet() + } /** @@ -138,8 +137,5 @@ public static function dataCheckAndSet() ], ], ]; - - }//end dataCheckAndSet() - - -}//end class + } +} diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php index 1b4515ddd9..84a54a4bb0 100644 --- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php +++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php @@ -30,8 +30,5 @@ public function testGetInstanceIgnoringAllWorks() $ignoreList = IgnoreList::getInstanceIgnoringAll(); $this->assertInstanceOf(IgnoreList::class, $ignoreList); $this->assertTrue($ignoreList->isIgnored('Anything')); - - }//end testGetInstanceIgnoringAllWorks() - - -}//end class + } +} diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php index 418539418b..61a931aba8 100644 --- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php +++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php @@ -30,8 +30,5 @@ public function testGetInstanceIgnoringNothingWorks() $ignoreList = IgnoreList::getInstanceIgnoringNothing(); $this->assertInstanceOf(IgnoreList::class, $ignoreList); $this->assertFalse($ignoreList->isIgnored('Anything')); - - }//end testGetInstanceIgnoringNothingWorks() - - -}//end class + } +} diff --git a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php index 23837ab533..e1d0f6621c 100644 --- a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php +++ b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php @@ -35,8 +35,5 @@ public function testGetNewInstanceFrom() $this->assertNotSame($ignoreList, $ignoreList2, 'Passing an instance returns a different instance'); $this->assertTrue($ignoreList2->isIgnored('Foo.Bar'), 'New instance ignores the same as the old one'); - - }//end testGetNewInstanceFrom() - - -}//end class + } +} diff --git a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php index d77c1fa8cd..36782f4989 100644 --- a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php +++ b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php @@ -36,8 +36,7 @@ public function testIgnoresNothingAndEverything($ignoreList, $expectIgnoresNothi { $this->assertSame($expectIgnoresNothing, $ignoreList->ignoresNothing(), 'Ignores nothing'); $this->assertSame($expectIgnoresEverything, $ignoreList->ignoresEverything(), 'Ignores everything'); - - }//end testIgnoresNothingAndEverything() + } /** @@ -96,8 +95,5 @@ public static function dataIgnoresNothingAndEverything() 'expectIgnoresEverything' => true, ], ]; - - }//end dataIgnoresNothingAndEverything() - - -}//end class + } +} diff --git a/tests/Core/Util/MessageCollector/MessageCollectorTest.php b/tests/Core/Util/MessageCollector/MessageCollectorTest.php index 69a16767e8..b98c228344 100644 --- a/tests/Core/Util/MessageCollector/MessageCollectorTest.php +++ b/tests/Core/Util/MessageCollector/MessageCollectorTest.php @@ -40,8 +40,7 @@ public function testAddingNonStringMessageResultsInException($message) $msgCollector = new MessageCollector(); $msgCollector->add($message); - - }//end testAddingNonStringMessageResultsInException() + } /** @@ -59,8 +58,7 @@ public static function dataAddingNonStringMessageResultsInException() 'integer' => [10], 'array' => [['something' => 'incorrect']], ]; - - }//end dataAddingNonStringMessageResultsInException() + } /** @@ -81,8 +79,7 @@ public function testAddingMessageWithUnsupportedMessageTypeResultsInException($t $msgCollector = new MessageCollector(); $msgCollector->add('Message', $type); - - }//end testAddingMessageWithUnsupportedMessageTypeResultsInException() + } /** @@ -105,8 +102,7 @@ public static function dataAddingMessageWithUnsupportedMessageTypeResultsInExcep 'integer which doesn\'t match any of the message type constants: 123' => [123], 'integer which doesn\'t match any of the message type constants: PHP_INT_MAX' => [PHP_INT_MAX], ]; - - }//end dataAddingMessageWithUnsupportedMessageTypeResultsInException() + } /** @@ -128,8 +124,7 @@ public function testContainsBlockingErrors($messages, $expected) $this->createErrorCache($msgCollector, $messages); $this->assertSame($expected, $msgCollector->containsBlockingErrors()); - - }//end testContainsBlockingErrors() + } /** @@ -171,8 +166,7 @@ public static function dataContainsBlockingErrors() 'expected' => true, ], ]; - - }//end dataContainsBlockingErrors() + } /** @@ -201,8 +195,7 @@ public function testDisplayingNonBlockingMessages($messages, $expected) $msgCollector->display(); $this->assertStderrOutputSameString($expected); - - }//end testDisplayingNonBlockingMessages() + } /** @@ -278,8 +271,7 @@ public static function dataDisplayingNonBlockingMessages() ], ]; // phpcs:enable - - }//end dataDisplayingNonBlockingMessages() + } /** @@ -306,8 +298,7 @@ public function testDisplayingBlockingErrors($messages, $expected) $msgCollector = new MessageCollector(); $this->createErrorCache($msgCollector, $messages); $msgCollector->display(); - - }//end testDisplayingBlockingErrors() + } /** @@ -355,8 +346,7 @@ public static function dataDisplayingBlockingErrors() ], ]; // phpcs:enable - - }//end dataDisplayingBlockingErrors() + } /** @@ -382,8 +372,7 @@ public function testNonUniqueMessagesWithDifferentErrorLevelAreAccepted() $msgCollector->display(); $this->assertStderrOutputSameString($expected); - - }//end testNonUniqueMessagesWithDifferentErrorLevelAreAccepted() + } /** @@ -409,8 +398,7 @@ public function testNonUniqueMessagesWithSameErrorLevelAreAccepted() $msgCollector->display(); $this->assertStderrOutputSameString($expected); - - }//end testNonUniqueMessagesWithSameErrorLevelAreAccepted() + } /** @@ -441,8 +429,7 @@ public function testCallingDisplayTwiceWillNotShowMessagesTwice() $msgCollector->display(); $this->assertStderrOutputSameString($expected); - - }//end testCallingDisplayTwiceWillNotShowMessagesTwice() + } /** @@ -472,8 +459,7 @@ public function testDisplayOrderHandling($order, $expected) $msgCollector->display($order); $this->assertStderrOutputSameString($expected); - - }//end testDisplayOrderHandling() + } /** @@ -509,8 +495,7 @@ public static function dataDisplayOrderHandling() 'expected' => $expectedForSeverity, ], ]; - - }//end dataDisplayOrderHandling() + } /** @@ -527,8 +512,5 @@ private function createErrorCache(MessageCollector $collector, $messages) foreach ($messages as $msg => $type) { $collector->add($msg, $type); } - - }//end createErrorCache() - - -}//end class + } +} diff --git a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php index 93b3d05e1e..66b78ef7e5 100644 --- a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php +++ b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php @@ -34,8 +34,7 @@ final class GetHumanReadableDurationTest extends TestCase public function testGetHumanReadableDuration($duration, $expected) { $this->assertSame($expected, Timing::getHumanReadableDuration($duration)); - - }//end testGetHumanReadableDuration() + } /** @@ -107,8 +106,5 @@ public static function dataGetHumanReadableDuration() 'expected' => '89 mins, 24 secs', ], ]; - - }//end dataGetHumanReadableDuration() - - -}//end class + } +} diff --git a/tests/Core/Util/Timing/TimingTest.php b/tests/Core/Util/Timing/TimingTest.php index 29d9f31d97..b58bf7c06d 100644 --- a/tests/Core/Util/Timing/TimingTest.php +++ b/tests/Core/Util/Timing/TimingTest.php @@ -38,8 +38,7 @@ final class TimingTest extends TestCase public function testGetDurationWithoutStartReturnsZero() { $this->assertSame(0, Timing::getDuration()); - - }//end testGetDurationWithoutStartReturnsZero() + } /** @@ -54,8 +53,7 @@ public function testGetDurationWithStartReturnsMilliseconds() $duration = Timing::getDuration(); $this->assertIsFloat($duration); - - }//end testGetDurationWithStartReturnsMilliseconds() + } /** @@ -70,8 +68,7 @@ public function testGetDurationSinceReturnsMilliseconds() $duration = Timing::getDurationSince($startTime); $this->assertIsFloat($duration); - - }//end testGetDurationSinceReturnsMilliseconds() + } /** @@ -86,8 +83,7 @@ public function testTimeIsNotPrintedIfTimerWasNeverStarted() Timing::printRunTime(); $this->assertStderrOutputSameString(''); - - }//end testTimeIsNotPrintedIfTimerWasNeverStarted() + } /** @@ -102,8 +98,7 @@ public function testTimeIsNotPrintedIfTimerWasNeverStartedEvenWhenForced() Timing::printRunTime(true); $this->assertStderrOutputSameString(''); - - }//end testTimeIsNotPrintedIfTimerWasNeverStartedEvenWhenForced() + } /** @@ -123,8 +118,7 @@ public function testTimeIsPrintedOnlyOnce() $regex = '`^Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '$`'; $this->assertStderrOutputMatchesRegex($regex); - - }//end testTimeIsPrintedOnlyOnce() + } /** @@ -144,8 +138,5 @@ public function testTimeIsPrintedMultipleTimesOnlyIfForced() $regex = '`^(Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '){3}$`'; $this->assertStderrOutputMatchesRegex($regex); - - }//end testTimeIsPrintedMultipleTimesOnlyIfForced() - - -}//end class + } +} diff --git a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php index e0bd014c9b..62a414a4a6 100644 --- a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php +++ b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php @@ -34,8 +34,7 @@ final class GetHighestWeightedTokenTest extends TestCase public function testGetHighestWeightedToken($tokens, $expected) { $this->assertSame($expected, Tokens::getHighestWeightedToken($tokens)); - - }//end testGetHighestWeightedToken() + } /** @@ -155,8 +154,5 @@ public static function dataGetHighestWeightedToken() ]; return $data; - - }//end dataGetHighestWeightedToken() - - -}//end class + } +} diff --git a/tests/Core/Util/Tokens/TokenNameTest.php b/tests/Core/Util/Tokens/TokenNameTest.php index cb5a729414..fa3137fd6d 100644 --- a/tests/Core/Util/Tokens/TokenNameTest.php +++ b/tests/Core/Util/Tokens/TokenNameTest.php @@ -35,8 +35,7 @@ final class TokenNameTest extends TestCase public function testTokenName($tokenCode, $expected) { $this->assertSame($expected, Tokens::tokenName($tokenCode)); - - }//end testTokenName() + } /** @@ -75,8 +74,7 @@ public static function dataTokenName() 'expected' => 'ing', ], ]; - - }//end dataTokenName() + } /** @@ -155,8 +153,5 @@ public static function dataPolyfilledPHPNativeTokens() 'expected' => 'T_PRIVATE_SET', ], ]; - - }//end dataPolyfilledPHPNativeTokens() - - -}//end class + } +} diff --git a/tests/Core/Util/Writers/StatusWriterTest.php b/tests/Core/Util/Writers/StatusWriterTest.php index c4cda9921a..929919e78a 100644 --- a/tests/Core/Util/Writers/StatusWriterTest.php +++ b/tests/Core/Util/Writers/StatusWriterTest.php @@ -37,8 +37,7 @@ public function testStatusSentToStdErr($message, $expected) StatusWriter::write($message); $this->assertStderrOutputSameString($expected); - - }//end testStatusSentToStdErr() + } /** @@ -58,8 +57,7 @@ public static function dataStatusSentToStdErr() 'expected' => PHP_EOL, ], ]; - - }//end dataStatusSentToStdErr() + } /** @@ -81,8 +79,7 @@ public function testStatusSentToStdErrIndentNewlines($message, $indent, $newline StatusWriter::write($message, $indent, $newlines); $this->assertStderrOutputSameString($expected); - - }//end testStatusSentToStdErrIndentNewlines() + } /** @@ -130,8 +127,7 @@ public static function dataStatusSentToStdErrIndentNewlines() 'expected' => 'This message should end up in stdErr with no tab indent and no new line', ], ]; - - }//end dataStatusSentToStdErrIndentNewlines() + } /** @@ -153,8 +149,7 @@ public function testStatusDoesNotGetPrintedWhenPaused() StatusWriter::write($message); $this->assertStderrOutputSameString(''); - - }//end testStatusDoesNotGetPrintedWhenPaused() + } /** @@ -184,8 +179,7 @@ public function testStatusDoesGetPrintedWhenPausedAndResumed() StatusWriter::write($message); $this->assertStderrOutputSameString($expected); - - }//end testStatusDoesGetPrintedWhenPausedAndResumed() + } /** @@ -208,8 +202,7 @@ public function testStatusDoesGetForcePrintedWhenPaused() StatusWriter::forceWrite($message); $this->assertStderrOutputSameString($expected); - - }//end testStatusDoesGetForcePrintedWhenPaused() + } /** @@ -244,8 +237,7 @@ public function testStatusDoesGetForcePrintedWhenPausedAndResumed() StatusWriter::forceWrite($messageC); $this->assertStderrOutputSameString($expected); - - }//end testStatusDoesGetForcePrintedWhenPausedAndResumed() + } /** @@ -270,8 +262,7 @@ public function testWriteNewline() StatusWriter::forceWriteNewline(); $this->assertStderrOutputSameString(PHP_EOL . PHP_EOL); - - }//end testWriteNewline() + } /** @@ -326,8 +317,7 @@ public function testNestedPausing() StatusWriter::write($message); $this->assertStderrOutputSameString($expected); - - }//end testNestedPausing() + } /** @@ -382,8 +372,5 @@ public function testResumingMoreOftenThanPaused() StatusWriter::write($messageA); $this->assertStderrOutputSameString($expected); - - }//end testResumingMoreOftenThanPaused() - - -}//end class + } +} diff --git a/tests/Standards/AbstractSniffTestCase.php b/tests/Standards/AbstractSniffTestCase.php index d2fefabfd9..27ecdaa649 100644 --- a/tests/Standards/AbstractSniffTestCase.php +++ b/tests/Standards/AbstractSniffTestCase.php @@ -86,8 +86,7 @@ abstract class AbstractSniffTestCase extends TestCase public static function tearDownAfterClass(): void { @unlink(self::RULESET_FILENAME); - - }//end tearDownAfterClass() + } /** @@ -121,8 +120,7 @@ protected function getTestFiles(string $testFileBase) sort($testFiles, SORT_NATURAL); return $testFiles; - - }//end getTestFiles() + } /** @@ -133,8 +131,7 @@ protected function getTestFiles(string $testFileBase) protected function shouldSkipTest() { return false; - - }//end shouldSkipTest() + } /** @@ -244,8 +241,7 @@ final public function testSniff() if (empty($failureMessages) === false) { $this->fail(implode(PHP_EOL, $failureMessages)); } - - }//end testSniff() + } /** @@ -434,8 +430,7 @@ public function generateFailureMessages(LocalFile $file) }//end foreach return $failureMessages; - - }//end generateFailureMessages() + } /** @@ -448,8 +443,7 @@ public function generateFailureMessages(LocalFile $file) */ public function setCliValues(string $testFile, Config $config) { - - }//end setCliValues() + } /** @@ -472,6 +466,4 @@ abstract protected function getErrorList(); * @return array */ abstract protected function getWarningList(); - - -}//end class +}