From 771d9dac7ebf3a13b8786867bd457de2566922a6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 19 Feb 2024 08:52:11 +0100
Subject: [PATCH 1/3] CS: remove class/function end comments

Includes removing the rule from the PHPCS native ruleset and adding another one to enforce the opposite, i.e. forbid end comments.
---
 autoload.php                                  |  20 +--
 phpcs.xml.dist                                |   2 +-
 requirements.php                              |   2 +-
 scripts/BuildRequirementsCheckMatrix.php      |  10 +-
 scripts/build-phar.php                        |   2 +-
 src/Config.php                                |  50 +++---
 src/Exceptions/DeepExitException.php          |   2 +-
 src/Exceptions/GeneratorException.php         |   2 +-
 src/Exceptions/RuntimeException.php           |   2 +-
 src/Exceptions/TokenizerException.php         |   2 +-
 src/Files/DummyFile.php                       |   6 +-
 src/Files/File.php                            |  96 +++++------
 src/Files/FileList.php                        |  20 +--
 src/Files/LocalFile.php                       |  10 +-
 src/Filters/ExactMatch.php                    |   6 +-
 src/Filters/Filter.php                        |  12 +-
 src/Filters/GitModified.php                   |   8 +-
 src/Filters/GitStaged.php                     |   8 +-
 src/Fixer.php                                 |  38 ++---
 src/Generators/Generator.php                  |   8 +-
 src/Generators/HTML.php                       |  22 +--
 src/Generators/Markdown.php                   |  18 +--
 src/Generators/Text.php                       |  16 +-
 src/Reporter.php                              |  20 +--
 src/Reports/Cbf.php                           |  10 +-
 src/Reports/Checkstyle.php                    |   6 +-
 src/Reports/Code.php                          |   6 +-
 src/Reports/Csv.php                           |   6 +-
 src/Reports/Diff.php                          |   6 +-
 src/Reports/Emacs.php                         |   6 +-
 src/Reports/Full.php                          |   6 +-
 src/Reports/Gitblame.php                      |   6 +-
 src/Reports/Hgblame.php                       |   6 +-
 src/Reports/Info.php                          |   6 +-
 src/Reports/Json.php                          |   6 +-
 src/Reports/Junit.php                         |   6 +-
 src/Reports/Notifysend.php                    |  16 +-
 src/Reports/Performance.php                   |   6 +-
 src/Reports/Report.php                        |   2 +-
 src/Reports/Source.php                        |   8 +-
 src/Reports/Summary.php                       |   6 +-
 src/Reports/Svnblame.php                      |   6 +-
 src/Reports/VersionControl.php                |   6 +-
 src/Reports/Xml.php                           |   6 +-
 src/Ruleset.php                               |  34 ++--
 src/Runner.php                                |  20 +--
 src/Sniffs/AbstractArraySniff.php             |   8 +-
 src/Sniffs/AbstractPatternSniff.php           |  26 +--
 src/Sniffs/AbstractScopeSniff.php             |   8 +-
 src/Sniffs/AbstractVariableSniff.php          |   8 +-
 src/Sniffs/DeprecatedSniff.php                |   2 +-
 src/Sniffs/Sniff.php                          |   2 +-
 .../Sniffs/Arrays/ArrayIndentSniff.php        |   6 +-
 .../Arrays/DisallowLongArraySyntaxSniff.php   |   6 +-
 .../Arrays/DisallowShortArraySyntaxSniff.php  |   6 +-
 .../Classes/DuplicateClassNameSniff.php       |   6 +-
 .../Classes/OpeningBraceSameLineSniff.php     |   6 +-
 .../AssignmentInConditionSniff.php            |   6 +-
 .../CodeAnalysis/EmptyPHPStatementSniff.php   |  10 +-
 .../CodeAnalysis/EmptyStatementSniff.php      |   6 +-
 .../ForLoopShouldBeWhileLoopSniff.php         |   6 +-
 .../ForLoopWithTestFunctionCallSniff.php      |   6 +-
 .../CodeAnalysis/JumbledIncrementerSniff.php  |   8 +-
 ...ExplicitBooleanOperatorPrecedenceSniff.php |   6 +-
 .../UnconditionalIfStatementSniff.php         |   6 +-
 .../UnnecessaryFinalModifierSniff.php         |   6 +-
 .../UnusedFunctionParameterSniff.php          |   6 +-
 .../UselessOverridingMethodSniff.php          |   6 +-
 .../Sniffs/Commenting/DocCommentSniff.php     |   6 +-
 .../Generic/Sniffs/Commenting/FixmeSniff.php  |   6 +-
 .../Generic/Sniffs/Commenting/TodoSniff.php   |   6 +-
 .../DisallowYodaConditionsSniff.php           |   8 +-
 .../InlineControlStructureSniff.php           |   6 +-
 .../Sniffs/Files/ByteOrderMarkSniff.php       |   6 +-
 .../Sniffs/Files/EndFileNewlineSniff.php      |   6 +-
 .../Sniffs/Files/EndFileNoNewlineSniff.php    |   6 +-
 .../Sniffs/Files/ExecutableFileSniff.php      |   6 +-
 .../Generic/Sniffs/Files/InlineHTMLSniff.php  |   6 +-
 .../Generic/Sniffs/Files/LineEndingsSniff.php |   6 +-
 .../Generic/Sniffs/Files/LineLengthSniff.php  |   8 +-
 .../Sniffs/Files/LowercasedFilenameSniff.php  |   6 +-
 .../Sniffs/Files/OneClassPerFileSniff.php     |   6 +-
 .../Sniffs/Files/OneInterfacePerFileSniff.php |   6 +-
 .../Files/OneObjectStructurePerFileSniff.php  |   6 +-
 .../Sniffs/Files/OneTraitPerFileSniff.php     |   6 +-
 .../DisallowMultipleStatementsSniff.php       |   6 +-
 .../MultipleStatementAlignmentSniff.php       |   8 +-
 .../Sniffs/Formatting/SpaceAfterCastSniff.php |   6 +-
 .../Sniffs/Formatting/SpaceAfterNotSniff.php  |   6 +-
 .../Formatting/SpaceBeforeCastSniff.php       |   6 +-
 .../FunctionCallArgumentSpacingSniff.php      |   8 +-
 .../OpeningFunctionBraceBsdAllmanSniff.php    |   6 +-
 ...ningFunctionBraceKernighanRitchieSniff.php |   6 +-
 .../Metrics/CyclomaticComplexitySniff.php     |   6 +-
 .../Sniffs/Metrics/NestingLevelSniff.php      |   6 +-
 .../AbstractClassNamePrefixSniff.php          |   6 +-
 .../CamelCapsFunctionNameSniff.php            |   8 +-
 .../ConstructorNameSniff.php                  |  10 +-
 .../InterfaceNameSuffixSniff.php              |   6 +-
 .../TraitNameSuffixSniff.php                  |   6 +-
 .../UpperCaseConstantNameSniff.php            |   6 +-
 .../Sniffs/PHP/BacktickOperatorSniff.php      |   6 +-
 .../PHP/CharacterBeforePHPOpeningTagSniff.php |   6 +-
 .../Generic/Sniffs/PHP/ClosingPHPTagSniff.php |   6 +-
 .../Sniffs/PHP/DeprecatedFunctionsSniff.php   |   6 +-
 .../PHP/DisallowAlternativePHPTagsSniff.php   |   8 +-
 .../PHP/DisallowRequestSuperglobalSniff.php   |   6 +-
 .../Sniffs/PHP/DisallowShortOpenTagSniff.php  |   8 +-
 .../Sniffs/PHP/DiscourageGotoSniff.php        |   6 +-
 .../Sniffs/PHP/ForbiddenFunctionsSniff.php    |   8 +-
 .../Sniffs/PHP/LowerCaseConstantSniff.php     |   8 +-
 .../Sniffs/PHP/LowerCaseKeywordSniff.php      |   6 +-
 .../Generic/Sniffs/PHP/LowerCaseTypeSniff.php |  10 +-
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      |   6 +-
 .../Sniffs/PHP/RequireStrictTypesSniff.php    |   6 +-
 .../Generic/Sniffs/PHP/SAPIUsageSniff.php     |   6 +-
 .../Generic/Sniffs/PHP/SyntaxSniff.php        |   8 +-
 .../Sniffs/PHP/UpperCaseConstantSniff.php     |   4 +-
 .../Strings/UnnecessaryHeredocSniff.php       |   6 +-
 .../Strings/UnnecessaryStringConcatSniff.php  |   6 +-
 .../VersionControl/GitMergeConflictSniff.php  |   6 +-
 .../SubversionPropertiesSniff.php             |   8 +-
 .../ArbitraryParenthesesSpacingSniff.php      |   6 +-
 .../WhiteSpace/DisallowSpaceIndentSniff.php   |   6 +-
 .../WhiteSpace/DisallowTabIndentSniff.php     |   6 +-
 .../WhiteSpace/GotoTargetSpacingSniff.php     |   6 +-
 .../HereNowdocIdentifierSpacingSniff.php      |   6 +-
 .../IncrementDecrementSpacingSniff.php        |   6 +-
 .../LanguageConstructSpacingSniff.php         |   6 +-
 .../Sniffs/WhiteSpace/ScopeIndentSniff.php    |   8 +-
 .../SpreadOperatorSpacingAfterSniff.php       |   6 +-
 .../Tests/Arrays/ArrayIndentUnitTest.php      |   6 +-
 .../DisallowLongArraySyntaxUnitTest.php       |   6 +-
 .../DisallowShortArraySyntaxUnitTest.php      |   6 +-
 .../Classes/DuplicateClassNameUnitTest.php    |   6 +-
 .../Classes/OpeningBraceSameLineUnitTest.php  |   6 +-
 .../AssignmentInConditionUnitTest.php         |   6 +-
 .../EmptyPHPStatementUnitTest.php             |   8 +-
 .../CodeAnalysis/EmptyStatementUnitTest.php   |   6 +-
 .../ForLoopShouldBeWhileLoopUnitTest.php      |   6 +-
 .../ForLoopWithTestFunctionCallUnitTest.php   |   6 +-
 .../JumbledIncrementerUnitTest.php            |   6 +-
 ...licitBooleanOperatorPrecedenceUnitTest.php |   6 +-
 .../UnconditionalIfStatementUnitTest.php      |   6 +-
 .../UnnecessaryFinalModifierUnitTest.php      |   6 +-
 .../UnusedFunctionParameterUnitTest.php       |   6 +-
 .../UselessOverridingMethodUnitTest.php       |   6 +-
 .../Tests/Commenting/DocCommentUnitTest.php   |   8 +-
 .../Tests/Commenting/FixmeUnitTest.php        |   6 +-
 .../Generic/Tests/Commenting/TodoUnitTest.php |   6 +-
 .../DisallowYodaConditionsUnitTest.php        |   6 +-
 .../InlineControlStructureUnitTest.php        |   6 +-
 .../Tests/Files/ByteOrderMarkUnitTest.php     |   6 +-
 .../Tests/Files/EndFileNewlineUnitTest.php    |   6 +-
 .../Tests/Files/EndFileNoNewlineUnitTest.php  |   6 +-
 .../Tests/Files/ExecutableFileUnitTest.php    |   8 +-
 .../Tests/Files/InlineHTMLUnitTest.php        |   6 +-
 .../Tests/Files/LineEndingsUnitTest.php       |   8 +-
 .../Tests/Files/LineLengthUnitTest.php        |   8 +-
 .../Files/LowercasedFilenameUnitTest.php      |  10 +-
 .../Tests/Files/OneClassPerFileUnitTest.php   |   6 +-
 .../Files/OneInterfacePerFileUnitTest.php     |   6 +-
 .../OneObjectStructurePerFileUnitTest.php     |   6 +-
 .../Tests/Files/OneTraitPerFileUnitTest.php   |   6 +-
 .../DisallowMultipleStatementsUnitTest.php    |   6 +-
 .../MultipleStatementAlignmentUnitTest.php    |   6 +-
 .../Formatting/SpaceAfterCastUnitTest.php     |   6 +-
 .../Formatting/SpaceAfterNotUnitTest.php      |   6 +-
 .../Formatting/SpaceBeforeCastUnitTest.php    |   6 +-
 .../FunctionCallArgumentSpacingUnitTest.php   |   6 +-
 .../OpeningFunctionBraceBsdAllmanUnitTest.php |   6 +-
 ...gFunctionBraceKernighanRitchieUnitTest.php |   8 +-
 .../Metrics/CyclomaticComplexityUnitTest.php  |   6 +-
 .../Tests/Metrics/NestingLevelUnitTest.php    |   6 +-
 .../AbstractClassNamePrefixUnitTest.php       |   6 +-
 .../CamelCapsFunctionNameUnitTest.php         |   6 +-
 .../ConstructorNameUnitTest.php               |   6 +-
 .../InterfaceNameSuffixUnitTest.php           |   6 +-
 .../TraitNameSuffixUnitTest.php               |   6 +-
 .../UpperCaseConstantNameUnitTest.php         |   6 +-
 .../Tests/PHP/BacktickOperatorUnitTest.php    |   6 +-
 .../CharacterBeforePHPOpeningTagUnitTest.php  |   6 +-
 .../Tests/PHP/ClosingPHPTagUnitTest.php       |   6 +-
 .../Tests/PHP/DeprecatedFunctionsUnitTest.php |   6 +-
 .../DisallowAlternativePHPTagsUnitTest.php    |   6 +-
 .../DisallowRequestSuperglobalUnitTest.php    |   6 +-
 .../PHP/DisallowShortOpenTagUnitTest.php      |   8 +-
 .../Tests/PHP/DiscourageGotoUnitTest.php      |   6 +-
 .../Tests/PHP/ForbiddenFunctionsUnitTest.php  |   6 +-
 .../Tests/PHP/LowerCaseConstantUnitTest.php   |   6 +-
 .../Tests/PHP/LowerCaseKeywordUnitTest.php    |   6 +-
 .../Tests/PHP/LowerCaseTypeUnitTest.php       |   6 +-
 .../Tests/PHP/NoSilencedErrorsUnitTest.php    |   6 +-
 .../Tests/PHP/RequireStrictTypesUnitTest.php  |   6 +-
 .../Generic/Tests/PHP/SAPIUsageUnitTest.php   |   6 +-
 .../Generic/Tests/PHP/SyntaxUnitTest.php      |  10 +-
 .../Tests/PHP/UpperCaseConstantUnitTest.php   |   6 +-
 .../Strings/UnnecessaryHeredocUnitTest.php    |   6 +-
 .../UnnecessaryStringConcatUnitTest.php       |   6 +-
 .../GitMergeConflictUnitTest.php              |   6 +-
 .../SubversionPropertiesUnitTest.php          |   8 +-
 .../ArbitraryParenthesesSpacingUnitTest.php   |   6 +-
 .../DisallowSpaceIndentUnitTest.php           |   8 +-
 .../WhiteSpace/DisallowTabIndentUnitTest.php  |   8 +-
 .../WhiteSpace/GotoTargetSpacingUnitTest.php  |   6 +-
 .../HereNowdocIdentifierSpacingUnitTest.php   |   6 +-
 .../IncrementDecrementSpacingUnitTest.php     |   6 +-
 .../LanguageConstructSpacingUnitTest.php      |   6 +-
 .../Tests/WhiteSpace/ScopeIndentUnitTest.php  |   8 +-
 .../SpreadOperatorSpacingAfterUnitTest.php    |   6 +-
 .../Sniffs/Classes/ClassDeclarationSniff.php  |   6 +-
 .../Sniffs/Commenting/ClassCommentSniff.php   |   8 +-
 .../Sniffs/Commenting/FileCommentSniff.php    |  22 +--
 .../Commenting/FunctionCommentSniff.php       |  12 +-
 .../Sniffs/Commenting/InlineCommentSniff.php  |   6 +-
 .../ControlSignatureSniff.php                 |   4 +-
 .../MultiLineConditionSniff.php               |   6 +-
 .../PEAR/Sniffs/Files/IncludingFileSniff.php  |   6 +-
 .../Formatting/MultiLineAssignmentSniff.php   |   6 +-
 .../Functions/FunctionCallSignatureSniff.php  |  12 +-
 .../Functions/FunctionDeclarationSniff.php    |  14 +-
 .../Functions/ValidDefaultValueSniff.php      |   6 +-
 .../NamingConventions/ValidClassNameSniff.php |   6 +-
 .../ValidFunctionNameSniff.php                |   8 +-
 .../ValidVariableNameSniff.php                |  10 +-
 .../WhiteSpace/ObjectOperatorIndentSniff.php  |   6 +-
 .../WhiteSpace/ScopeClosingBraceSniff.php     |   6 +-
 .../Sniffs/WhiteSpace/ScopeIndentSniff.php    |   2 +-
 .../Classes/ClassDeclarationUnitTest.php      |   8 +-
 .../Tests/Commenting/ClassCommentUnitTest.php |   6 +-
 .../Tests/Commenting/FileCommentUnitTest.php  |   6 +-
 .../Commenting/FunctionCommentUnitTest.php    |   6 +-
 .../Commenting/InlineCommentUnitTest.php      |   6 +-
 .../ControlSignatureUnitTest.php              |   6 +-
 .../MultiLineConditionUnitTest.php            |   6 +-
 .../Tests/Files/IncludingFileUnitTest.php     |   6 +-
 .../MultiLineAssignmentUnitTest.php           |   6 +-
 .../FunctionCallSignatureUnitTest.php         |   6 +-
 .../Functions/FunctionDeclarationUnitTest.php |   6 +-
 .../Functions/ValidDefaultValueUnitTest.php   |   6 +-
 .../ValidClassNameUnitTest.php                |   6 +-
 .../ValidFunctionNameUnitTest.php             |   6 +-
 .../ValidVariableNameUnitTest.php             |   6 +-
 .../ObjectOperatorIndentUnitTest.php          |   6 +-
 .../WhiteSpace/ScopeClosingBraceUnitTest.php  |   6 +-
 .../Tests/WhiteSpace/ScopeIndentUnitTest.php  |   8 +-
 .../Sniffs/Classes/ClassDeclarationSniff.php  |   6 +-
 .../PSR1/Sniffs/Files/SideEffectsSniff.php    |   8 +-
 .../Methods/CamelCapsMethodNameSniff.php      |   6 +-
 .../Classes/ClassDeclarationUnitTest.php      |   6 +-
 .../PSR1/Tests/Files/SideEffectsUnitTest.php  |   8 +-
 .../Methods/CamelCapsMethodNameUnitTest.php   |   6 +-
 .../Classes/AnonClassDeclarationSniff.php     |  10 +-
 .../Classes/ClassInstantiationSniff.php       |   6 +-
 .../Sniffs/Classes/ClosingBraceSniff.php      |   6 +-
 .../Sniffs/Classes/OpeningBraceSpaceSniff.php |   6 +-
 .../BooleanOperatorPlacementSniff.php         |   6 +-
 .../ControlStructureSpacingSniff.php          |   8 +-
 .../Sniffs/Files/DeclareStatementSniff.php    |   6 +-
 .../PSR12/Sniffs/Files/FileHeaderSniff.php    |  10 +-
 .../Sniffs/Files/ImportStatementSniff.php     |   6 +-
 .../PSR12/Sniffs/Files/OpenTagSniff.php       |   6 +-
 .../NullableTypeDeclarationSniff.php          |   6 +-
 .../Functions/ReturnTypeDeclarationSniff.php  |   6 +-
 .../Keywords/ShortFormTypeKeywordsSniff.php   |   6 +-
 .../CompoundNamespaceDepthSniff.php           |   6 +-
 .../Sniffs/Operators/OperatorSpacingSniff.php |   6 +-
 .../Properties/ConstantVisibilitySniff.php    |   6 +-
 .../Sniffs/Traits/UseDeclarationSniff.php     |  10 +-
 .../Classes/AnonClassDeclarationUnitTest.php  |   6 +-
 .../Classes/ClassInstantiationUnitTest.php    |   6 +-
 .../Tests/Classes/ClosingBraceUnitTest.php    |   6 +-
 .../Classes/OpeningBraceSpaceUnitTest.php     |   6 +-
 .../BooleanOperatorPlacementUnitTest.php      |   6 +-
 .../ControlStructureSpacingUnitTest.php       |   6 +-
 .../Tests/Files/DeclareStatementUnitTest.php  |   6 +-
 .../PSR12/Tests/Files/FileHeaderUnitTest.php  |   6 +-
 .../Tests/Files/ImportStatementUnitTest.php   |   6 +-
 .../PSR12/Tests/Files/OpenTagUnitTest.php     |   6 +-
 .../NullableTypeDeclarationUnitTest.php       |   6 +-
 .../ReturnTypeDeclarationUnitTest.php         |   6 +-
 .../ShortFormTypeKeywordsUnitTest.php         |   6 +-
 .../CompoundNamespaceDepthUnitTest.php        |   6 +-
 .../Operators/OperatorSpacingUnitTest.php     |   6 +-
 .../Properties/ConstantVisibilityUnitTest.php |   6 +-
 .../Tests/Traits/UseDeclarationUnitTest.php   |   6 +-
 .../Sniffs/Classes/ClassDeclarationSniff.php  |   8 +-
 .../Classes/PropertyDeclarationSniff.php      |  10 +-
 .../ControlStructureSpacingSniff.php          |   6 +-
 .../ElseIfDeclarationSniff.php                |   6 +-
 .../SwitchDeclarationSniff.php                |  10 +-
 .../PSR2/Sniffs/Files/ClosingTagSniff.php     |   6 +-
 .../PSR2/Sniffs/Files/EndFileNewlineSniff.php |   6 +-
 .../Methods/FunctionCallSignatureSniff.php    |   4 +-
 .../Methods/FunctionClosingBraceSniff.php     |   6 +-
 .../Sniffs/Methods/MethodDeclarationSniff.php |   8 +-
 .../Namespaces/NamespaceDeclarationSniff.php  |   6 +-
 .../Sniffs/Namespaces/UseDeclarationSniff.php |   8 +-
 .../Classes/ClassDeclarationUnitTest.php      |   6 +-
 .../Classes/PropertyDeclarationUnitTest.php   |   6 +-
 .../ControlStructureSpacingUnitTest.php       |   6 +-
 .../ElseIfDeclarationUnitTest.php             |   6 +-
 .../SwitchDeclarationUnitTest.php             |   6 +-
 .../PSR2/Tests/Files/ClosingTagUnitTest.php   |   6 +-
 .../Tests/Files/EndFileNewlineUnitTest.php    |   6 +-
 .../Methods/FunctionCallSignatureUnitTest.php |   6 +-
 .../Methods/FunctionClosingBraceUnitTest.php  |   6 +-
 .../Methods/MethodDeclarationUnitTest.php     |   6 +-
 .../NamespaceDeclarationUnitTest.php          |   6 +-
 .../Namespaces/UseDeclarationUnitTest.php     |   6 +-
 .../Arrays/ArrayBracketSpacingSniff.php       |   6 +-
 .../Sniffs/Arrays/ArrayDeclarationSniff.php   |  10 +-
 .../Sniffs/Classes/ClassDeclarationSniff.php  |   8 +-
 .../Sniffs/Classes/ClassFileNameSniff.php     |   6 +-
 .../Classes/LowercaseClassKeywordsSniff.php   |   6 +-
 .../Classes/SelfMemberReferenceSniff.php      |  10 +-
 .../Sniffs/Classes/ValidClassNameSniff.php    |   6 +-
 .../Sniffs/Commenting/BlockCommentSniff.php   |   6 +-
 .../Sniffs/Commenting/ClassCommentSniff.php   |   6 +-
 .../ClosingDeclarationCommentSniff.php        |   6 +-
 .../Commenting/DocCommentAlignmentSniff.php   |   6 +-
 .../Commenting/EmptyCatchCommentSniff.php     |   6 +-
 .../Sniffs/Commenting/FileCommentSniff.php    |   6 +-
 .../Commenting/FunctionCommentSniff.php       |  14 +-
 .../FunctionCommentThrowTagSniff.php          |   6 +-
 .../Sniffs/Commenting/InlineCommentSniff.php  |   6 +-
 .../LongConditionClosingCommentSniff.php      |   6 +-
 .../Commenting/PostStatementCommentSniff.php  |   6 +-
 .../Commenting/VariableCommentSniff.php       |  10 +-
 .../ControlSignatureSniff.php                 |   6 +-
 .../ElseIfDeclarationSniff.php                |   6 +-
 .../ForEachLoopDeclarationSniff.php           |   6 +-
 .../ForLoopDeclarationSniff.php               |   6 +-
 .../InlineIfDeclarationSniff.php              |   6 +-
 .../LowercaseDeclarationSniff.php             |   6 +-
 .../SwitchDeclarationSniff.php                |   6 +-
 .../Squiz/Sniffs/Files/FileExtensionSniff.php |   6 +-
 .../Formatting/OperatorBracketSniff.php       |   8 +-
 ...unctionDeclarationArgumentSpacingSniff.php |   8 +-
 .../Functions/FunctionDeclarationSniff.php    |   4 +-
 .../FunctionDuplicateArgumentSniff.php        |   6 +-
 .../Sniffs/Functions/GlobalFunctionSniff.php  |   6 +-
 .../LowercaseFunctionKeywordsSniff.php        |   6 +-
 .../MultiLineFunctionDeclarationSniff.php     |  10 +-
 .../ValidFunctionNameSniff.php                |   4 +-
 .../ValidVariableNameSniff.php                |   8 +-
 .../Objects/ObjectInstantiationSniff.php      |   6 +-
 .../ComparisonOperatorUsageSniff.php          |   6 +-
 .../IncrementDecrementUsageSniff.php          |  10 +-
 .../Operators/ValidLogicalOperatorsSniff.php  |   6 +-
 .../Sniffs/PHP/CommentedOutCodeSniff.php      |   6 +-
 .../PHP/DisallowBooleanStatementSniff.php     |   6 +-
 .../PHP/DisallowComparisonAssignmentSniff.php |   6 +-
 .../Sniffs/PHP/DisallowInlineIfSniff.php      |   6 +-
 .../PHP/DisallowMultipleAssignmentsSniff.php  |   6 +-
 .../PHP/DisallowSizeFunctionsInLoopsSniff.php |   6 +-
 .../Sniffs/PHP/DiscouragedFunctionsSniff.php  |   2 +-
 .../Squiz/Sniffs/PHP/EmbeddedPhpSniff.php     |  14 +-
 src/Standards/Squiz/Sniffs/PHP/EvalSniff.php  |   6 +-
 .../Squiz/Sniffs/PHP/GlobalKeywordSniff.php   |   6 +-
 .../Squiz/Sniffs/PHP/HeredocSniff.php         |   6 +-
 .../Squiz/Sniffs/PHP/InnerFunctionsSniff.php  |   6 +-
 .../Sniffs/PHP/LowercasePHPFunctionsSniff.php |   8 +-
 .../Sniffs/PHP/NonExecutableCodeSniff.php     |   6 +-
 .../Sniffs/Scope/MemberVarScopeSniff.php      |  10 +-
 .../Squiz/Sniffs/Scope/MethodScopeSniff.php   |   8 +-
 .../Sniffs/Scope/StaticThisUsageSniff.php     |  10 +-
 .../Strings/ConcatenationSpacingSniff.php     |   6 +-
 .../Sniffs/Strings/DoubleQuoteUsageSniff.php  |   6 +-
 .../Sniffs/Strings/EchoedStringsSniff.php     |   6 +-
 .../Sniffs/WhiteSpace/CastSpacingSniff.php    |   6 +-
 .../ControlStructureSpacingSniff.php          |   6 +-
 .../FunctionClosingBraceSpaceSniff.php        |   6 +-
 .../FunctionOpeningBraceSpaceSniff.php        |   6 +-
 .../WhiteSpace/FunctionSpacingSniff.php       |   6 +-
 .../LogicalOperatorSpacingSniff.php           |   6 +-
 .../WhiteSpace/MemberVarSpacingSniff.php      |  10 +-
 .../WhiteSpace/ObjectOperatorSpacingSniff.php |  10 +-
 .../WhiteSpace/OperatorSpacingSniff.php       |   8 +-
 .../WhiteSpace/ScopeClosingBraceSniff.php     |   6 +-
 .../WhiteSpace/ScopeKeywordSpacingSniff.php   |   6 +-
 .../WhiteSpace/SemicolonSpacingSniff.php      |   6 +-
 .../WhiteSpace/SuperfluousWhitespaceSniff.php |   6 +-
 .../Arrays/ArrayBracketSpacingUnitTest.php    |   6 +-
 .../Tests/Arrays/ArrayDeclarationUnitTest.php |   6 +-
 .../Classes/ClassDeclarationUnitTest.php      |   6 +-
 .../Tests/Classes/ClassFileNameUnitTest.php   |   8 +-
 .../LowercaseClassKeywordsUnitTest.php        |   6 +-
 .../Classes/SelfMemberReferenceUnitTest.php   |   6 +-
 .../Tests/Classes/ValidClassNameUnitTest.php  |   6 +-
 .../Tests/Commenting/BlockCommentUnitTest.php |   8 +-
 .../Tests/Commenting/ClassCommentUnitTest.php |   6 +-
 .../ClosingDeclarationCommentUnitTest.php     |   6 +-
 .../DocCommentAlignmentUnitTest.php           |   6 +-
 .../Commenting/EmptyCatchCommentUnitTest.php  |   6 +-
 .../Tests/Commenting/FileCommentUnitTest.php  |   6 +-
 .../FunctionCommentThrowTagUnitTest.php       |   6 +-
 .../Commenting/FunctionCommentUnitTest.php    |   6 +-
 .../Commenting/InlineCommentUnitTest.php      |   6 +-
 .../LongConditionClosingCommentUnitTest.php   |   6 +-
 .../PostStatementCommentUnitTest.php          |   6 +-
 .../Commenting/VariableCommentUnitTest.php    |   6 +-
 .../ControlSignatureUnitTest.php              |   6 +-
 .../ElseIfDeclarationUnitTest.php             |   6 +-
 .../ForEachLoopDeclarationUnitTest.php        |   6 +-
 .../ForLoopDeclarationUnitTest.php            |   6 +-
 .../InlineIfDeclarationUnitTest.php           |   8 +-
 .../LowercaseDeclarationUnitTest.php          |   6 +-
 .../SwitchDeclarationUnitTest.php             |   6 +-
 .../Tests/Files/FileExtensionUnitTest.php     |   6 +-
 .../Formatting/OperatorBracketUnitTest.php    |   6 +-
 ...tionDeclarationArgumentSpacingUnitTest.php |   6 +-
 .../Functions/FunctionDeclarationUnitTest.php |   6 +-
 .../FunctionDuplicateArgumentUnitTest.php     |   6 +-
 .../Functions/GlobalFunctionUnitTest.php      |   6 +-
 .../LowercaseFunctionKeywordsUnitTest.php     |   6 +-
 .../MultiLineFunctionDeclarationUnitTest.php  |   6 +-
 .../ValidFunctionNameUnitTest.php             |   6 +-
 .../ValidVariableNameUnitTest.php             |   6 +-
 .../Objects/ObjectInstantiationUnitTest.php   |   6 +-
 .../ComparisonOperatorUsageUnitTest.php       |   6 +-
 .../IncrementDecrementUsageUnitTest.php       |   6 +-
 .../ValidLogicalOperatorsUnitTest.php         |   6 +-
 .../Tests/PHP/CommentedOutCodeUnitTest.php    |   6 +-
 .../PHP/DisallowBooleanStatementUnitTest.php  |   6 +-
 .../DisallowComparisonAssignmentUnitTest.php  |   6 +-
 .../Tests/PHP/DisallowInlineIfUnitTest.php    |   6 +-
 .../DisallowMultipleAssignmentsUnitTest.php   |   6 +-
 .../DisallowSizeFunctionsInLoopsUnitTest.php  |   6 +-
 .../PHP/DiscouragedFunctionsUnitTest.php      |   6 +-
 .../Squiz/Tests/PHP/EmbeddedPhpUnitTest.php   |   6 +-
 .../Squiz/Tests/PHP/EvalUnitTest.php          |   6 +-
 .../Squiz/Tests/PHP/GlobalKeywordUnitTest.php |   6 +-
 .../Squiz/Tests/PHP/HeredocUnitTest.php       |   6 +-
 .../Tests/PHP/InnerFunctionsUnitTest.php      |   6 +-
 .../PHP/LowercasePHPFunctionsUnitTest.php     |   6 +-
 .../Tests/PHP/NonExecutableCodeUnitTest.php   |   6 +-
 .../Tests/Scope/MemberVarScopeUnitTest.php    |   6 +-
 .../Squiz/Tests/Scope/MethodScopeUnitTest.php |   6 +-
 .../Tests/Scope/StaticThisUsageUnitTest.php   |   6 +-
 .../Strings/ConcatenationSpacingUnitTest.php  |   6 +-
 .../Strings/DoubleQuoteUsageUnitTest.php      |   6 +-
 .../Tests/Strings/EchoedStringsUnitTest.php   |   6 +-
 .../Tests/WhiteSpace/CastSpacingUnitTest.php  |   6 +-
 .../ControlStructureSpacingUnitTest.php       |   6 +-
 .../FunctionClosingBraceSpaceUnitTest.php     |   6 +-
 .../FunctionOpeningBraceSpaceUnitTest.php     |   6 +-
 .../WhiteSpace/FunctionSpacingUnitTest.php    |   6 +-
 .../LogicalOperatorSpacingUnitTest.php        |   6 +-
 .../WhiteSpace/MemberVarSpacingUnitTest.php   |   6 +-
 .../ObjectOperatorSpacingUnitTest.php         |   6 +-
 .../WhiteSpace/OperatorSpacingUnitTest.php    |   6 +-
 .../WhiteSpace/ScopeClosingBraceUnitTest.php  |   6 +-
 .../ScopeKeywordSpacingUnitTest.php           |   6 +-
 .../WhiteSpace/SemicolonSpacingUnitTest.php   |   6 +-
 .../SuperfluousWhitespaceUnitTest.php         |   6 +-
 .../Zend/Sniffs/Files/ClosingTagSniff.php     |   6 +-
 .../ValidVariableNameSniff.php                |   8 +-
 .../Zend/Tests/Files/ClosingTagUnitTest.php   |   6 +-
 .../ValidVariableNameUnitTest.php             |   6 +-
 src/Tokenizers/Comment.php                    |   8 +-
 src/Tokenizers/PHP.php                        |  16 +-
 src/Tokenizers/Tokenizer.php                  |  22 +--
 src/Util/Cache.php                            |  12 +-
 src/Util/Common.php                           |  30 ++--
 src/Util/ExitCode.php                         |   4 +-
 src/Util/Help.php                             |  28 ++--
 src/Util/IgnoreList.php                       |  18 +--
 src/Util/MessageCollector.php                 |  16 +-
 src/Util/Standards.php                        |  16 +-
 src/Util/Timing.php                           |  12 +-
 src/Util/Tokens.php                           |   6 +-
 src/Util/Writers/StatusWriter.php             |  16 +-
 tests/ConfigDouble.php                        |  20 +--
 tests/Core/AbstractMethodTestCase.php         |  16 +-
 tests/Core/AbstractWriterTestCase.php         |   2 +-
 .../Autoloader/DetermineLoadedClassTest.php   |   8 +-
 .../Config/AbstractRealConfigTestCase.php     |  10 +-
 tests/Core/Config/ExtensionsArgTest.php       |  12 +-
 tests/Core/Config/GeneratorArgTest.php        |  14 +-
 tests/Core/Config/IniSetTest.php              |  24 +--
 tests/Core/Config/IssueSquiz2675Test.php      |   4 +-
 .../PrepareConfigDataForDisplayTest.php       |   8 +-
 tests/Core/Config/ReportArgsTest.php          |   6 +-
 tests/Core/Config/ReportWidthTest.php         |  20 +--
 tests/Core/Config/SniffsExcludeArgsTest.php   |  14 +-
 tests/Core/ErrorSuppressionTest.php           |  50 +++---
 ...ddMessageSelectiveInternalHandlingTest.php |  10 +-
 .../Files/File/FindEndOfStatementTest.php     |  46 +++---
 .../Files/File/FindExtendedClassNameTest.php  |  10 +-
 .../FindImplementedInterfaceNamesTest.php     |  10 +-
 .../Files/File/FindStartOfStatementTest.php   |  76 ++++-----
 .../Files/File/GetClassPropertiesTest.php     |  10 +-
 tests/Core/Files/File/GetConditionTest.php    |  22 +--
 .../GetDeclarationNameParseError1Test.php     |   4 +-
 .../GetDeclarationNameParseError2Test.php     |   4 +-
 .../Files/File/GetDeclarationNameTest.php     |  10 +-
 .../Files/File/GetMemberPropertiesTest.php    |  12 +-
 .../GetMethodParametersParseError1Test.php    |   4 +-
 .../GetMethodParametersParseError2Test.php    |   4 +-
 .../GetMethodParametersParseError3Test.php    |   4 +-
 .../GetMethodParametersParseError4Test.php    |   4 +-
 .../Files/File/GetMethodParametersTest.php    | 150 +++++++++---------
 .../Files/File/GetMethodPropertiesTest.php    | 120 +++++++-------
 .../Core/Files/File/GetTokensAsStringTest.php |  20 +--
 tests/Core/Files/File/IsReferenceTest.php     |  10 +-
 .../FileList/AbstractFileListTestCase.php     |   4 +-
 tests/Core/Files/FileList/AddFileTest.php     |  10 +-
 tests/Core/Files/FileList/ConstructTest.php   |   6 +-
 tests/Core/Files/FileList/FilterDouble.php    |   4 +-
 tests/Core/Filters/AbstractFilterTestCase.php |  16 +-
 tests/Core/Filters/Filter/AcceptTest.php      |   8 +-
 .../ShouldProcessFileWithoutExtensionTest.php |   6 +-
 tests/Core/Filters/GitModifiedTest.php        |  12 +-
 tests/Core/Filters/GitStagedTest.php          |  12 +-
 tests/Core/Fixer/FixFileReturnValueTest.php   |   8 +-
 tests/Core/Fixer/GenerateDiffTest.php         |  14 +-
 tests/Core/Generators/GeneratorTest.php       |  14 +-
 tests/Core/Generators/HTMLTest.php            |  20 +--
 tests/Core/Generators/MarkdownTest.php        |  18 +--
 tests/Core/Generators/TextTest.php            |  10 +-
 tests/Core/Reporter/MagicMethodsTest.php      |  14 +-
 .../Core/Ruleset/AbstractRulesetTestCase.php  |  10 +-
 tests/Core/Ruleset/ConstructorTest.php        |  16 +-
 .../Ruleset/DisplayCachedMessagesTest.php     |  24 +--
 .../ExpandRulesetReferenceHomePathTest.php    |  12 +-
 .../ExpandRulesetReferenceInternalTest.php    |   6 +-
 .../Ruleset/ExpandRulesetReferenceTest.php    |   8 +-
 .../Core/Ruleset/ExpandSniffDirectoryTest.php |   4 +-
 tests/Core/Ruleset/ExplainTest.php            |  12 +-
 tests/Core/Ruleset/GetIgnorePatternsTest.php  |   8 +-
 tests/Core/Ruleset/GetIncludePatternsTest.php |   8 +-
 ...ateTokenListenersNamingConventionsTest.php |   4 +-
 .../Ruleset/PopulateTokenListenersTest.php    |  30 ++--
 .../Ruleset/ProcessRuleInvalidTypeTest.php    |   4 +-
 .../ProcessRuleShouldProcessElementTest.php   |  44 ++---
 .../Ruleset/ProcessRulesetAutoloadTest.php    |   8 +-
 .../ProcessRulesetBrokenRulesetTest.php       |   8 +-
 .../Ruleset/ProcessRulesetCliArgsTest.php     |  16 +-
 .../ProcessRulesetConfigDirectivesTest.php    |  10 +-
 .../ProcessRulesetIniDirectivesTest.php       |  12 +-
 .../Core/Ruleset/ProcessRulesetIniSetTest.php |  10 +-
 ...ProcessRulesetShouldProcessElementTest.php |  32 ++--
 tests/Core/Ruleset/ProcessRulesetTest.php     |  20 +--
 ...PropertyTypeHandlingOldArrayFormatTest.php |   4 +-
 .../Core/Ruleset/PropertyTypeHandlingTest.php |  14 +-
 .../RegisterSniffsMissingInterfaceTest.php    |   6 +-
 .../RegisterSniffsRemovedTokenizersTest.php   |   8 +-
 tests/Core/Ruleset/RegisterSniffsTest.php     |  20 +--
 .../RuleInclusionAbsoluteLinuxTest.php        |   8 +-
 .../RuleInclusionAbsoluteWindowsTest.php      |   8 +-
 tests/Core/Ruleset/RuleInclusionTest.php      |  20 +--
 tests/Core/Ruleset/SetSniffPropertyTest.php   |  20 +--
 .../Ruleset/ShowSniffDeprecationsTest.php     |  30 ++--
 tests/Core/Runner/AbstractRunnerTestCase.php  |   2 +-
 tests/Core/Runner/PrintProgressDotsTest.php   |  12 +-
 tests/Core/Runner/PrintProgressTest.php       |  16 +-
 .../Runner/RunAllFilesExcludedErrorTest.php   |  12 +-
 tests/Core/Runner/RunPHPCSExplainTest.php     |   4 +-
 tests/Core/Runner/RunPHPCSGeneratorTest.php   |   4 +-
 tests/Core/Sniffs/AbstractArraySniffTest.php  |  20 +--
 .../Sniffs/AbstractArraySniffTestable.php     |   6 +-
 .../Core/Standards/StandardRulesetsQATest.php |   6 +-
 tests/Core/StatusWriterTestHelper.php         |  18 +--
 .../Tokenizers/AbstractTokenizerTestCase.php  |  10 +-
 .../Tokenizers/Comment/CommentTestCase.php    |   6 +-
 .../Tokenizers/Comment/LiveCoding1Test.php    |   6 +-
 .../Tokenizers/Comment/LiveCoding2Test.php    |   6 +-
 .../Tokenizers/Comment/LiveCoding3Test.php    |   6 +-
 .../Tokenizers/Comment/LiveCoding4Test.php    |   6 +-
 .../Comment/MultiLineDocBlockTest.php         |  18 +--
 .../PhpcsAnnotationsInDocBlockTest.php        |  36 ++---
 .../Comment/SingleLineDocBlockTest.php        |  18 +--
 .../PHP/AnonClassParenthesisOwnerTest.php     |  12 +-
 .../Core/Tokenizers/PHP/ArrayKeywordTest.php  |  14 +-
 tests/Core/Tokenizers/PHP/AttributesTest.php  |  22 +--
 .../PHP/BackfillAsymmetricVisibilityTest.php  |  10 +-
 .../Core/Tokenizers/PHP/BackfillEnumTest.php  |  10 +-
 .../PHP/BackfillExplicitOctalNotationTest.php |   6 +-
 .../PHP/BackfillFnTokenParseErrorTest.php     |   4 +-
 .../Tokenizers/PHP/BackfillFnTokenTest.php    |  92 +++++------
 .../Tokenizers/PHP/BackfillMatchTokenTest.php |  22 +--
 .../PHP/BackfillNumericSeparatorTest.php      |  10 +-
 .../Tokenizers/PHP/BackfillReadonlyTest.php   |  10 +-
 tests/Core/Tokenizers/PHP/BitwiseOrTest.php   |  10 +-
 .../PHP/ContextSensitiveKeywordsGotoTest.php  |   6 +-
 .../PHP/ContextSensitiveKeywordsTest.php      |  10 +-
 .../PHP/DNFTypesParseError1Test.php           |   6 +-
 .../PHP/DNFTypesParseError2Test.php           |  14 +-
 tests/Core/Tokenizers/PHP/DNFTypesTest.php    |  10 +-
 .../Tokenizers/PHP/DefaultKeywordTest.php     |  14 +-
 tests/Core/Tokenizers/PHP/DoubleArrowTest.php |  14 +-
 .../Tokenizers/PHP/DoubleQuotedStringTest.php |   6 +-
 tests/Core/Tokenizers/PHP/EnumCaseTest.php    |  14 +-
 tests/Core/Tokenizers/PHP/ExitKeywordTest.php |  10 +-
 tests/Core/Tokenizers/PHP/FinallyTest.php     |   6 +-
 tests/Core/Tokenizers/PHP/GotoLabelTest.php   |  14 +-
 .../Core/Tokenizers/PHP/HeredocNowdocTest.php |  16 +-
 .../Tokenizers/PHP/HeredocParseErrorTest.php  |   4 +-
 .../Core/Tokenizers/PHP/HeredocStringTest.php |   8 +-
 .../PHP/NamedFunctionCallArgumentsTest.php    |  30 ++--
 .../PHP/NamespacedNameSingleTokenTest.php     |   6 +-
 .../PHP/NullableVsInlineThenTest.php          |  10 +-
 .../PHP/NullsafeObjectOperatorTest.php        |  12 +-
 .../PHP/OtherContextSensitiveKeywordsTest.php |  12 +-
 .../Tokenizers/PHP/PHPOpenTagEOF1Test.php     |   4 +-
 .../Tokenizers/PHP/PHPOpenTagEOF2Test.php     |   4 +-
 .../Tokenizers/PHP/PHPOpenTagEOF3Test.php     |   4 +-
 tests/Core/Tokenizers/PHP/PHPOpenTagTest.php  |  22 +--
 .../Tokenizers/PHP/ResolveSimpleTokenTest.php |  36 ++---
 tests/Core/Tokenizers/PHP/ShortArrayTest.php  |  10 +-
 .../PHP/StableCommentWhitespaceTest.php       |   6 +-
 .../PHP/StableCommentWhitespaceWinTest.php    |   6 +-
 .../Tokenizers/PHP/TypeIntersectionTest.php   |  10 +-
 .../Tokenizers/PHP/TypedConstantsTest.php     |  20 +--
 tests/Core/Tokenizers/PHP/YieldTest.php       |  18 +--
 ...reateParenthesisNestingMapDNFTypesTest.php |  10 +-
 ...eatePositionMapHeredocNowdocCloserTest.php |   6 +-
 ...eatePositionMapHeredocNowdocOpenerTest.php |   6 +-
 .../CreatePositionMapTabWidth0Test.php        |   4 +-
 .../CreatePositionMapYieldFromTest.php        |   6 +-
 .../CreateTokenMapArrayParenthesesTest.php    |  14 +-
 ...MapClosureUseParenthesesParseErrorTest.php |   4 +-
 ...reateTokenMapClosureUseParenthesesTest.php |  14 +-
 .../CreateTokenMapParenthesesTest.php         |  14 +-
 ...curseScopeMapCaseKeywordConditionsTest.php |  14 +-
 ...seScopeMapDefaultKeywordConditionsTest.php |  16 +-
 ...RecurseScopeMapIfKeywordConditionsTest.php |   4 +-
 .../RecurseScopeMapSwitchTokenScopeTest.php   |   6 +-
 ...curseScopeMapWithNamespaceOperatorTest.php |   6 +-
 .../Tokenizer/ReplaceTabsInTokenMiscTest.php  |   8 +-
 .../ReplaceTabsInTokenTabWidth1Test.php       |   4 +-
 .../ReplaceTabsInTokenTabWidth2Test.php       |   4 +-
 .../ReplaceTabsInTokenTabWidth4Test.php       |   4 +-
 .../ReplaceTabsInTokenTabWidth5Test.php       |   4 +-
 .../Tokenizer/ReplaceTabsInTokenTestCase.php  |  14 +-
 tests/Core/Util/Common/EscapeshellcmdTest.php |   6 +-
 tests/Core/Util/Common/GetSniffCodeTest.php   |  14 +-
 tests/Core/Util/Common/IsCamelCapsTest.php    |  38 ++---
 .../Core/Util/Common/PrepareForOutputTest.php |   8 +-
 tests/Core/Util/Common/StripColorsTest.php    |   6 +-
 tests/Core/Util/Common/SuggestTypeTest.php    |  16 +-
 tests/Core/Util/ExitCode/ExitCodeTest.php     |  28 ++--
 tests/Core/Util/Help/HelpTest.php             |  44 ++---
 .../Core/Util/IgnoreList/CheckAndSetTest.php  |   6 +-
 .../IgnoreList/GetInstanceIgnoringAllTest.php |   4 +-
 .../GetInstanceIgnoringNothingTest.php        |   4 +-
 .../IgnoreList/GetNewInstanceFromTest.php     |   4 +-
 .../IgnoresNothingAndEverythingTest.php       |   6 +-
 .../MessageCollector/MessageCollectorTest.php |  34 ++--
 .../Timing/GetHumanReadableDurationTest.php   |   6 +-
 tests/Core/Util/Timing/TimingTest.php         |  16 +-
 .../Tokens/GetHighestWeightedTokenTest.php    |   6 +-
 tests/Core/Util/Tokens/TokenNameTest.php      |   8 +-
 tests/Core/Util/Writers/StatusWriterTest.php  |  24 +--
 tests/Standards/AbstractSniffTestCase.php     |  14 +-
 656 files changed, 3043 insertions(+), 3043 deletions(-)

diff --git a/autoload.php b/autoload.php
index 6f38c75d96..aaa1507d1c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -141,7 +141,7 @@ public static function load(string $className)
 
             return false;
 
-        }//end load()
+        }
 
 
         /**
@@ -184,7 +184,7 @@ public static function loadFile(string $path)
             self::$loadedFiles[$className] = $path;
             return self::$loadedClasses[$path];
 
-        }//end loadFile()
+        }
 
 
         /**
@@ -245,7 +245,7 @@ static function ($remaining, $current) {
 
             return $className;
 
-        }//end determineLoadedClass()
+        }
 
 
         /**
@@ -260,7 +260,7 @@ public static function addSearchPath(string $path, string $nsPrefix = '')
         {
             self::$searchPaths[$path] = rtrim(trim((string) $nsPrefix), '\\');
 
-        }//end addSearchPath()
+        }
 
 
         /**
@@ -272,7 +272,7 @@ public static function getSearchPaths()
         {
             return self::$searchPaths;
 
-        }//end getSearchPaths()
+        }
 
 
         /**
@@ -291,7 +291,7 @@ public static function getLoadedClassName(string $path)
 
             return self::$loadedClasses[$path];
 
-        }//end getLoadedClassName()
+        }
 
 
         /**
@@ -310,7 +310,7 @@ public static function getLoadedFileName(string $className)
 
             return self::$loadedFiles[$className];
 
-        }//end getLoadedFileName()
+        }
 
 
         /**
@@ -322,7 +322,7 @@ public static function getLoadedClasses()
         {
             return self::$loadedClasses;
 
-        }//end getLoadedClasses()
+        }
 
 
         /**
@@ -334,10 +334,10 @@ 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..930b77380a 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -37,7 +37,7 @@
     <!-- Include some sniffs from other standards that don't conflict with PEAR -->
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
     <rule ref="Squiz.Arrays.ArrayDeclaration"/>
-    <rule ref="Squiz.Commenting.ClosingDeclarationComment"/>
+    <rule ref="PSR12.Classes.ClosingBrace"/>
     <rule ref="Squiz.ControlStructures.ControlSignature"/>
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
     <rule ref="Squiz.Commenting.BlockComment"/>
diff --git a/requirements.php b/requirements.php
index 2558b8fa50..c92926a2a6 100644
--- a/requirements.php
+++ b/requirements.php
@@ -70,4 +70,4 @@ function checkRequirements()
         exit($exitCode);
     }
 
-}//end checkRequirements()
+}
diff --git a/scripts/BuildRequirementsCheckMatrix.php b/scripts/BuildRequirementsCheckMatrix.php
index f7b395a7f5..37936bc1a9 100644
--- a/scripts/BuildRequirementsCheckMatrix.php
+++ b/scripts/BuildRequirementsCheckMatrix.php
@@ -72,7 +72,7 @@ public function getBuilds()
 
         return $builds;
 
-    }//end getBuilds()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ private function getValidBuilds()
 
         return $builds;
 
-    }//end getValidBuilds()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ private function getInvalidPHPBuilds()
 
         return $builds;
 
-    }//end getInvalidPHPBuilds()
+    }
 
 
     /**
@@ -182,7 +182,7 @@ private function getMissingExtensionsBuilds()
 
         return $builds;
 
-    }//end getMissingExtensionsBuilds()
+    }
 
 
-}//end class
+}
diff --git a/scripts/build-phar.php b/scripts/build-phar.php
index 545f97e9ae..bde93ca6ec 100644
--- a/scripts/build-phar.php
+++ b/scripts/build-phar.php
@@ -76,7 +76,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..880af454bd 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -276,7 +276,7 @@ public function __get(string $name)
 
         return $this->settings[$name];
 
-    }//end __get()
+    }
 
 
     /**
@@ -349,7 +349,7 @@ public function __set(string $name, $value)
 
         $this->settings[$name] = $value;
 
-    }//end __set()
+    }
 
 
     /**
@@ -363,7 +363,7 @@ public function __isset(string $name)
     {
         return isset($this->settings[$name]);
 
-    }//end __isset()
+    }
 
 
     /**
@@ -377,7 +377,7 @@ public function __unset(string $name)
     {
         $this->settings[$name] = null;
 
-    }//end __unset()
+    }
 
 
     /**
@@ -389,7 +389,7 @@ public function getSettings()
     {
         return $this->settings;
 
-    }//end getSettings()
+    }
 
 
     /**
@@ -403,7 +403,7 @@ public function setSettings(array $settings)
     {
         $this->settings = $settings;
 
-    }//end setSettings()
+    }
 
 
     /**
@@ -488,7 +488,7 @@ public function __construct(array $cliArgs = [], bool $dieOnUnknownArg = true)
 
         fclose($handle);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -539,7 +539,7 @@ public function setCommandLineValues(array $args)
             }//end if
         }//end for
 
-    }//end setCommandLineValues()
+    }
 
 
     /**
@@ -663,7 +663,7 @@ public function restoreDefaults()
             $this->parallel = max((int) $parallel, 1);
         }
 
-    }//end restoreDefaults()
+    }
 
 
     /**
@@ -775,7 +775,7 @@ public function processShortArgument(string $arg, int $pos)
             }
         }//end switch
 
-    }//end processShortArgument()
+    }
 
 
     /**
@@ -1307,7 +1307,7 @@ public function processLongArgument(string $arg, int $pos)
             break;
         }//end switch
 
-    }//end processLongArgument()
+    }
 
 
     /**
@@ -1394,7 +1394,7 @@ static function ($carry, $item) {
 
         return $sniffs;
 
-    }//end parseSniffCodes()
+    }
 
 
     /**
@@ -1423,7 +1423,7 @@ public function processUnknownArgument(string $arg, int $pos)
 
         $this->processFilePath($arg);
 
-    }//end processUnknownArgument()
+    }
 
 
     /**
@@ -1459,7 +1459,7 @@ public function processFilePath(string $path)
             $this->overriddenDefaults['files'] = true;
         }
 
-    }//end processFilePath()
+    }
 
 
     /**
@@ -1479,7 +1479,7 @@ public function printUsage()
 
         echo PHP_EOL;
 
-    }//end printUsage()
+    }
 
 
     /**
@@ -1506,7 +1506,7 @@ public function printShortUsage(bool $returnOutput = false)
 
         echo $usage;
 
-    }//end printShortUsage()
+    }
 
 
     /**
@@ -1532,7 +1532,7 @@ public function printPHPCSUsage()
 
         (new Help($this, $longOptions, $shortOptions))->display();
 
-    }//end printPHPCSUsage()
+    }
 
 
     /**
@@ -1548,7 +1548,7 @@ public function printPHPCBFUsage()
 
         (new Help($this, $longOptions, $shortOptions))->display();
 
-    }//end printPHPCBFUsage()
+    }
 
 
     /**
@@ -1574,7 +1574,7 @@ public static function getConfigData(string $key)
 
         return $phpCodeSnifferConfig[$key];
 
-    }//end getConfigData()
+    }
 
 
     /**
@@ -1615,7 +1615,7 @@ public static function getExecutablePath(string $name)
         self::$executablePaths[$name] = $result;
         return $result;
 
-    }//end getExecutablePath()
+    }
 
 
     /**
@@ -1697,7 +1697,7 @@ public function setConfigData(string $key, ?string $value, bool $temp = false)
 
         return true;
 
-    }//end setConfigData()
+    }
 
 
     /**
@@ -1739,7 +1739,7 @@ public static function getAllConfigData()
         self::$configData     = $phpCodeSnifferConfig;
         return self::$configData;
 
-    }//end getAllConfigData()
+    }
 
 
     /**
@@ -1774,7 +1774,7 @@ public function prepareConfigDataForDisplay(array $data)
 
         return $output;
 
-    }//end prepareConfigDataForDisplay()
+    }
 
 
     /**
@@ -1790,7 +1790,7 @@ 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..7583409aff 100644
--- a/src/Files/DummyFile.php
+++ b/src/Files/DummyFile.php
@@ -56,7 +56,7 @@ public function __construct(string $content, Ruleset $ruleset, Config $config)
 
         parent::__construct($path, $ruleset, $config);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public function setErrorCounts(
         $this->fixedErrorCount     = $fixedErrorCount;
         $this->fixedWarningCount   = $fixedWarningCount;
 
-    }//end setErrorCounts()
+    }
 
 
-}//end class
+}
diff --git a/src/Files/File.php b/src/Files/File.php
index 180ee4f3aa..adf5a6a5b9 100644
--- a/src/Files/File.php
+++ b/src/Files/File.php
@@ -284,7 +284,7 @@ public function __construct(string $path, Ruleset $ruleset, Config $config)
         $this->configCache['ignorePatterns']  = $this->ruleset->ignorePatterns;
         $this->configCache['includePatterns'] = $this->ruleset->includePatterns;
 
-    }//end __construct()
+    }
 
 
     /**
@@ -308,7 +308,7 @@ public function setContent(string $content)
             return;
         }
 
-    }//end setContent()
+    }
 
 
     /**
@@ -322,7 +322,7 @@ public function setContent(string $content)
     public function reloadContent()
     {
 
-    }//end reloadContent()
+    }
 
 
     /**
@@ -334,7 +334,7 @@ public function disableCaching()
     {
         $this->configCache['cache'] = false;
 
-    }//end disableCaching()
+    }
 
 
     /**
@@ -559,7 +559,7 @@ public function process()
         $this->fixedErrorCount   = ($this->firstRunCounts['fixableError'] - $this->fixableErrorCount);
         $this->fixedWarningCount = ($this->firstRunCounts['fixableWarning'] - $this->fixableWarningCount);
 
-    }//end process()
+    }
 
 
     /**
@@ -623,7 +623,7 @@ public function parse()
             StatusWriter::write("[$this->numTokens tokens in $numLines lines]... ", 0, $newlines);
         }
 
-    }//end parse()
+    }
 
 
     /**
@@ -635,7 +635,7 @@ public function getTokens()
     {
         return $this->tokens;
 
-    }//end getTokens()
+    }
 
 
     /**
@@ -654,7 +654,7 @@ public function cleanUp()
         $this->config        = null;
         $this->ruleset       = null;
 
-    }//end cleanUp()
+    }
 
 
     /**
@@ -688,7 +688,7 @@ public function addError(
 
         return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable);
 
-    }//end addError()
+    }
 
 
     /**
@@ -722,7 +722,7 @@ public function addWarning(
 
         return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable);
 
-    }//end addWarning()
+    }
 
 
     /**
@@ -746,7 +746,7 @@ public function addErrorOnLine(
     ) {
         return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
 
-    }//end addErrorOnLine()
+    }
 
 
     /**
@@ -770,7 +770,7 @@ public function addWarningOnLine(
     ) {
         return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
 
-    }//end addWarningOnLine()
+    }
 
 
     /**
@@ -801,7 +801,7 @@ public function addFixableError(
 
         return false;
 
-    }//end addFixableError()
+    }
 
 
     /**
@@ -832,7 +832,7 @@ public function addFixableWarning(
 
         return false;
 
-    }//end addFixableWarning()
+    }
 
 
     /**
@@ -1093,7 +1093,7 @@ protected function addMessage(
 
         return true;
 
-    }//end addMessage()
+    }
 
 
     /**
@@ -1121,7 +1121,7 @@ public function recordMetric(int $stackPtr, string $metric, string $value)
 
         return true;
 
-    }//end recordMetric()
+    }
 
 
     /**
@@ -1133,7 +1133,7 @@ public function getErrorCount()
     {
         return $this->errorCount;
 
-    }//end getErrorCount()
+    }
 
 
     /**
@@ -1145,7 +1145,7 @@ public function getWarningCount()
     {
         return $this->warningCount;
 
-    }//end getWarningCount()
+    }
 
 
     /**
@@ -1157,7 +1157,7 @@ public function getFixableCount()
     {
         return ($this->fixableErrorCount + $this->fixableWarningCount);
 
-    }//end getFixableCount()
+    }
 
 
     /**
@@ -1169,7 +1169,7 @@ public function getFixableErrorCount()
     {
         return $this->fixableErrorCount;
 
-    }//end getFixableErrorCount()
+    }
 
 
     /**
@@ -1181,7 +1181,7 @@ public function getFixableWarningCount()
     {
         return $this->fixableWarningCount;
 
-    }//end getFixableWarningCount()
+    }
 
 
     /**
@@ -1193,7 +1193,7 @@ public function getFixedCount()
     {
         return $this->fixedCount;
 
-    }//end getFixedCount()
+    }
 
 
     /**
@@ -1205,7 +1205,7 @@ public function getFixedErrorCount()
     {
         return $this->fixedErrorCount;
 
-    }//end getFixedErrorCount()
+    }
 
 
     /**
@@ -1217,7 +1217,7 @@ public function getFixedWarningCount()
     {
         return $this->fixedWarningCount;
 
-    }//end getFixedWarningCount()
+    }
 
 
     /**
@@ -1233,7 +1233,7 @@ public function getFirstRunCount(string $type): int
     {
         return $this->firstRunCounts[$type];
 
-    }//end getFirstRunCount()
+    }
 
 
     /**
@@ -1245,7 +1245,7 @@ public function getIgnoredLines()
     {
         return $this->tokenizer->ignoredLines;
 
-    }//end getIgnoredLines()
+    }
 
 
     /**
@@ -1257,7 +1257,7 @@ public function getErrors()
     {
         return $this->errors;
 
-    }//end getErrors()
+    }
 
 
     /**
@@ -1269,7 +1269,7 @@ public function getWarnings()
     {
         return $this->warnings;
 
-    }//end getWarnings()
+    }
 
 
     /**
@@ -1281,7 +1281,7 @@ public function getMetrics()
     {
         return $this->metrics;
 
-    }//end getMetrics()
+    }
 
 
     /**
@@ -1293,7 +1293,7 @@ public function getListenerTimes()
     {
         return $this->listenerTimes;
 
-    }//end getListenerTimes()
+    }
 
 
     /**
@@ -1305,7 +1305,7 @@ public function getFilename()
     {
         return $this->path;
 
-    }//end getFilename()
+    }
 
 
     /**
@@ -1351,7 +1351,7 @@ public function getDeclarationName(int $stackPtr)
 
         return $content;
 
-    }//end getDeclarationName()
+    }
 
 
     /**
@@ -1689,7 +1689,7 @@ public function getMethodParameters(int $stackPtr)
 
         return $vars;
 
-    }//end getMethodParameters()
+    }
 
 
     /**
@@ -1872,7 +1872,7 @@ public function getMethodProperties(int $stackPtr)
             'has_body'              => $hasBody,
         ];
 
-    }//end getMethodProperties()
+    }
 
 
     /**
@@ -2072,7 +2072,7 @@ public function getMemberProperties(int $stackPtr)
             'nullable_type'   => $nullableType,
         ];
 
-    }//end getMemberProperties()
+    }
 
 
     /**
@@ -2138,7 +2138,7 @@ public function getClassProperties(int $stackPtr)
             'is_readonly' => $isReadonly,
         ];
 
-    }//end getClassProperties()
+    }
 
 
     /**
@@ -2249,7 +2249,7 @@ public function isReference(int $stackPtr)
 
         return false;
 
-    }//end isReference()
+    }
 
 
     /**
@@ -2292,7 +2292,7 @@ public function getTokensAsString($start, $length, bool $origContent = false)
 
         return $str;
 
-    }//end getTokensAsString()
+    }
 
 
     /**
@@ -2373,7 +2373,7 @@ public function findPrevious(
 
         return false;
 
-    }//end findPrevious()
+    }
 
 
     /**
@@ -2440,7 +2440,7 @@ public function findNext(
 
         return false;
 
-    }//end findNext()
+    }
 
 
     /**
@@ -2631,7 +2631,7 @@ public function findStartOfStatement(int $start, $ignore = null)
 
         return 0;
 
-    }//end findStartOfStatement()
+    }
 
 
     /**
@@ -2746,7 +2746,7 @@ public function findEndOfStatement(int $start, $ignore = null)
 
         return ($this->numTokens - 1);
 
-    }//end findEndOfStatement()
+    }
 
 
     /**
@@ -2808,7 +2808,7 @@ public function findFirstOnLine($types, int $start, bool $exclude = false, ?stri
 
         return $foundToken;
 
-    }//end findFirstOnLine()
+    }
 
 
     /**
@@ -2843,7 +2843,7 @@ public function hasCondition(int $stackPtr, $types)
 
         return false;
 
-    }//end hasCondition()
+    }
 
 
     /**
@@ -2885,7 +2885,7 @@ public function getCondition(int $stackPtr, $type, bool $first = true)
 
         return false;
 
-    }//end getCondition()
+    }
 
 
     /**
@@ -2935,7 +2935,7 @@ public function findExtendedClassName(int $stackPtr)
 
         return $name;
 
-    }//end findExtendedClassName()
+    }
 
 
     /**
@@ -2987,7 +2987,7 @@ public function findImplementedInterfaceNames(int $stackPtr)
             return $names;
         }
 
-    }//end findImplementedInterfaceNames()
+    }
 
 
-}//end class
+}
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
index a7b856a460..bf8891fc3f 100644
--- a/src/Files/FileList.php
+++ b/src/Files/FileList.php
@@ -103,7 +103,7 @@ public function __construct(Config $config, Ruleset $ruleset)
         reset($this->files);
         $this->numFiles = count($this->files);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ public function addFile(string $path, ?File $file = null)
             $this->numFiles++;
         }
 
-    }//end addFile()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ private function getFilterClass()
 
         return $filterClass;
 
-    }//end getFilterClass()
+    }
 
 
     /**
@@ -188,7 +188,7 @@ public function rewind()
     {
         reset($this->files);
 
-    }//end rewind()
+    }
 
 
     /**
@@ -206,7 +206,7 @@ public function current()
 
         return $this->files[$path];
 
-    }//end current()
+    }
 
 
     /**
@@ -219,7 +219,7 @@ public function key()
     {
         return key($this->files);
 
-    }//end key()
+    }
 
 
     /**
@@ -232,7 +232,7 @@ public function next()
     {
         next($this->files);
 
-    }//end next()
+    }
 
 
     /**
@@ -249,7 +249,7 @@ public function valid()
 
         return true;
 
-    }//end valid()
+    }
 
 
     /**
@@ -262,7 +262,7 @@ public function count()
     {
         return $this->numFiles;
 
-    }//end count()
+    }
 
 
-}//end class
+}
diff --git a/src/Files/LocalFile.php b/src/Files/LocalFile.php
index 907298e207..6a47c3ce2b 100644
--- a/src/Files/LocalFile.php
+++ b/src/Files/LocalFile.php
@@ -61,7 +61,7 @@ public function __construct(string $path, Ruleset $ruleset, Config $config)
 
         parent::__construct($this->path, $ruleset, $config);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -73,7 +73,7 @@ public function reloadContent()
     {
         $this->setContent(file_get_contents($this->path));
 
-    }//end reloadContent()
+    }
 
 
     /**
@@ -151,7 +151,7 @@ public function process()
             $this->configCache['cache'] = true;
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ 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..f004b9e0a7 100644
--- a/src/Filters/ExactMatch.php
+++ b/src/Filters/ExactMatch.php
@@ -68,7 +68,7 @@ public function accept()
 
         return isset($this->allowedFiles[$filePath]);
 
-    }//end accept()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public function getChildren()
         $children->allowedFiles    = $this->allowedFiles;
         return $children;
 
-    }//end getChildren()
+    }
 
 
     /**
@@ -109,4 +109,4 @@ abstract protected function getDisallowedFiles();
     abstract protected function getAllowedFiles();
 
 
-}//end class
+}
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
index 4795a9e06a..75c81e202f 100644
--- a/src/Filters/Filter.php
+++ b/src/Filters/Filter.php
@@ -96,7 +96,7 @@ public function __construct(RecursiveIterator $iterator, string $basedir, Config
             $this->isBasedirDir = true;
         }
 
-    }//end __construct()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ public function accept()
         $this->acceptedPaths[$realPath] = true;
         return true;
 
-    }//end accept()
+    }
 
 
     /**
@@ -166,7 +166,7 @@ public function getChildren()
         $children->acceptedPaths      = $this->acceptedPaths;
         return $children;
 
-    }//end getChildren()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ protected function shouldProcessFile(string $path)
 
         return true;
 
-    }//end shouldProcessFile()
+    }
 
 
     /**
@@ -299,7 +299,7 @@ protected function shouldIgnorePath(string $path)
 
         return false;
 
-    }//end shouldIgnorePath()
+    }
 
 
-}//end class
+}
diff --git a/src/Filters/GitModified.php b/src/Filters/GitModified.php
index b5cd7d5e3b..87d9018fd4 100644
--- a/src/Filters/GitModified.php
+++ b/src/Filters/GitModified.php
@@ -26,7 +26,7 @@ protected function getDisallowedFiles()
     {
         return [];
 
-    }//end getDisallowedFiles()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ protected function getAllowedFiles()
 
         return $modified;
 
-    }//end getAllowedFiles()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ 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..150436cc99 100644
--- a/src/Filters/GitStaged.php
+++ b/src/Filters/GitStaged.php
@@ -28,7 +28,7 @@ protected function getDisallowedFiles()
     {
         return [];
 
-    }//end getDisallowedFiles()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ protected function getAllowedFiles()
 
         return $modified;
 
-    }//end getAllowedFiles()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ protected function exec(string $cmd)
 
         return $output;
 
-    }//end exec()
+    }
 
 
-}//end class
+}
diff --git a/src/Fixer.php b/src/Fixer.php
index 7b73c8a33c..c13af49dd5 100644
--- a/src/Fixer.php
+++ b/src/Fixer.php
@@ -137,7 +137,7 @@ public function startFile(File $phpcsFile)
             }
         }
 
-    }//end startFile()
+    }
 
 
     /**
@@ -220,7 +220,7 @@ public function fixFile()
 
         return true;
 
-    }//end fixFile()
+    }
 
 
     /**
@@ -337,7 +337,7 @@ public function generateDiff(?string $filePath = null, bool $colors = true)
 
         return $diff;
 
-    }//end generateDiff()
+    }
 
 
     /**
@@ -352,7 +352,7 @@ public function getFixCount()
     {
         return $this->numFixes;
 
-    }//end getFixCount()
+    }
 
 
     /**
@@ -365,7 +365,7 @@ public function getContents()
         $contents = implode($this->tokens);
         return $contents;
 
-    }//end getContents()
+    }
 
 
     /**
@@ -388,7 +388,7 @@ public function getTokenContent(int $stackPtr)
             return $this->tokens[$stackPtr];
         }
 
-    }//end getTokenContent()
+    }
 
 
     /**
@@ -418,7 +418,7 @@ public function beginChangeset()
         $this->changeset   = [];
         $this->inChangeset = true;
 
-    }//end beginChangeset()
+    }
 
 
     /**
@@ -462,7 +462,7 @@ public function endChangeset()
         $this->changeset = [];
         return true;
 
-    }//end endChangeset()
+    }
 
 
     /**
@@ -497,7 +497,7 @@ public function rollbackChangeset()
             $this->changeset = [];
         }//end if
 
-    }//end rollbackChangeset()
+    }
 
 
     /**
@@ -618,7 +618,7 @@ public function replaceToken(int $stackPtr, string $content)
 
         return true;
 
-    }//end replaceToken()
+    }
 
 
     /**
@@ -676,7 +676,7 @@ public function revertToken(int $stackPtr)
 
         return true;
 
-    }//end revertToken()
+    }
 
 
     /**
@@ -701,7 +701,7 @@ public function substrToken(int $stackPtr, int $start, ?int $length = null)
 
         return $this->replaceToken($stackPtr, $newContent);
 
-    }//end substrToken()
+    }
 
 
     /**
@@ -716,7 +716,7 @@ public function addNewline(int $stackPtr)
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current . $this->currentFile->eolChar);
 
-    }//end addNewline()
+    }
 
 
     /**
@@ -731,7 +731,7 @@ public function addNewlineBefore(int $stackPtr)
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $this->currentFile->eolChar . $current);
 
-    }//end addNewlineBefore()
+    }
 
 
     /**
@@ -747,7 +747,7 @@ public function addContent(int $stackPtr, string $content)
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current . $content);
 
-    }//end addContent()
+    }
 
 
     /**
@@ -763,7 +763,7 @@ public function addContentBefore(int $stackPtr, string $content)
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $content . $current);
 
-    }//end addContentBefore()
+    }
 
 
     /**
@@ -825,7 +825,7 @@ public function changeCodeBlockIndent(int $start, int $end, int $change)
             $this->endChangeset();
         }
 
-    }//end changeCodeBlockIndent()
+    }
 
 
     /**
@@ -845,7 +845,7 @@ private function getSniffCodeForDebug(string $className)
             return $className;
         }
 
-    }//end getSniffCodeForDebug()
+    }
 
 
-}//end class
+}
diff --git a/src/Generators/Generator.php b/src/Generators/Generator.php
index 0fac2e0969..b9cd8eeb11 100644
--- a/src/Generators/Generator.php
+++ b/src/Generators/Generator.php
@@ -71,7 +71,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()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ protected function getTitle(DOMElement $doc)
 
         return $title;
 
-    }//end getTitle()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ public function generate()
             $this->processSniff($documentation);
         }
 
-    }//end generate()
+    }
 
 
     /**
@@ -151,4 +151,4 @@ public function generate()
     abstract protected function processSniff(DOMElement $doc);
 
 
-}//end class
+}
diff --git a/src/Generators/HTML.php b/src/Generators/HTML.php
index e91b92f7f3..e746730af4 100644
--- a/src/Generators/HTML.php
+++ b/src/Generators/HTML.php
@@ -162,7 +162,7 @@ public function generate()
             echo $this->getFormattedFooter();
         }
 
-    }//end generate()
+    }
 
 
     /**
@@ -191,7 +191,7 @@ protected function getFormattedHeader()
         // Use the correct line endings based on the OS.
         return str_replace("\n", PHP_EOL, $output) . PHP_EOL;
 
-    }//end getFormattedHeader()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ protected function getFormattedToc()
 
         return $output;
 
-    }//end getFormattedToc()
+    }
 
 
     /**
@@ -256,7 +256,7 @@ protected function getFormattedFooter()
         // Use the correct line endings based on the OS.
         return str_replace("\n", PHP_EOL, $output) . PHP_EOL;
 
-    }//end getFormattedFooter()
+    }
 
 
     /**
@@ -289,7 +289,7 @@ public function processSniff(DOMElement $doc)
             echo $content;
         }
 
-    }//end processSniff()
+    }
 
 
     /**
@@ -318,7 +318,7 @@ private function titleToAnchor(string $title)
 
         return $title;
 
-    }//end titleToAnchor()
+    }
 
 
     /**
@@ -371,7 +371,7 @@ protected function getFormattedTextBlock(DOMNode $node)
 
         return '  <p class="text">' . implode('', $lines) . '</p>' . PHP_EOL;
 
-    }//end getFormattedTextBlock()
+    }
 
 
     /**
@@ -427,7 +427,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
 
         return $output;
 
-    }//end getFormattedCodeComparisonBlock()
+    }
 
 
     /**
@@ -444,7 +444,7 @@ private function formatCodeTitle(DOMElement $codeElm)
         $title = trim($codeElm->getAttribute('title'));
         return str_replace('  ', '&nbsp;&nbsp;', $title);
 
-    }//end formatCodeTitle()
+    }
 
 
     /**
@@ -466,7 +466,7 @@ private function formatCodeSample(DOMElement $codeElm)
 
         return $code;
 
-    }//end formatCodeSample()
+    }
 
 
-}//end class
+}
diff --git a/src/Generators/Markdown.php b/src/Generators/Markdown.php
index 71fe0b85b8..121600674c 100644
--- a/src/Generators/Markdown.php
+++ b/src/Generators/Markdown.php
@@ -55,7 +55,7 @@ public function generate()
             echo $this->getFormattedFooter();
         }
 
-    }//end generate()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ protected function getFormattedHeader()
 
         return "# $standard Coding Standard" . PHP_EOL;
 
-    }//end getFormattedHeader()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ protected function getFormattedFooter()
 
         return $output;
 
-    }//end getFormattedFooter()
+    }
 
 
     /**
@@ -123,7 +123,7 @@ protected function processSniff(DOMElement $doc)
             echo $content;
         }
 
-    }//end processSniff()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ protected function getFormattedTextBlock(DOMNode $node)
 
         return implode(PHP_EOL, $lines) . PHP_EOL;
 
-    }//end getFormattedTextBlock()
+    }
 
 
     /**
@@ -234,7 +234,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
 
         return $output;
 
-    }//end getFormattedCodeComparisonBlock()
+    }
 
 
     /**
@@ -251,7 +251,7 @@ private function formatCodeTitle(DOMElement $codeElm)
         $title = trim($codeElm->getAttribute('title'));
         return str_replace('  ', '&nbsp;&nbsp;', $title);
 
-    }//end formatCodeTitle()
+    }
 
 
     /**
@@ -272,7 +272,7 @@ private function formatCodeSample(DOMElement $codeElm)
 
         return $code;
 
-    }//end formatCodeSample()
+    }
 
 
-}//end class
+}
diff --git a/src/Generators/Text.php b/src/Generators/Text.php
index 412995f9b8..33fe3b97f1 100644
--- a/src/Generators/Text.php
+++ b/src/Generators/Text.php
@@ -44,7 +44,7 @@ public function processSniff(DOMElement $doc)
             echo $this->getFormattedTitle($doc), $content;
         }
 
-    }//end processSniff()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ protected function getFormattedTitle(DOMElement $doc)
 
         return $output;
 
-    }//end getFormattedTitle()
+    }
 
 
     /**
@@ -103,7 +103,7 @@ protected function getFormattedTextBlock(DOMNode $node)
 
         return wordwrap($text, 100, PHP_EOL) . PHP_EOL . PHP_EOL;
 
-    }//end getFormattedTextBlock()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
 
         return $output;
 
-    }//end getFormattedCodeComparisonBlock()
+    }
 
 
     /**
@@ -179,7 +179,7 @@ private function codeTitleToLines(DOMElement $codeElm)
 
         return explode("\n", $title);
 
-    }//end codeTitleToLines()
+    }
 
 
     /**
@@ -201,7 +201,7 @@ private function codeToLines(DOMElement $codeElm)
         $code = str_replace(['<em>', '</em>'], '', $code);
         return explode("\n", $code);
 
-    }//end codeToLines()
+    }
 
 
     /**
@@ -232,7 +232,7 @@ private function linesToTableRows(array $column1Lines, array $column2Lines)
 
         return $rows;
 
-    }//end linesToTableRows()
+    }
 
 
-}//end class
+}
diff --git a/src/Reporter.php b/src/Reporter.php
index fe995605f2..a678bb8e2e 100644
--- a/src/Reporter.php
+++ b/src/Reporter.php
@@ -177,7 +177,7 @@ public function __construct(Config $config)
             }
         }//end foreach
 
-    }//end __construct()
+    }
 
 
     /**
@@ -191,7 +191,7 @@ public function __isset(string $name)
     {
         return ($name === 'totalFixable' || $name === 'totalFixed');
 
-    }//end __isset()
+    }
 
 
     /**
@@ -219,7 +219,7 @@ public function __get(string $name)
 
         throw new RuntimeException("ERROR: access requested to unknown property \"Reporter::\${$name}\"");
 
-    }//end __get()
+    }
 
 
     /**
@@ -236,7 +236,7 @@ public function __set(string $name, $value)
     {
         throw new RuntimeException("ERROR: setting property \"Reporter::\${$name}\" is not allowed");
 
-    }//end __set()
+    }
 
 
     /**
@@ -252,7 +252,7 @@ public function __unset(string $name)
     {
         throw new RuntimeException("ERROR: unsetting property \"Reporter::\${$name}\" is not allowed");
 
-    }//end __unset()
+    }
 
 
     /**
@@ -276,7 +276,7 @@ public function printReports()
 
         return $toScreen;
 
-    }//end printReports()
+    }
 
 
     /**
@@ -342,7 +342,7 @@ public function printReport(string $report)
             }
         }
 
-    }//end printReport()
+    }
 
 
     /**
@@ -408,7 +408,7 @@ public function cacheFileReport(File $phpcsFile)
             $this->totalFixedWarnings   += $phpcsFile->getFixedWarningCount();
         }
 
-    }//end cacheFileReport()
+    }
 
 
     /**
@@ -526,7 +526,7 @@ public function prepareFileReport(File $phpcsFile)
         $report['messages'] = $errors;
         return $report;
 
-    }//end prepareFileReport()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Cbf.php b/src/Reports/Cbf.php
index 2d64007b13..33edd813c5 100644
--- a/src/Reports/Cbf.php
+++ b/src/Reports/Cbf.php
@@ -114,7 +114,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return $fixed;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -250,7 +250,7 @@ public function generate(
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
 
-    }//end generate()
+    }
 
 
     /**
@@ -270,7 +270,7 @@ private function createReporterInstance(File $phpcsFile)
              */
             public function __construct()
             {
-            }//end __construct()
+            }
 
 
         };
@@ -285,7 +285,7 @@ public function __construct()
 
         return $reporter;
 
-    }//end createReporterInstance()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Checkstyle.php b/src/Reports/Checkstyle.php
index 861411a82a..79c6900374 100644
--- a/src/Reports/Checkstyle.php
+++ b/src/Reports/Checkstyle.php
@@ -70,7 +70,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ public function generate(
         echo $cachedData;
         echo '</checkstyle>' . PHP_EOL;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Code.php b/src/Reports/Code.php
index e825f6f1df..739092af25 100644
--- a/src/Reports/Code.php
+++ b/src/Reports/Code.php
@@ -315,7 +315,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -351,7 +351,7 @@ public function generate(
 
         echo $cachedData;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Csv.php b/src/Reports/Csv.php
index 71b7a30b57..50c48c2e54 100644
--- a/src/Reports/Csv.php
+++ b/src/Reports/Csv.php
@@ -53,7 +53,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ 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..c21d4192ce 100644
--- a/src/Reports/Diff.php
+++ b/src/Reports/Diff.php
@@ -81,7 +81,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $diff . PHP_EOL;
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function generate(
             echo PHP_EOL;
         }
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Emacs.php b/src/Reports/Emacs.php
index 11a722a93b..04e56fa308 100644
--- a/src/Reports/Emacs.php
+++ b/src/Reports/Emacs.php
@@ -53,7 +53,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function generate(
     ) {
         echo $cachedData;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Full.php b/src/Reports/Full.php
index 897a6fd8eb..0146182195 100644
--- a/src/Reports/Full.php
+++ b/src/Reports/Full.php
@@ -213,7 +213,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo PHP_EOL;
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -249,7 +249,7 @@ public function generate(
 
         echo $cachedData;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Gitblame.php b/src/Reports/Gitblame.php
index 87c0dee254..00d3d69a36 100644
--- a/src/Reports/Gitblame.php
+++ b/src/Reports/Gitblame.php
@@ -55,7 +55,7 @@ protected function getAuthor(string $line)
         $author = preg_replace('|\(|', '', implode(' ', $parts));
         return $author;
 
-    }//end getAuthor()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ protected function getBlameContent(string $filename)
 
         return $blames;
 
-    }//end getBlameContent()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Hgblame.php b/src/Reports/Hgblame.php
index 1ac1fc36a3..403aa44f70 100644
--- a/src/Reports/Hgblame.php
+++ b/src/Reports/Hgblame.php
@@ -56,7 +56,7 @@ protected function getAuthor(string $line)
 
         return trim(preg_replace('|<.+>|', '', implode(' ', $parts)));
 
-    }//end getAuthor()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ protected function getBlameContent(string $filename)
 
         return $blames;
 
-    }//end getBlameContent()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Info.php b/src/Reports/Info.php
index 5f29b739d0..80e6463802 100644
--- a/src/Reports/Info.php
+++ b/src/Reports/Info.php
@@ -41,7 +41,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -162,7 +162,7 @@ public function generate(
 
         echo str_repeat('-', 70) . PHP_EOL;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Json.php b/src/Reports/Json.php
index 4d48f457ff..64a2eb649b 100644
--- a/src/Reports/Json.php
+++ b/src/Reports/Json.php
@@ -67,7 +67,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -101,7 +101,7 @@ public function generate(
         echo rtrim($cachedData, ',');
         echo '}}' . PHP_EOL;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Junit.php b/src/Reports/Junit.php
index 0f40e28e4c..e2e0550779 100644
--- a/src/Reports/Junit.php
+++ b/src/Reports/Junit.php
@@ -81,7 +81,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $out->flush();
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function generate(
         echo $cachedData;
         echo '</testsuites>' . PHP_EOL;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php
index 5025a296c4..e08064f035 100644
--- a/src/Reports/Notifysend.php
+++ b/src/Reports/Notifysend.php
@@ -78,7 +78,7 @@ public function __construct()
             exec($this->path . ' --version')
         );
 
-    }//end __construct()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         // of checked files even if it has no errors.
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -145,7 +145,7 @@ public function generate(
             $this->notifyErrors($msg);
         }
 
-    }//end generate()
+    }
 
 
     /**
@@ -183,7 +183,7 @@ protected function generateMessage(array $checkedFiles, int $totalErrors, int $t
 
         return $msg;
 
-    }//end generateMessage()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ protected function notifyAllFine()
         $cmd .= ' "All fine"';
         exec($cmd);
 
-    }//end notifyAllFine()
+    }
 
 
     /**
@@ -217,7 +217,7 @@ protected function notifyErrors(string $msg)
         $cmd .= ' ' . escapeshellarg(trim($msg));
         exec($cmd);
 
-    }//end notifyErrors()
+    }
 
 
     /**
@@ -237,7 +237,7 @@ protected function getBasicCommand()
 
         return $cmd;
 
-    }//end getBasicCommand()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Performance.php b/src/Reports/Performance.php
index 00aae4cf4e..95381dcfad 100644
--- a/src/Reports/Performance.php
+++ b/src/Reports/Performance.php
@@ -41,7 +41,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function generate(
         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..612b1ca7e3 100644
--- a/src/Reports/Report.php
+++ b/src/Reports/Report.php
@@ -84,4 +84,4 @@ public function generate(
     );
 
 
-}//end interface
+}
diff --git a/src/Reports/Source.php b/src/Reports/Source.php
index e9ccd18bfb..00684a9334 100644
--- a/src/Reports/Source.php
+++ b/src/Reports/Source.php
@@ -61,7 +61,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -265,7 +265,7 @@ public function generate(
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
 
-    }//end generate()
+    }
 
 
     /**
@@ -326,7 +326,7 @@ public function makeFriendlyName(string $name)
 
         return $friendlyName;
 
-    }//end makeFriendlyName()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/Summary.php b/src/Reports/Summary.php
index 90bb5f988c..3aba96151f 100644
--- a/src/Reports/Summary.php
+++ b/src/Reports/Summary.php
@@ -43,7 +43,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $report['filename'] . '>>' . $report['errors'] . '>>' . $report['warnings'] . PHP_EOL;
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -173,7 +173,7 @@ 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..aefd98a458 100644
--- a/src/Reports/Svnblame.php
+++ b/src/Reports/Svnblame.php
@@ -41,7 +41,7 @@ protected function getAuthor(string $line)
 
         return $blameParts[2];
 
-    }//end getAuthor()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ protected function getBlameContent(string $filename)
 
         return $blames;
 
-    }//end getBlameContent()
+    }
 
 
-}//end class
+}
diff --git a/src/Reports/VersionControl.php b/src/Reports/VersionControl.php
index ea72719fd8..56b4703155 100644
--- a/src/Reports/VersionControl.php
+++ b/src/Reports/VersionControl.php
@@ -128,7 +128,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -346,7 +346,7 @@ public function generate(
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
 
-    }//end generate()
+    }
 
 
     /**
@@ -369,4 +369,4 @@ abstract protected function getAuthor(string $line);
     abstract protected function getBlameContent(string $filename);
 
 
-}//end class
+}
diff --git a/src/Reports/Xml.php b/src/Reports/Xml.php
index a606a8a283..d243a54d7d 100644
--- a/src/Reports/Xml.php
+++ b/src/Reports/Xml.php
@@ -87,7 +87,7 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         return true;
 
-    }//end generateFileReport()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ public function generate(
         echo $cachedData;
         echo '</phpcs>' . PHP_EOL;
 
-    }//end generate()
+    }
 
 
-}//end class
+}
diff --git a/src/Ruleset.php b/src/Ruleset.php
index 4585e6d3e8..4694c96aea 100644
--- a/src/Ruleset.php
+++ b/src/Ruleset.php
@@ -266,7 +266,7 @@ public function __construct(Config $config)
 
         $this->displayCachedMessages();
 
-    }//end __construct()
+    }
 
 
     /**
@@ -341,7 +341,7 @@ public function explain()
             echo PHP_EOL . '* Sniffs marked with an asterisk are deprecated.' . PHP_EOL;
         }
 
-    }//end explain()
+    }
 
 
     /**
@@ -353,7 +353,7 @@ public function hasSniffDeprecations()
     {
         return (count($this->deprecatedSniffs) > 0);
 
-    }//end hasSniffDeprecations()
+    }
 
 
     /**
@@ -483,7 +483,7 @@ public function showSniffDeprecations()
         StatusWriter::writeNewline(2);
         StatusWriter::write($closer, 0, 2);
 
-    }//end showSniffDeprecations()
+    }
 
 
     /**
@@ -512,7 +512,7 @@ private function displayCachedMessages()
 
         $this->msgCache->display();
 
-    }//end displayCachedMessages()
+    }
 
 
     /**
@@ -884,7 +884,7 @@ public function processRuleset(string $rulesetPath, int $depth = 0)
 
         return $files;
 
-    }//end processRuleset()
+    }
 
 
     /**
@@ -943,7 +943,7 @@ private function expandSniffDirectory(string $directory, int $depth = 0)
 
         return $sniffs;
 
-    }//end expandSniffDirectory()
+    }
 
 
     /**
@@ -1126,7 +1126,7 @@ private function expandRulesetReference(string $ref, string $rulesetDir, int $de
             }
         }//end if
 
-    }//end expandRulesetReference()
+    }
 
 
     /**
@@ -1381,7 +1381,7 @@ private function processRule(SimpleXMLElement $rule, array $newSniffs, int $dept
             }//end foreach
         }//end foreach
 
-    }//end processRule()
+    }
 
 
     /**
@@ -1416,7 +1416,7 @@ private function shouldProcessElement(SimpleXMLElement $element)
 
         return false;
 
-    }//end shouldProcessElement()
+    }
 
 
     /**
@@ -1510,7 +1510,7 @@ public function registerSniffs(array $files, array $restrictions, array $exclusi
 
         $this->sniffs = $listeners;
 
-    }//end registerSniffs()
+    }
 
 
     /**
@@ -1599,7 +1599,7 @@ public function populateTokenListeners()
             }
         }//end foreach
 
-    }//end populateTokenListeners()
+    }
 
 
     /**
@@ -1680,7 +1680,7 @@ public function setSniffProperty(string $sniffClass, string $name, array $settin
             $sniffObject->$propertyName = $value;
         }
 
-    }//end setSniffProperty()
+    }
 
 
     /**
@@ -1724,7 +1724,7 @@ private function getRealPropertyValue($value)
 
         return $value;
 
-    }//end getRealPropertyValue()
+    }
 
 
     /**
@@ -1750,7 +1750,7 @@ public function getIgnorePatterns(?string $listener = null)
 
         return [];
 
-    }//end getIgnorePatterns()
+    }
 
 
     /**
@@ -1776,7 +1776,7 @@ public function getIncludePatterns(?string $listener = null)
 
         return [];
 
-    }//end getIncludePatterns()
+    }
 
 
-}//end class
+}
diff --git a/src/Runner.php b/src/Runner.php
index f6d6574837..b268ec4237 100644
--- a/src/Runner.php
+++ b/src/Runner.php
@@ -142,7 +142,7 @@ public function runPHPCS()
 
         return ExitCode::calculate($this->reporter);
 
-    }//end runPHPCS()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ public function runPHPCBF()
 
         return ExitCode::calculate($this->reporter);
 
-    }//end runPHPCBF()
+    }
 
 
     /**
@@ -287,7 +287,7 @@ public function init()
             throw new DeepExitException($error, ExitCode::PROCESS_ERROR);
         }
 
-    }//end init()
+    }
 
 
     /**
@@ -518,7 +518,7 @@ private function run()
             Cache::save();
         }
 
-    }//end run()
+    }
 
 
     /**
@@ -545,7 +545,7 @@ public function handleErrors(int $code, string $message, string $file, int $line
 
         throw new RuntimeException("$message in $file on line $line");
 
-    }//end handleErrors()
+    }
 
 
     /**
@@ -673,7 +673,7 @@ public function processFile(File $file)
         // Clean up the file to save (a lot of) memory.
         $file->cleanUp();
 
-    }//end processFile()
+    }
 
 
     /**
@@ -758,7 +758,7 @@ private function processChildProcs(array $childProcs)
 
         return $success;
 
-    }//end processChildProcs()
+    }
 
 
     /**
@@ -864,7 +864,7 @@ public function printProgress(File $file, int $numFiles, int $numProcessed)
 
         StatusWriter::write(str_repeat(' ', $padding) . " $numProcessed / $numFiles ($percent%)");
 
-    }//end printProgress()
+    }
 
 
     /**
@@ -902,7 +902,7 @@ static function () use (
             }
         );
 
-    }//end registerOutOfMemoryShutdownMessage()
+    }
 
 
-}//end class
+}
diff --git a/src/Sniffs/AbstractArraySniff.php b/src/Sniffs/AbstractArraySniff.php
index 9d051f38a0..3cba14f76e 100644
--- a/src/Sniffs/AbstractArraySniff.php
+++ b/src/Sniffs/AbstractArraySniff.php
@@ -28,7 +28,7 @@ final public function register()
             T_OPEN_SHORT_ARRAY,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd, $indices);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ private function getNext(File $phpcsFile, int $ptr, int $arrayEnd)
 
         return $ptr;
 
-    }//end getNext()
+    }
 
 
     /**
@@ -169,4 +169,4 @@ abstract protected function processSingleLineArray(File $phpcsFile, int $stackPt
     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..e0b3a9dae4 100644
--- a/src/Sniffs/AbstractPatternSniff.php
+++ b/src/Sniffs/AbstractPatternSniff.php
@@ -63,7 +63,7 @@ public function __construct()
     {
         $this->supplementaryTokens = $this->registerSupplementary();
 
-    }//end __construct()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ final public function register()
 
         return array_unique(array_merge($listenTypes, $this->supplementaryTokens));
 
-    }//end register()
+    }
 
 
     /**
@@ -136,7 +136,7 @@ private function getPatternTokenTypes(array $pattern)
 
         return $tokenTypes;
 
-    }//end getPatternTokenTypes()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ private function getListenerTokenPos(array $pattern)
 
         return $tokenTypes[$token];
 
-    }//end getListenerTokenPos()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ final public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'Found');
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -686,7 +686,7 @@ protected function processPattern(array $patternInfo, File $phpcsFile, int $stac
 
         return $errors;
 
-    }//end processPattern()
+    }
 
 
     /**
@@ -710,7 +710,7 @@ protected function prepareError(string $found, string $patternCode)
 
         return $error;
 
-    }//end prepareError()
+    }
 
 
     /**
@@ -735,7 +735,7 @@ protected function registerSupplementary()
     {
         return [];
 
-    }//end registerSupplementary()
+    }
 
 
     /**
@@ -752,7 +752,7 @@ protected function registerSupplementary()
     protected function processSupplementary(File $phpcsFile, int $stackPtr)
     {
 
-    }//end processSupplementary()
+    }
 
 
     /**
@@ -842,7 +842,7 @@ private function parse(string $pattern)
 
         return $patterns;
 
-    }//end parse()
+    }
 
 
     /**
@@ -896,7 +896,7 @@ private function createSkipPattern(string $pattern, int $from)
 
         return $skip;
 
-    }//end createSkipPattern()
+    }
 
 
     /**
@@ -933,7 +933,7 @@ 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..cac6bd9711 100644
--- a/src/Sniffs/AbstractScopeSniff.php
+++ b/src/Sniffs/AbstractScopeSniff.php
@@ -94,7 +94,7 @@ public function __construct(
         $this->scopeTokens   = array_flip($scopeTokens);
         $this->tokens        = $tokens;
 
-    }//end __construct()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ final public function register()
     {
         return $this->tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -148,7 +148,7 @@ final public function process(File $phpcsFile, int $stackPtr)
             return min($skipTokens);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -186,4 +186,4 @@ abstract protected function processTokenWithinScope(File $phpcsFile, int $stackP
     abstract protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr);
 
 
-}//end class
+}
diff --git a/src/Sniffs/AbstractVariableSniff.php b/src/Sniffs/AbstractVariableSniff.php
index 3e99f2cfa7..5c903c23b9 100644
--- a/src/Sniffs/AbstractVariableSniff.php
+++ b/src/Sniffs/AbstractVariableSniff.php
@@ -68,7 +68,7 @@ public function __construct()
 
         parent::__construct($scopes, $listen, true);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -147,7 +147,7 @@ final protected function processTokenWithinScope(File $phpcsFile, int $stackPtr,
             return $this->processMemberVar($phpcsFile, $stackPtr);
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -178,7 +178,7 @@ final protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr
             }
         }
 
-    }//end processTokenOutsideScope()
+    }
 
 
     /**
@@ -230,4 +230,4 @@ abstract protected function processVariable(File $phpcsFile, int $stackPtr);
     abstract protected function processVariableInString(File $phpcsFile, int $stackPtr);
 
 
-}//end class
+}
diff --git a/src/Sniffs/DeprecatedSniff.php b/src/Sniffs/DeprecatedSniff.php
index 4f4d9fc025..d8174ee3ab 100644
--- a/src/Sniffs/DeprecatedSniff.php
+++ b/src/Sniffs/DeprecatedSniff.php
@@ -60,4 +60,4 @@ public function getRemovalVersion();
     public function getDeprecationMessage();
 
 
-}//end interface
+}
diff --git a/src/Sniffs/Sniff.php b/src/Sniffs/Sniff.php
index 0708b5bb0c..3f055bb9e6 100644
--- a/src/Sniffs/Sniff.php
+++ b/src/Sniffs/Sniff.php
@@ -77,4 +77,4 @@ public function register();
     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..929d5c54bc 100644
--- a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
@@ -40,7 +40,7 @@ class ArrayIndentSniff extends AbstractArraySniff
     public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices)
     {
 
-    }//end processSingleLineArray()
+    }
 
 
     /**
@@ -188,7 +188,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
             $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..7e97ca7a1e 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_ARRAY];
 
-    }//end register()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..bc466ebcdc 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_OPEN_SHORT_ARRAY];
 
-    }//end register()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..ab27b8ebd2 100644
--- a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
@@ -33,7 +33,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -112,7 +112,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         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..77a4ecce9f 100644
--- a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ 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..1101e9b5d1 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
@@ -63,7 +63,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -165,7 +165,7 @@ 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..b4e9fa05b7 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
@@ -32,7 +32,7 @@ public function register()
             T_CLOSE_TAG,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processCloseTag($phpcsFile, $stackPtr);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ private function processSemicolon(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }//end if
 
-    }//end processSemicolon()
+    }
 
 
     /**
@@ -173,7 +173,7 @@ 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..7d33ece012 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
@@ -53,7 +53,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $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..832cd1bbeb 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
@@ -39,7 +39,7 @@ public function register()
     {
         return [T_FOR];
 
-    }//end register()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..1c99e2ad53 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
@@ -43,7 +43,7 @@ public function register()
     {
         return [T_FOR];
 
-    }//end register()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..47d11981e8 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
@@ -45,7 +45,7 @@ public function register()
     {
         return [T_FOR];
 
-    }//end register()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ 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..fd74a7cde2 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
@@ -59,7 +59,7 @@ public function register()
 
         return Tokens::BOOLEAN_OPERATORS;
 
-    }//end register()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $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..6c0aa1bb86 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
@@ -46,7 +46,7 @@ public function register()
             T_ELSEIF,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..4bd044b6fa 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
@@ -38,7 +38,7 @@ public function register()
     {
         return [T_CLASS];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
index 6c0fc7731c..94b202544d 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
@@ -70,7 +70,7 @@ public function register()
             T_FN,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -299,7 +299,7 @@ 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..234ed64687 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
@@ -49,7 +49,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -178,7 +178,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..525bfcae53 100644
--- a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_DOC_COMMENT_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -341,7 +341,7 @@ 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..221802f7e8 100644
--- a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
@@ -27,7 +27,7 @@ public function register()
     {
         return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS);
 
-    }//end register()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..c087454e49 100644
--- a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS);
 
-    }//end register()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..4b96b90b2f 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -30,7 +30,7 @@ public function register()
 
         return $tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -123,7 +123,7 @@ public function process(File $phpcsFile, int $stackPtr)
             'Found'
         );
 
-    }//end process()
+    }
 
 
     /**
@@ -180,7 +180,7 @@ 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..606554577d 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -41,7 +41,7 @@ public function register()
             T_FOR,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -318,7 +318,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $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..7896467d18 100644
--- a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
@@ -48,7 +48,7 @@ public function register()
     {
         return [T_INLINE_HTML];
 
-    }//end register()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         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..91ea90601a 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..53dd7ea7b9 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ 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..e121d64cb4 100644
--- a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ 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..440c59c114 100644
--- a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
@@ -47,7 +47,7 @@ public function register()
     {
         return [T_INLINE_HTML];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         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..31f4c65c08 100644
--- a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
@@ -35,7 +35,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -126,7 +126,7 @@ 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..7a3b44da6b 100644
--- a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
@@ -56,7 +56,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -195,7 +195,7 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
             $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..9e64fbef9a 100644
--- a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ 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..745919906e 100644
--- a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_CLASS];
 
-    }//end register()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..c59bd042f1 100644
--- a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_INTERFACE];
 
-    }//end register()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..a832e8c804 100644
--- a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..f74d7f1eb1 100644
--- a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_TRAIT];
 
-    }//end register()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..3fc6912627 100644
--- a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_SEMICOLON];
 
-    }//end register()
+    }
 
 
     /**
@@ -99,7 +99,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..3b9caa1d89 100644
--- a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
@@ -49,7 +49,7 @@ public function register()
         unset($tokens[T_DOUBLE_ARROW]);
         return $tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $lastAssign = $this->checkAlignment($phpcsFile, $stackPtr);
         return ($lastAssign + 1);
 
-    }//end process()
+    }
 
 
     /**
@@ -398,7 +398,7 @@ public function checkAlignment(File $phpcsFile, int $stackPtr, ?int $end = null)
             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..0e237130df 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         return Tokens::CAST_TOKENS;
 
-    }//end register()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
index 901680f56f..925b4adf25 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         return [T_BOOLEAN_NOT];
 
-    }//end register()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
index 8c608cb537..eb3d608e3c 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::CAST_TOKENS;
 
-    }//end register()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
index 8a425621ac..c733950770 100644
--- a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
@@ -36,7 +36,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $this->checkSpacing($phpcsFile, $stackPtr, $openBracket);
 
-    }//end process()
+    }
 
 
     /**
@@ -191,7 +191,7 @@ public function checkSpacing(File $phpcsFile, int $stackPtr, int $openBracket)
             }//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..e4e5fe9d69 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
@@ -43,7 +43,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -218,7 +218,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $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..78f53e6b58 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
@@ -43,7 +43,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -171,7 +171,7 @@ 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..fbc2f38700 100644
--- a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
@@ -65,7 +65,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -115,7 +115,7 @@ 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..5216e7c599 100644
--- a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ 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..8b12281c0f 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
@@ -24,7 +24,7 @@ public function register()
     {
         return [T_CLASS];
 
-    }//end register()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..b7fcd14120 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
@@ -113,7 +113,7 @@ public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -243,7 +243,7 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $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..83fe3f18ba 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
@@ -42,7 +42,7 @@ public function __construct()
     {
         parent::__construct([T_CLASS, T_ANON_CLASS], [T_FUNCTION], true);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $startIndex = $nextNonEmpty;
         }//end while
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -147,7 +147,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
 
-    }//end processTokenOutsideScope()
+    }
 
 
     /**
@@ -182,7 +182,7 @@ protected function loadFunctionNamesInScope(File $phpcsFile, int $currScope)
             }
         }
 
-    }//end loadFunctionNamesInScope()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
index 21f771cce6..05a32a0f60 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
@@ -24,7 +24,7 @@ public function register()
     {
         return [T_INTERFACE];
 
-    }//end register()
+    }
 
 
     /**
@@ -49,7 +49,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..7db0d89108 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
@@ -24,7 +24,7 @@ public function register()
     {
         return [T_TRAIT];
 
-    }//end register()
+    }
 
 
     /**
@@ -49,7 +49,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..0adb659d52 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_CONST,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -146,7 +146,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..1886997e50 100644
--- a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_BACKTICK];
 
-    }//end register()
+    }
 
 
     /**
@@ -42,7 +42,7 @@ 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..3dc90d348d 100644
--- a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
@@ -47,7 +47,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // 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..57621b4657 100644
--- a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -48,7 +48,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..1f00c930ef 100644
--- a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
@@ -44,7 +44,7 @@ public function __construct()
             }
         }
 
-    }//end __construct()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
             $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..c5f98dcb13 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
@@ -27,7 +27,7 @@ public function register()
     {
         return [T_INLINE_HTML];
 
-    }//end register()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ 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..cdac1136fb 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_VARIABLE];
 
-    }//end register()
+    }
 
 
     /**
@@ -49,7 +49,7 @@ 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..30ba117aff 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
@@ -36,7 +36,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
 
-    }//end process()
+    }
 
 
     /**
@@ -164,7 +164,7 @@ 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..ab3d612932 100644
--- a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_GOTO_LABEL,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -44,7 +44,7 @@ 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..2e9f0d21cb 100644
--- a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
@@ -110,7 +110,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -196,7 +196,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $this->addError($phpcsFile, $stackPtr, $function, $pattern);
 
-    }//end process()
+    }
 
 
     /**
@@ -238,7 +238,7 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
             $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..2518b9deb2 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
@@ -74,7 +74,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -189,7 +189,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Handle everything else.
         $this->processConstant($phpcsFile, $stackPtr);
 
-    }//end process()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
             $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..317d5fbc81 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
@@ -40,7 +40,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..2c62adea00 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
@@ -57,7 +57,7 @@ public function register()
         $tokens[] = T_FN;
         return $tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -250,7 +250,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end foreach
 
-    }//end process()
+    }
 
 
     /**
@@ -314,7 +314,7 @@ protected function processUnionType(File $phpcsFile, int $typeDeclStart, int $ty
             $this->processType($phpcsFile, $typeStart, $type, $error, $errorCode);
         }
 
-    }//end processUnionType()
+    }
 
 
     /**
@@ -353,7 +353,7 @@ protected function processType(File $phpcsFile, int $stackPtr, string $type, str
             $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..407d382b68 100644
--- a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -39,7 +39,7 @@ public function register()
     {
         return [T_ASPERAND];
 
-    }//end register()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..064a9310ae 100644
--- a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // 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..ee2bf08bbc 100644
--- a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_NAME_FULLY_QUALIFIED,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..9b11733d4a 100644
--- a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
@@ -38,7 +38,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ private function getPhpLintCommand(File $phpcsFile)
             $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..512069cf4d 100644
--- a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
@@ -51,7 +51,7 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
             $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..41d47df1fc 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
@@ -54,7 +54,7 @@ public function register()
     {
         return [T_START_HEREDOC];
 
-    }//end register()
+    }
 
 
     /**
@@ -139,7 +139,7 @@ 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..bc7800cbc1 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
@@ -36,7 +36,7 @@ public function register()
     {
         return [T_STRING_CONCAT];
 
-    }//end register()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ 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..f0395aad5b 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -125,7 +125,7 @@ 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..5c9d4120da 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
@@ -49,7 +49,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -112,7 +112,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -189,7 +189,7 @@ 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..878804508d 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
@@ -64,7 +64,7 @@ public function register()
             T_CLOSE_PARENTHESIS,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }//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..0ee5860626 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -49,7 +49,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -220,7 +220,7 @@ 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..f1ed2c10de 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
@@ -51,7 +51,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -190,7 +190,7 @@ 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..5a23721d8f 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_GOTO_LABEL];
 
-    }//end register()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ 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..2e813f73d8 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_START_NOWDOC,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..61577b026b 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_INC,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..3351a24e6a 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
@@ -42,7 +42,7 @@ public function register()
             T_GOTO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -158,7 +158,7 @@ public function process(File $phpcsFile, int $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..64c5011fab 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -99,7 +99,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -1308,7 +1308,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Don't process the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -1395,7 +1395,7 @@ protected function adjustIndent(File $phpcsFile, int $stackPtr, int $length, int
 
         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..33dc2a87cf 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         return [T_ELLIPSIS];
 
-    }//end register()
+    }
 
 
     /**
@@ -153,7 +153,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
index a9ed88b4a5..8f7a0b15a5 100644
--- a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
@@ -60,7 +60,7 @@ public function getErrorList()
             149 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ 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..f8c5137d73 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
@@ -54,7 +54,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ 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..3bf319fe5e 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             8 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..ae063f277f 100644
--- a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -92,7 +92,7 @@ public function getWarningList($testFile = '')
             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..119587d73a 100644
--- a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
@@ -47,7 +47,7 @@ public function getErrorList()
             100 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..584f5e2914 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public function getWarningList($testFile = '')
             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..fb6b94b747 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
@@ -38,7 +38,7 @@ protected function getTestFiles(string $testFileBase)
 
         return $testFiles;
 
-    }//end getTestFiles()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ public function getWarningList($testFile = '')
             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..0dbd602000 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
@@ -47,7 +47,7 @@ public function getErrorList()
             74 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..9b91f033fe 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ public function getWarningList($testFile = '')
             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..4767d5844d 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public function getWarningList($testFile = '')
             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..6b73b6f56e 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function getWarningList($testFile = '')
             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..1214f95f35 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
@@ -70,7 +70,7 @@ public function getErrorList()
             116 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ 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..6eefd64123 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function getWarningList($testFile = '')
             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..f2532d0ec5 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ public function getWarningList($testFile = '')
             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..771c21483b 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public function getWarningList($testFile = '')
             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..6b52763e58 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function getWarningList($testFile = '')
             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..0cb1da529b 100644
--- a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -121,7 +121,7 @@ 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..699ff33dd5 100644
--- a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
@@ -42,7 +42,7 @@ public function getErrorList()
             21 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -57,7 +57,7 @@ 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..28fca9591d 100644
--- a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public function getWarningList()
             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..823aa486cc 100644
--- a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
@@ -81,7 +81,7 @@ public function getErrorList()
             205 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ 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..4f68ebb4e7 100644
--- a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
@@ -88,7 +88,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -103,7 +103,7 @@ 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..5c2d0173de 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
@@ -42,7 +42,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function getWarningList($testFile = '')
             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..132a18c084 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..05522421d2 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..889aa2c25d 100644
--- a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -30,7 +30,7 @@ protected function shouldSkipTest()
         // Skip on Windows which doesn't have the concept of executable files.
         return PHP_OS_FAMILY === 'Windows';
 
-    }//end shouldSkipTest()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ 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..f000c524fc 100644
--- a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ 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..21b035a745 100644
--- a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -48,7 +48,7 @@ public function getErrorList()
     {
         return [1 => 1];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ 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..a1ad64257b 100644
--- a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function getWarningList($testFile = '')
             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..25c0c22b29 100644
--- a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
@@ -38,7 +38,7 @@ protected function getTestFiles(string $testFileBase)
 
         return $testFiles;
 
-    }//end getTestFiles()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -76,7 +76,7 @@ public function getWarningList()
     {
         return [];
 
-    }//end getWarningList()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public function testStdIn()
         $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..0015a77701 100644
--- a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             10 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..4e3f4d15be 100644
--- a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             10 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..12e071be00 100644
--- a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
@@ -38,7 +38,7 @@ public function getErrorList()
             22 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..cee57148a8 100644
--- a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             10 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..9b1f2998a4 100644
--- a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
@@ -38,7 +38,7 @@ public function getErrorList()
             16 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..31acb26c8e 100644
--- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public function getWarningList()
             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..27464bd6af 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
@@ -82,7 +82,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ 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..9c1487e98f 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
@@ -68,7 +68,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ 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..f32ddfb59e 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
@@ -62,7 +62,7 @@ public function getErrorList()
             56 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ 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..d2c2f49cff 100644
--- a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
@@ -78,7 +78,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -93,7 +93,7 @@ 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..ada1e5892c 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
@@ -70,7 +70,7 @@ public function getErrorList()
             270 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ 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..63ba34909f 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
@@ -35,7 +35,7 @@ public function setCliValues(string $testFile, Config $config)
             $config->tabWidth = 4;
         }
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ 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..3c4304c747 100644
--- a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function getWarningList($testFile = '')
             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..32f7592134 100644
--- a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public function getWarningList($testFile = '')
             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..88a3059146 100644
--- a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..5f24fadf1d 100644
--- a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
@@ -84,7 +84,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -99,7 +99,7 @@ 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..3646af10fa 100644
--- a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..cea2bba062 100644
--- a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
@@ -41,7 +41,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ 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..6c172c4fe4 100644
--- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
@@ -42,7 +42,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -57,7 +57,7 @@ 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..5c8f99ce32 100644
--- a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
@@ -55,7 +55,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ 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..63546dd423 100644
--- a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
@@ -34,7 +34,7 @@ public function getErrorList()
             2 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -49,7 +49,7 @@ 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..72329bda18 100644
--- a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
@@ -40,7 +40,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ 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..9df3314326 100644
--- a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..93a5598b51 100644
--- a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList()
 
         return $errors;
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..42b686f0d4 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ 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..131925f7ea 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
@@ -35,7 +35,7 @@ protected function getErrorList()
             13 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..775364950a 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
@@ -41,7 +41,7 @@ protected function getTestFiles(string $testFileBase)
 
         return $testFiles;
 
-    }//end getTestFiles()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function getWarningList($testFile = '')
             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..56bfdd43b9 100644
--- a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ public function getWarningList()
             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..092bb6c114 100644
--- a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
 
         return $errors;
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..e8eb7e6baf 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
@@ -79,7 +79,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ 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..60eced69fa 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
@@ -62,7 +62,7 @@ public function getErrorList()
             72 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ 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..672d055325 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
@@ -104,7 +104,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ 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..e820e80664 100644
--- a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [13 => 1];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function getWarningList()
             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..d3344328f0 100644
--- a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function getWarningList($testFile = '')
             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..1b4d3fe5ed 100644
--- a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             6 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..7862412b0a 100644
--- a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public function getWarningList()
     {
         return [];
 
-    }//end getWarningList()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function testStdIn($content, $errorCount, $expectedErrors)
             'Error list does not match expected errors'
         );
 
-    }//end testStdIn()
+    }
 
 
     /**
@@ -164,7 +164,7 @@ 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..666dd7890b 100644
--- a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
@@ -60,7 +60,7 @@ public function getErrorList()
             118 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ 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..08f1300b21 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public function getWarningList($testFile = '')
             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..8b53e15481 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
@@ -47,7 +47,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..c5449f134e 100644
--- a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
@@ -118,7 +118,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ 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..36d6591986 100644
--- a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
@@ -30,7 +30,7 @@ protected function shouldSkipTest()
         // This sniff cannot be tested as no SVN version control directory is available.
         return true;
 
-    }//end shouldSkipTest()
+    }
 
 
     /**
@@ -45,7 +45,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..7c56ddf773 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
@@ -74,7 +74,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public function getWarningList($testFile = '')
             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..4206bf94ec 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
@@ -37,7 +37,7 @@ public function setCliValues(string $testFile, Config $config)
 
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ 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..edc81547db 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -120,7 +120,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -135,7 +135,7 @@ 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..86d95e948f 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             34 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..e8ff59b4b0 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             23 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..796af6c73c 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
@@ -57,7 +57,7 @@ public function getErrorList()
             58 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ 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..b37c71fd6c 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
@@ -81,7 +81,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ 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..339d44ebc6 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -40,7 +40,7 @@ public function setCliValues(string $testFile, Config $config)
             $config->tabWidth = 0;
         }
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public function getErrorList($testFile = '')
             1634 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -190,7 +190,7 @@ 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..41e6ceb42d 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
@@ -51,7 +51,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..08374ec034 100644
--- a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ 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..2b5d1accc0 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Check each tag.
         $this->processTags($phpcsFile, $stackPtr, $tokens[$commentEnd]['comment_opener']);
 
-    }//end process()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ protected function processVersion(File $phpcsFile, array $tags)
             }
         }
 
-    }//end processVersion()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
index bf8b52bf90..06305a2df8 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
@@ -87,7 +87,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -314,7 +314,7 @@ protected function processTags(File $phpcsFile, int $stackPtr, int $commentStart
             }
         }//end foreach
 
-    }//end processTags()
+    }
 
 
     /**
@@ -356,7 +356,7 @@ protected function processCategory(File $phpcsFile, array $tags)
             }
         }//end foreach
 
-    }//end processCategory()
+    }
 
 
     /**
@@ -409,7 +409,7 @@ protected function processPackage(File $phpcsFile, array $tags)
             }//end if
         }//end foreach
 
-    }//end processPackage()
+    }
 
 
     /**
@@ -453,7 +453,7 @@ protected function processSubpackage(File $phpcsFile, array $tags)
             $phpcsFile->addError($error, $tag, 'InvalidSubpackage', $data);
         }//end foreach
 
-    }//end processSubpackage()
+    }
 
 
     /**
@@ -483,7 +483,7 @@ protected function processAuthor(File $phpcsFile, array $tags)
             }
         }
 
-    }//end processAuthor()
+    }
 
 
     /**
@@ -524,7 +524,7 @@ protected function processCopyright(File $phpcsFile, array $tags)
             }
         }//end foreach
 
-    }//end processCopyright()
+    }
 
 
     /**
@@ -553,7 +553,7 @@ protected function processLicense(File $phpcsFile, array $tags)
             }
         }
 
-    }//end processLicense()
+    }
 
 
     /**
@@ -585,7 +585,7 @@ protected function processVersion(File $phpcsFile, array $tags)
             }
         }
 
-    }//end processVersion()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
index b49d159f32..34d3051dd6 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
@@ -45,7 +45,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -176,7 +176,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $this->processThrows($phpcsFile, $stackPtr, $commentStart);
         $this->processParams($phpcsFile, $stackPtr, $commentStart);
 
-    }//end process()
+    }
 
 
     /**
@@ -225,7 +225,7 @@ protected function processReturn(File $phpcsFile, int $stackPtr, int $commentSta
             $phpcsFile->addError($error, $tokens[$commentStart]['comment_closer'], 'MissingReturn');
         }//end if
 
-    }//end processReturn()
+    }
 
 
     /**
@@ -260,7 +260,7 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta
             }
         }//end foreach
 
-    }//end processThrows()
+    }
 
 
     /**
@@ -544,7 +544,7 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta
             $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..05e5affcfa 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_COMMENT];
 
-    }//end register()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..424e4606e9 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -42,7 +42,7 @@ protected function getPatterns()
             '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..9692dce08e 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
@@ -36,7 +36,7 @@ public function register()
             T_ELSEIF,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -267,7 +267,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
index 3c8d8a1f4f..9f34ac6c03 100644
--- a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
+++ b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
@@ -33,7 +33,7 @@ public function register()
             T_INCLUDE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -130,7 +130,7 @@ 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..08713ca756 100644
--- a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
@@ -32,7 +32,7 @@ public function register()
     {
         return [T_EQUAL];
 
-    }//end register()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ 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..c5910d2417 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -61,7 +61,7 @@ public function register()
 
         return $tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processSingleLineCall($phpcsFile, $stackPtr, $openBracket, $tokens);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -180,7 +180,7 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket
 
         return false;
 
-    }//end isMultiLineCall()
+    }
 
 
     /**
@@ -310,7 +310,7 @@ public function processSingleLineCall(File $phpcsFile, int $stackPtr, int $openB
             }//end if
         }//end if
 
-    }//end processSingleLineCall()
+    }
 
 
     /**
@@ -620,7 +620,7 @@ public function processMultiLineCall(File $phpcsFile, int $stackPtr, int $openBr
             }//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..5669664de9 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -38,7 +38,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -194,7 +194,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -231,7 +231,7 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open
 
         return false;
 
-    }//end isMultiLineDeclaration()
+    }
 
 
     /**
@@ -258,7 +258,7 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr
         $sniff->checkClosures = true;
         $sniff->process($phpcsFile, $stackPtr);
 
-    }//end processSingleLineDeclaration()
+    }
 
 
     /**
@@ -356,7 +356,7 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra
             }
         }
 
-    }//end processMultiLineDeclaration()
+    }
 
 
     /**
@@ -530,7 +530,7 @@ public function processArgumentList(File $phpcsFile, int $stackPtr, int $indent,
             }
         }//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..befc589859 100644
--- a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_FN,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..ee65aeec6a 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -92,7 +92,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..24314cb9da 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -75,7 +75,7 @@ public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -184,7 +184,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             }
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -291,7 +291,7 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $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..08046a7ecd 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -26,7 +26,7 @@ public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             return;
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -115,7 +115,7 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariableInString()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
index 716b571a8b..1cb0fde648 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -49,7 +49,7 @@ public function register()
     {
         return self::TARGET_TOKENS;
 
-    }//end register()
+    }
 
 
     /**
@@ -195,7 +195,7 @@ public function process(File $phpcsFile, int $stackPtr)
             );
         }//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..32f1448919 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -33,7 +33,7 @@ public function register()
     {
         return Tokens::SCOPE_OPENERS;
 
-    }//end register()
+    }
 
 
     /**
@@ -176,7 +176,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//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..3a4ac3ddc5 100644
--- a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
@@ -37,7 +37,7 @@ public function setCliValues(string $testFile, Config $config)
 
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ 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..07676ce31e 100644
--- a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
@@ -67,7 +67,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -93,7 +93,7 @@ public function getWarningList($testFile = '')
             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..91db38015f 100644
--- a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
@@ -61,7 +61,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function getWarningList($testFile = '')
             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..3eb692f2f5 100644
--- a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
@@ -105,7 +105,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -120,7 +120,7 @@ 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..a47cf5c6d8 100644
--- a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
@@ -40,7 +40,7 @@ public function getErrorList()
             31 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ 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..7dc7c68e8f 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -56,7 +56,7 @@ public function getErrorList()
             165 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ 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..af9f7a4ec9 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
@@ -68,7 +68,7 @@ public function getErrorList()
             248 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ 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..5eb4c5a86d 100644
--- a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
+++ b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
@@ -51,7 +51,7 @@ public function getErrorList()
             99 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..8726d946ad 100644
--- a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             8 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..fdc9fcf19c 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
@@ -130,7 +130,7 @@ public function getErrorList()
             605 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -145,7 +145,7 @@ 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..18c502d893 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -119,7 +119,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ 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..6e64ca8824 100644
--- a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
@@ -53,7 +53,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ 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..36003cd18f 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
@@ -57,7 +57,7 @@ public function getErrorList()
             90 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ 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..98bd1fc5d1 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -141,7 +141,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ 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..bd0b527a3c 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..45ece65f3c 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
@@ -59,7 +59,7 @@ public function getErrorList()
             152 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ 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..6e01c392bd 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList()
             170 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..8943d8999d 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->setConfigData('scope_indent_debug', '0', true);
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function getErrorList()
             311 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ 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..382bd39adf 100644
--- a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
@@ -30,7 +30,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..6a5efca13a 100644
--- a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
+++ b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
@@ -50,7 +50,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -309,7 +309,7 @@ private function searchForConflict(File $phpcsFile, int $start, int $end, array
             '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..bc0a2a427b 100644
--- a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
+++ b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
@@ -70,7 +70,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ 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..89d5f6421d 100644
--- a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
@@ -41,7 +41,7 @@ public function getErrorList($testFile = '')
             3 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ 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..9d5824fa80 100644
--- a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
+++ b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
@@ -35,7 +35,7 @@ public function setCliValues(string $testFile, Config $config)
             $config->annotations = false;
         }
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ public function getErrorList($testFile = '')
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ public function getWarningList($testFile = '')
             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..fa8f2a761d 100644
--- a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
+++ b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
@@ -51,7 +51,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..1373233db1 100644
--- a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
@@ -42,7 +42,7 @@ public function register()
     {
         return [T_ANON_CLASS];
 
-    }//end register()
+    }
 
 
     /**
@@ -132,7 +132,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
 
-    }//end process()
+    }
 
 
     /**
@@ -219,7 +219,7 @@ public function processSingleLineArgumentList(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
 
-    }//end processSingleLineArgumentList()
+    }
 
 
     /**
@@ -240,7 +240,7 @@ 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..6a14054d48 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_NEW];
 
-    }//end register()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..d79c2ccd69 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
@@ -31,7 +31,7 @@ public function register()
             T_FUNCTION,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..f6b00938b1 100644
--- a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::OO_SCOPE_TOKENS;
 
-    }//end register()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ 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..43d007ba4c 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
@@ -50,7 +50,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $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..946ae085c0 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -39,7 +39,7 @@ public function __construct()
     {
         $this->psr2ControlStructureSpacing = new PSR2ControlStructureSpacing();
 
-    }//end __construct()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -214,7 +214,7 @@ 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..add352c7e9 100644
--- a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_DECLARE];
 
-    }//end register()
+    }
 
 
     /**
@@ -256,7 +256,7 @@ 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..dddfd979c5 100644
--- a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $phpcsFile->numTokens;
 
-    }//end process()
+    }
 
 
     /**
@@ -274,7 +274,7 @@ public function getHeaderLines(File $phpcsFile, int $stackPtr)
 
         return $headerLines;
 
-    }//end getHeaderLines()
+    }
 
 
     /**
@@ -425,7 +425,7 @@ public function processHeaderLines(File $phpcsFile, array $headerLines)
             }//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..75d0c78b58 100644
--- a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_USE];
 
-    }//end register()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..25e9dd30e4 100644
--- a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ 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..2071901495 100644
--- a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
@@ -41,7 +41,7 @@ public function register()
     {
         return [T_NULLABLE];
 
-    }//end register()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ 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..68e11ea284 100644
--- a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_FN,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
index 899499f6db..26f47b94ce 100644
--- a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
+++ b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_INT_CAST,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ 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..7315c53a8b 100644
--- a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
+++ b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
@@ -32,7 +32,7 @@ public function register()
     {
         return [T_OPEN_USE_GROUP];
 
-    }//end register()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..b0280724f6 100644
--- a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
@@ -40,7 +40,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ public function process(File $phpcsFile, int $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..9e0c7e184b 100644
--- a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
+++ b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
@@ -37,7 +37,7 @@ public function register()
     {
         return [T_CONST];
 
-    }//end register()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ 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..176ddf5ed1 100644
--- a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_USE];
 
-    }//end register()
+    }
 
 
     /**
@@ -300,7 +300,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $tokens[$ooToken]['scope_closer'];
 
-    }//end process()
+    }
 
 
     /**
@@ -668,7 +668,7 @@ protected function processUseGroup(File $phpcsFile, int $stackPtr)
             }
         }//end if
 
-    }//end processUseGroup()
+    }
 
 
     /**
@@ -694,7 +694,7 @@ protected function processUseStatement(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end processUseStatement()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
index e4cef952fb..479c2e97a9 100644
--- a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
@@ -59,7 +59,7 @@ public function getErrorList()
             96 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ 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..7a87a6964c 100644
--- a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
@@ -53,7 +53,7 @@ public function getErrorList()
             56 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ 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..601f8ba2a4 100644
--- a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             52 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..fa47223764 100644
--- a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             55 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..c55b54b986 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList()
             125 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..546ddde6cb 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -56,7 +56,7 @@ public function getErrorList()
             127 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ 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..dfd79dff45 100644
--- a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
@@ -63,7 +63,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ 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..a9394094e3 100644
--- a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
@@ -66,7 +66,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ 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..2086b97e38 100644
--- a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             10 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..42b66f5d5e 100644
--- a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..dbffa1ba18 100644
--- a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
@@ -52,7 +52,7 @@ protected function getErrorList()
             98 => 3,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..b566e0685a 100644
--- a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
@@ -45,7 +45,7 @@ protected function getErrorList()
             64 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..27089d9ebc 100644
--- a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
+++ b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
@@ -38,7 +38,7 @@ public function getErrorList()
             14 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..70477578e4 100644
--- a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
+++ b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             22 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..80085ce5bc 100644
--- a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
@@ -60,7 +60,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ 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..4442c447e4 100644
--- a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
+++ b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public function getWarningList($testFile = '')
             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..95a7971d59 100644
--- a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
@@ -55,7 +55,7 @@ public function getErrorList()
             219 => 3,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ 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..c8de0aca50 100644
--- a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
@@ -58,7 +58,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $this->processOpen($phpcsFile, $stackPtr);
         $this->processClose($phpcsFile, $stackPtr);
 
-    }//end process()
+    }
 
 
     /**
@@ -461,7 +461,7 @@ public function processOpen(File $phpcsFile, int $stackPtr)
             }//end if
         }//end foreach
 
-    }//end processOpen()
+    }
 
 
     /**
@@ -517,7 +517,7 @@ public function processClose(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end processClose()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
index 9168fe4fce..9e3ab9c390 100644
--- a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -26,7 +26,7 @@ public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -279,7 +279,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             }
         }//end if
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -296,7 +296,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -313,7 +313,7 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariableInString()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
index 45c5a75858..330f76a5ec 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -49,7 +49,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -135,7 +135,7 @@ 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..2c9ae796a4 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_ELSEIF,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index 03dd188ecb..294ce039e5 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -47,7 +47,7 @@ public function register()
     {
         return [T_SWITCH];
 
-    }//end register()
+    }
 
 
     /**
@@ -222,7 +222,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end while
 
-    }//end process()
+    }
 
 
     /**
@@ -251,7 +251,7 @@ private function findNextCase(File $phpcsFile, int $stackPtr, int $end)
 
         return $stackPtr;
 
-    }//end findNextCase()
+    }
 
 
     /**
@@ -404,7 +404,7 @@ private function findNestedTerminator(File $phpcsFile, int $stackPtr, int $end)
 
         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..e2edeed4d9 100644
--- a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ 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..2318e814dd 100644
--- a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -101,7 +101,7 @@ 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..c87b1353c9 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
@@ -73,7 +73,7 @@ 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..f61e268cc5 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ 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..7e0d26048c 100644
--- a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
@@ -24,7 +24,7 @@ public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -140,7 +140,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $phpcsFile->fixer->endChangeset();
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ 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..bc4ec52c13 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_NAMESPACE];
 
-    }//end register()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
index 7e608f8a92..30400bc01f 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_USE];
 
-    }//end register()
+    }
 
 
     /**
@@ -262,7 +262,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
 
-    }//end process()
+    }
 
 
     /**
@@ -296,7 +296,7 @@ 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..b4317d9495 100644
--- a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
@@ -82,7 +82,7 @@ public function getErrorList()
             344 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ 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..3669578353 100644
--- a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -90,7 +90,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ public function getWarningList($testFile = '')
             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..3107b93939 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList()
             79 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..41b51c1ff8 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ public function getWarningList()
             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..e8a442c357 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -70,7 +70,7 @@ public function getErrorList()
             622 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ 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..bed93ad217 100644
--- a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
@@ -48,7 +48,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ 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..24458bfada 100644
--- a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
@@ -48,7 +48,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ 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..9e7bbd96b1 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
@@ -83,7 +83,7 @@ public function getErrorList()
             282 => 3,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ 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..c74728a2ed 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             70 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..66c86b9732 100644
--- a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
@@ -56,7 +56,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public function getWarningList($testFile = '')
             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..612c1bcee2 100644
--- a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             19 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..b8485e591f 100644
--- a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
@@ -81,7 +81,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ 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..ce3b410adb 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_CLOSE_SQUARE_BRACKET,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ 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..861821bbbf 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_OPEN_SHORT_ARRAY,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -147,7 +147,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -321,7 +321,7 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arra
             }//end foreach
         }//end if
 
-    }//end processSingleLineArray()
+    }
 
 
     /**
@@ -956,7 +956,7 @@ 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..94105750a4 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
@@ -39,7 +39,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $nextClass, 'MultipleClasses');
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ public function processOpen(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
 
-    }//end processOpen()
+    }
 
 
     /**
@@ -218,7 +218,7 @@ 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..41d0557a56 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
@@ -29,7 +29,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ 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..f011c6ce97 100644
--- a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
@@ -35,7 +35,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
index 817b576048..0c57a859ab 100644
--- a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
@@ -29,7 +29,7 @@ public function __construct()
     {
         parent::__construct([T_CLASS], [T_DOUBLE_COLON]);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -152,7 +152,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             }
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -168,7 +168,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
 
-    }//end processTokenOutsideScope()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ 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..d4eee0d53e 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
@@ -32,7 +32,7 @@ public function register()
             T_ENUM,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..ac048d7021 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
@@ -36,7 +36,7 @@ public function register()
             T_DOC_COMMENT_OPEN_TAG,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -393,7 +393,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..a332bb102f 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
@@ -33,7 +33,7 @@ public function register()
     {
         return [T_CLASS];
 
-    }//end register()
+    }
 
 
     /**
@@ -103,7 +103,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..5563c7725d 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
@@ -31,7 +31,7 @@ public function register()
             T_TRAIT,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -126,7 +126,7 @@ 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..b5c9bc2f1b 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_DOC_COMMENT_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -141,7 +141,7 @@ 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..80932538af 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_CATCH];
 
-    }//end register()
+    }
 
 
     /**
@@ -49,7 +49,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..e8dafe1544 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
@@ -37,7 +37,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ 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..274d9c34c2 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
@@ -189,7 +189,7 @@ protected function processReturn(File $phpcsFile, int $stackPtr, int $commentSta
             $phpcsFile->addError($error, $tokens[$commentStart]['comment_closer'], 'MissingReturn');
         }//end if
 
-    }//end processReturn()
+    }
 
 
     /**
@@ -265,7 +265,7 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta
             }//end if
         }//end foreach
 
-    }//end processThrows()
+    }
 
 
     /**
@@ -640,7 +640,7 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta
             $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data);
         }
 
-    }//end processParams()
+    }
 
 
     /**
@@ -699,7 +699,7 @@ protected function checkSpacingAfterParamType(File $phpcsFile, array $param, int
             }//end if
         }//end if
 
-    }//end checkSpacingAfterParamType()
+    }
 
 
     /**
@@ -758,7 +758,7 @@ protected function checkSpacingAfterParamName(File $phpcsFile, array $param, int
             }//end if
         }//end if
 
-    }//end checkSpacingAfterParamName()
+    }
 
 
     /**
@@ -794,7 +794,7 @@ 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..ab1214e656 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -227,7 +227,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..c14329fd6a 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
@@ -40,7 +40,7 @@ public function register()
             T_DOC_COMMENT_OPEN_TAG,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -310,7 +310,7 @@ public function process(File $phpcsFile, int $stackPtr)
 
         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..dbcab4adb3 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
@@ -58,7 +58,7 @@ public function register()
     {
         return [T_CLOSE_CURLY_BRACKET];
 
-    }//end register()
+    }
 
 
     /**
@@ -202,7 +202,7 @@ 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..c913bc1837 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
@@ -43,7 +43,7 @@ public function register()
     {
         return [T_COMMENT];
 
-    }//end register()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..65f0c8654e 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
@@ -26,7 +26,7 @@ public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public function processMemberVar(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -192,7 +192,7 @@ public function processMemberVar(File $phpcsFile, int $stackPtr)
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -209,7 +209,7 @@ 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..615c9abb82 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -46,7 +46,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -321,7 +321,7 @@ 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..492dfd3981 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_ELSEIF];
 
-    }//end register()
+    }
 
 
     /**
@@ -45,7 +45,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..34f4c51005 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
@@ -39,7 +39,7 @@ public function register()
     {
         return [T_FOREACH];
 
-    }//end register()
+    }
 
 
     /**
@@ -227,7 +227,7 @@ 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..b8329a909b 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
@@ -47,7 +47,7 @@ public function register()
     {
         return [T_FOR];
 
-    }//end register()
+    }
 
 
     /**
@@ -299,7 +299,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }//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..6f45488ca4 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_INLINE_THEN];
 
-    }//end register()
+    }
 
 
     /**
@@ -149,7 +149,7 @@ 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..14e8e12633 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
@@ -37,7 +37,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index eeac81c14f..ccf94e81ac 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -33,7 +33,7 @@ public function register()
     {
         return [T_SWITCH];
 
-    }//end register()
+    }
 
 
     /**
@@ -288,7 +288,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..5c7403f624 100644
--- a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ 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..96e7490e9c 100644
--- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
+++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::OPERATORS;
 
-    }//end register()
+    }
 
 
     /**
@@ -241,7 +241,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->addMissingBracketsError($phpcsFile, $stackPtr);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -364,7 +364,7 @@ public function addMissingBracketsError(File $phpcsFile, int $stackPtr)
             $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..edfc066404 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
@@ -52,7 +52,7 @@ public function register()
             T_FN,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -562,7 +562,7 @@ 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..ff6d56dd84 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -28,7 +28,7 @@ protected function getPatterns()
             '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..1e5ce30ea1 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..d06a64a559 100644
--- a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
index c3e07a15c7..7a3d655303 100644
--- a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
@@ -31,7 +31,7 @@ public function register()
 
         return $tokens;
 
-    }//end register()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
index 281ae3c206..c8cb53db3f 100644
--- a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
@@ -78,7 +78,7 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open
 
         return false;
 
-    }//end isMultiLineDeclaration()
+    }
 
 
     /**
@@ -126,7 +126,7 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr
             }
         }//end if
 
-    }//end processSingleLineDeclaration()
+    }
 
 
     /**
@@ -159,7 +159,7 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra
 
         $this->processBracket($phpcsFile, $tokens[$use]['parenthesis_opener'], $tokens, 'use');
 
-    }//end processMultiLineDeclaration()
+    }
 
 
     /**
@@ -243,7 +243,7 @@ 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..ebf63c800b 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -48,7 +48,7 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $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..be64087050 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -101,7 +101,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
         }
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -151,7 +151,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'MemberNotCamelCaps', $errorData);
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -182,7 +182,7 @@ 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..cb54cfb71f 100644
--- a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_NEW];
 
-    }//end register()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ 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..3e3507c157 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
@@ -58,7 +58,7 @@ public function register()
             T_FOR,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -208,7 +208,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..b3d779aec5 100644
--- a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
@@ -32,7 +32,7 @@ public function register()
             T_DEC,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->processAssignment($phpcsFile, $stackPtr);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ protected function processIncDec(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'NoBrackets');
         }
 
-    }//end processIncDec()
+    }
 
 
     /**
@@ -225,7 +225,7 @@ protected function processAssignment(File $phpcsFile, int $stackPtr)
             $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..4dc4dd6f20 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_LOGICAL_OR,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function process(File $phpcsFile, int $stackPtr)
         ];
         $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..7777dae3a7 100644
--- a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
@@ -36,7 +36,7 @@ public function register()
     {
         return [T_COMMENT];
 
-    }//end register()
+    }
 
 
     /**
@@ -273,7 +273,7 @@ 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..95bf1ed753 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::BOOLEAN_OPERATORS;
 
-    }//end register()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..ac3f17c5dd 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_EQUAL];
 
-    }//end register()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
index 4acad46dda..e0462293ed 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_INLINE_THEN];
 
-    }//end register()
+    }
 
 
     /**
@@ -41,7 +41,7 @@ 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..8e4e3ba590 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_EQUAL];
 
-    }//end register()
+    }
 
 
     /**
@@ -189,7 +189,7 @@ 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..99d7766450 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
@@ -48,7 +48,7 @@ public function register()
             T_FOR,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }//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..3a36758527 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag);
         }
 
-    }//end process()
+    }
 
 
     /**
@@ -321,7 +321,7 @@ private function validateMultilineEmbeddedPhp(File $phpcsFile, int $stackPtr, $c
             }
         }//end if
 
-    }//end validateMultilineEmbeddedPhp()
+    }
 
 
     /**
@@ -428,7 +428,7 @@ private function validateInlineEmbeddedPhp(File $phpcsFile, int $stackPtr, int $
             }
         }
 
-    }//end validateInlineEmbeddedPhp()
+    }
 
 
     /**
@@ -467,7 +467,7 @@ private function reportEmptyTagSet(File $phpcsFile, int $stackPtr, int $closeTag
             $phpcsFile->fixer->endChangeset();
         }
 
-    }//end reportEmptyTagSet()
+    }
 
 
     /**
@@ -507,7 +507,7 @@ 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..ef544bee9b 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_EVAL];
 
-    }//end register()
+    }
 
 
     /**
@@ -42,7 +42,7 @@ 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..d777b2fa8f 100644
--- a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
@@ -25,7 +25,7 @@ public function register()
     {
         return [T_GLOBAL];
 
-    }//end register()
+    }
 
 
     /**
@@ -47,7 +47,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $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..5980b10b53 100644
--- a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_START_NOWDOC,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ 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..7b50f832a4 100644
--- a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ 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..1f53cafbfc 100644
--- a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
@@ -33,7 +33,7 @@ public function __construct()
         $allFunctions           = get_defined_functions();
         $this->builtInFunctions = array_flip($allFunctions['internal']);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -48,7 +48,7 @@ public function register()
             T_NAME_FULLY_QUALIFIED,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function process(File $phpcsFile, int $stackPtr)
             $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..90a4190b5f 100644
--- a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
@@ -49,7 +49,7 @@ public function register()
             T_GOTO,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//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..b709a3aaa0 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
@@ -26,7 +26,7 @@ public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'AsymReadMissing', $data);
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariableInString()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
index 3527cfeab4..9f5fc9fa59 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
@@ -24,7 +24,7 @@ public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
         }
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ 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..68929ffbec 100644
--- a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
@@ -24,7 +24,7 @@ public function __construct()
     {
         parent::__construct([T_CLASS, T_TRAIT, T_ENUM, T_ANON_CLASS], [T_FUNCTION]);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ public function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $cur
 
         $this->checkThisUsage($phpcsFile, $next, $end);
 
-    }//end processTokenWithinScope()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ private function checkThisUsage(File $phpcsFile, int $next, int $end)
             $phpcsFile->addError($error, $next, 'Found');
         } while ($next !== false);
 
-    }//end checkThisUsage()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ 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..c83bbcfa1c 100644
--- a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
@@ -40,7 +40,7 @@ public function register()
     {
         return [T_STRING_CONCAT];
 
-    }//end register()
+    }
 
 
     /**
@@ -158,7 +158,7 @@ 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..a94b15c035 100644
--- a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
@@ -54,7 +54,7 @@ public function register()
             T_DOUBLE_QUOTED_STRING,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ 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..94c730bc86 100644
--- a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_ECHO];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
index b8d7706ae2..487e11cb85 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::CAST_TOKENS;
 
-    }//end register()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index c7e7fdec12..f59c962c94 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -39,7 +39,7 @@ public function register()
             T_MATCH,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -343,7 +343,7 @@ 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..735b5171b2 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ 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..05a329bd88 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
@@ -28,7 +28,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
 
-    }//end process()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
index 4b2c34b61b..c9738da102 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
@@ -54,7 +54,7 @@ public function register()
     {
         return [T_FUNCTION];
 
-    }//end register()
+    }
 
 
     /**
@@ -370,7 +370,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }//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..0f6eeb8faf 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::BOOLEAN_OPERATORS;
 
-    }//end register()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ 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..c5aa0fc1c9 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
@@ -39,7 +39,7 @@ public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
 
-    }//end __construct()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             return $endOfStatement;
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -246,7 +246,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -263,7 +263,7 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             We don't care about normal variables.
         */
 
-    }//end processVariableInString()
+    }
 
 
-}//end class
+}
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index ce80cae8ce..01b399861e 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -36,7 +36,7 @@ public function register()
             T_NULLSAFE_OBJECT_OPERATOR,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, int $stackPtr)
         $phpcsFile->recordMetric($stackPtr, 'Spacing after object operator', $after);
         $this->checkSpacingAfterOperator($phpcsFile, $stackPtr, $after);
 
-    }//end process()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ protected function checkSpacingBeforeOperator(File $phpcsFile, int $stackPtr, $b
 
         return true;
 
-    }//end checkSpacingBeforeOperator()
+    }
 
 
     /**
@@ -161,7 +161,7 @@ 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..8dda6065ab 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -109,7 +109,7 @@ public function register()
 
         return $targets;
 
-    }//end register()
+    }
 
 
     /**
@@ -327,7 +327,7 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
 
-    }//end process()
+    }
 
 
     /**
@@ -393,7 +393,7 @@ protected function isOperator(File $phpcsFile, int $stackPtr)
 
         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..735c84d8b5 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return Tokens::SCOPE_OPENERS;
 
-    }//end register()
+    }
 
 
     /**
@@ -108,7 +108,7 @@ 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..4f74630fba 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -29,7 +29,7 @@ public function register()
         $register[T_READONLY] = T_READONLY;
         return $register;
 
-    }//end register()
+    }
 
 
     /**
@@ -166,7 +166,7 @@ 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..3ba56dd40e 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_SEMICOLON];
 
-    }//end register()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ 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..60406a6b3a 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
@@ -46,7 +46,7 @@ public function register()
             T_CLOSURE,
         ];
 
-    }//end register()
+    }
 
 
     /**
@@ -208,7 +208,7 @@ 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..59deb6d492 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
@@ -41,7 +41,7 @@ public function getErrorList()
             31 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ 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..930ea89741 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
@@ -241,7 +241,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -256,7 +256,7 @@ 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..fc7203e555 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
@@ -72,7 +72,7 @@ public function getErrorList()
             141 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ 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..89ea9d6255 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
@@ -58,7 +58,7 @@ protected function getTestFiles(string $testFileBase)
 
         return $testFiles;
 
-    }//end getTestFiles()
+    }
 
 
     /**
@@ -125,7 +125,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -140,7 +140,7 @@ 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..2f6acecb34 100644
--- a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
@@ -48,7 +48,7 @@ public function getErrorList()
 
         return $errors;
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ 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..1d2c018cdc 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
@@ -49,7 +49,7 @@ public function getErrorList()
             197 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ 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..4a2c51c011 100644
--- a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
@@ -62,7 +62,7 @@ public function getErrorList()
             200 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ 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..68a6b19263 100644
--- a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
@@ -33,7 +33,7 @@ public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function getErrorList()
 
         return $errors;
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ 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..767e60bfbc 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ public function getWarningList($testFile = '')
             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..2de54e880b 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
@@ -63,7 +63,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ 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..d774016754 100644
--- a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
@@ -69,7 +69,7 @@ public function getErrorList()
             144 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ 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..628e67856c 100644
--- a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             52 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..acb771c3db 100644
--- a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
@@ -60,7 +60,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ 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..ad90c3bc66 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList()
             530 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..6fff52fcf4 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
@@ -184,7 +184,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ 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..07849eacd5 100644
--- a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
@@ -51,7 +51,7 @@ public function getErrorList()
             189 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..8a3c310993 100644
--- a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
@@ -62,7 +62,7 @@ public function getErrorList()
             1032 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ 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..912064dc87 100644
--- a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
@@ -44,7 +44,7 @@ public function getErrorList()
             64 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ 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..ec4f14eb3a 100644
--- a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
@@ -68,7 +68,7 @@ public function getErrorList()
             457 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ public function getWarningList()
             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..793a7498aa 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -90,7 +90,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ 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..3173633074 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             13 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..e8ad4af205 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
@@ -40,7 +40,7 @@ public function getErrorList()
             28 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ 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..bf011f3bc2 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
@@ -71,7 +71,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ 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..27e7717d55 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
@@ -31,7 +31,7 @@ public function getCliValues($testFile)
     {
         return ['--encoding=utf-8'];
 
-    }//end getCliValues()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ public function getErrorList()
             47 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ 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..3337cdee3a 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList()
             24 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..d575b37f29 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -80,7 +80,7 @@ public function getErrorList()
             342 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ 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..e197c1497d 100644
--- a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..07d61317d4 100644
--- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
+++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
@@ -83,7 +83,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ 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..a9592cfe5f 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
@@ -107,7 +107,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ 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..a548ce1a6e 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..7d652c87a4 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             5 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..ea4183c74e 100644
--- a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ public function getWarningList($testFile = '')
             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..764b68f76f 100644
--- a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
@@ -42,7 +42,7 @@ public function getErrorList()
             28 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -57,7 +57,7 @@ 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..812a4a6a4b 100644
--- a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
@@ -76,7 +76,7 @@ public function getErrorList()
             323 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ 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..58fe2ebcaf 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -51,7 +51,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ 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..68afb3a57b 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -82,7 +82,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ 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..1aa8014d3c 100644
--- a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             39 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..3a95ab69a3 100644
--- a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
@@ -66,7 +66,7 @@ public function getErrorList()
             156 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ 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..7e4e9429fb 100644
--- a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList()
             56 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..345a2f4929 100644
--- a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             17 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..13485d6822 100644
--- a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public function getWarningList()
             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..4f082c99f0 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             15 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..ff07f247a2 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList()
             62 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..00151ac57c 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             18 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..a2a343867b 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
@@ -50,7 +50,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ 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..c6fb94060f 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
@@ -48,7 +48,7 @@ public function getErrorList()
             63 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ 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..adf3a13de4 100644
--- a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function getWarningList()
             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..d4fd938f74 100644
--- a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
@@ -220,7 +220,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -244,7 +244,7 @@ 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..ea9747ae61 100644
--- a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ public function getWarningList()
             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..571397dd3b 100644
--- a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
@@ -35,7 +35,7 @@ public function getErrorList()
             9 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -50,7 +50,7 @@ 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..8842d5cf14 100644
--- a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..98993940a2 100644
--- a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
@@ -37,7 +37,7 @@ public function getErrorList()
             83 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ 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..a59de4c4bf 100644
--- a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             36 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..f9c1d5f220 100644
--- a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
@@ -32,7 +32,7 @@ public function getErrorList()
     {
         return [];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -120,7 +120,7 @@ public function getWarningList($testFile = '')
             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..f6297af621 100644
--- a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
@@ -55,7 +55,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ 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..b03d6a1184 100644
--- a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..24f21d8617 100644
--- a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList()
             125 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..702493fff2 100644
--- a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
@@ -50,7 +50,7 @@ public function getErrorList()
             49 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ 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..ddbb164d62 100644
--- a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
@@ -46,7 +46,7 @@ public function getErrorList()
             32 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ 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..ebb39d39ae 100644
--- a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
@@ -39,7 +39,7 @@ public function getErrorList()
             13 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -54,7 +54,7 @@ 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..a12a77852a 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
@@ -38,7 +38,7 @@ public function getErrorList()
             9 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..abb182a3e2 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -63,7 +63,7 @@ public function getErrorList()
             262 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ 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..6cb62132ee 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList()
             88 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..9c2c6045f8 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
@@ -36,7 +36,7 @@ public function getErrorList()
             49 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ 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..111d13d24a 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
@@ -129,7 +129,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -144,7 +144,7 @@ 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..8b415abd8a 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
@@ -38,7 +38,7 @@ public function getErrorList()
             17 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ 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..fec7cb70d6 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
@@ -99,7 +99,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -114,7 +114,7 @@ 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..4f0c9c64ed 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -52,7 +52,7 @@ public function getErrorList()
             52 => 2,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ 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..1c708e87c7 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -116,7 +116,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ 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..282d54f81c 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -43,7 +43,7 @@ public function getErrorList()
             134 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..61c248bd8f 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
@@ -83,7 +83,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ 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..b5da9e1376 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
@@ -45,7 +45,7 @@ public function getErrorList()
             36 => 1,
         ];
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ 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..270294a0b8 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
@@ -73,7 +73,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ 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..73c2762a84 100644
--- a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
@@ -26,7 +26,7 @@ public function register()
     {
         return [T_OPEN_TAG];
 
-    }//end register()
+    }
 
 
     /**
@@ -73,7 +73,7 @@ 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..630af3d084 100644
--- a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -101,7 +101,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($warning, $stackPtr, 'ContainsNumbers', $data);
         }
 
-    }//end processVariable()
+    }
 
 
     /**
@@ -157,7 +157,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($warning, $stackPtr, 'MemberVarContainsNumbers', $data);
         }
 
-    }//end processMemberVar()
+    }
 
 
     /**
@@ -192,7 +192,7 @@ 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..c780e73227 100644
--- a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
@@ -49,7 +49,7 @@ public function getErrorList($testFile = '')
             return [];
         }
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ 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..853a7987c0 100644
--- a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -77,7 +77,7 @@ public function getErrorList($testFile = '')
             return [];
         }//end switch
 
-    }//end getErrorList()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
 
-    }//end getWarningList()
+    }
 
 
-}//end class
+}
diff --git a/src/Tokenizers/Comment.php b/src/Tokenizers/Comment.php
index 610ba3cb75..fe88a41ea5 100644
--- a/src/Tokenizers/Comment.php
+++ b/src/Tokenizers/Comment.php
@@ -175,7 +175,7 @@ public function tokenizeString(string $comment, string $eolChar, int $stackPtr)
 
         return $tokens;
 
-    }//end tokenizeString()
+    }
 
 
     /**
@@ -251,7 +251,7 @@ private function processLine(string $comment, string $eolChar, int $start, int $
 
         return $tokens;
 
-    }//end processLine()
+    }
 
 
     /**
@@ -284,7 +284,7 @@ private function collectWhitespace(string $comment, int $start, int $end)
             'type'    => 'T_DOC_COMMENT_WHITESPACE',
         ];
 
-    }//end collectWhitespace()
+    }
 
 
-}//end class
+}
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
index cf0ac9c996..f3eb04973f 100644
--- a/src/Tokenizers/PHP.php
+++ b/src/Tokenizers/PHP.php
@@ -2756,7 +2756,7 @@ function return types. We want to keep the parenthesis map clean,
 
         return $finalTokens;
 
-    }//end tokenize()
+    }
 
 
     /**
@@ -3755,7 +3755,7 @@ protected function processAdditional()
             StatusWriter::write('*** END ADDITIONAL PHP PROCESSING ***', 1);
         }
 
-    }//end processAdditional()
+    }
 
 
     /**
@@ -3833,7 +3833,7 @@ public static function standardiseToken($token)
         $newToken['content'] = $token[1];
         return $newToken;
 
-    }//end standardiseToken()
+    }
 
 
     /**
@@ -3941,7 +3941,7 @@ public static function resolveSimpleToken(string $token)
         self::$resolveTokenCache[$token] = $newToken;
         return $newToken;
 
-    }//end resolveSimpleToken()
+    }
 
 
     /**
@@ -3978,7 +3978,7 @@ private function findCloser(array &$tokens, int $start, $openerTokens, string $c
 
         return $closer;
 
-    }//end findCloser()
+    }
 
 
     /**
@@ -4041,7 +4041,7 @@ private function parsePhpAttribute(array &$tokens, int $stackPtr)
 
         return $subTokens;
 
-    }//end parsePhpAttribute()
+    }
 
 
     /**
@@ -4078,7 +4078,7 @@ 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..8fe02f3981 100644
--- a/src/Tokenizers/Tokenizer.php
+++ b/src/Tokenizers/Tokenizer.php
@@ -129,7 +129,7 @@ public function __construct(string $content, ?Config $config, string $eolChar =
         // Allow the tokenizer to do additional processing if required.
         $this->processAdditional();
 
-    }//end __construct()
+    }
 
 
     /**
@@ -153,7 +153,7 @@ protected function isMinifiedContent(string $content, string $eolChar = '\n')
 
         return false;
 
-    }//end isMinifiedContent()
+    }
 
 
     /**
@@ -165,7 +165,7 @@ public function getTokens()
     {
         return $this->tokens;
 
-    }//end getTokens()
+    }
 
 
     /**
@@ -483,7 +483,7 @@ private function createPositionMap()
             $this->ignoredLines = [];
         }
 
-    }//end createPositionMap()
+    }
 
 
     /**
@@ -573,7 +573,7 @@ public function replaceTabsInToken(array &$token, string $prefix = ' ', string $
         $token['content']      = $newContent;
         $token['length']       = $length;
 
-    }//end replaceTabsInToken()
+    }
 
 
     /**
@@ -750,7 +750,7 @@ private function createTokenMap()
             StatusWriter::write('*** END TOKEN MAP ***', 1);
         }
 
-    }//end createTokenMap()
+    }
 
 
     /**
@@ -787,7 +787,7 @@ private function createParenthesisNestingMap()
             }//end if
         }//end for
 
-    }//end createParenthesisNestingMap()
+    }
 
 
     /**
@@ -827,7 +827,7 @@ private function createScopeMap()
             StatusWriter::write('*** END SCOPE MAP ***', 1);
         }
 
-    }//end createScopeMap()
+    }
 
 
     /**
@@ -1357,7 +1357,7 @@ private function recurseScopeMap(int $stackPtr, int $depth = 1, int &$ignore = 0
 
         return $stackPtr;
 
-    }//end recurseScopeMap()
+    }
 
 
     /**
@@ -1585,7 +1585,7 @@ private function createLevelMap()
             StatusWriter::write('*** END LEVEL MAP ***', 1);
         }
 
-    }//end createLevelMap()
+    }
 
 
-}//end class
+}
diff --git a/src/Util/Cache.php b/src/Util/Cache.php
index 88ea0a79a2..333c4454e8 100644
--- a/src/Util/Cache.php
+++ b/src/Util/Cache.php
@@ -284,7 +284,7 @@ static function ($file, $key, $iterator) {
 
         self::$cache['config'] = $configData;
 
-    }//end load()
+    }
 
 
     /**
@@ -296,7 +296,7 @@ public static function save()
     {
         file_put_contents(self::$path, json_encode(self::$cache));
 
-    }//end save()
+    }
 
 
     /**
@@ -319,7 +319,7 @@ public static function get(?string $key = null)
 
         return false;
 
-    }//end get()
+    }
 
 
     /**
@@ -339,7 +339,7 @@ public static function set(?string $key, $value)
             self::$cache[$key] = $value;
         }
 
-    }//end set()
+    }
 
 
     /**
@@ -351,7 +351,7 @@ 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..20b15c6e50 100644
--- a/src/Util/Common.php
+++ b/src/Util/Common.php
@@ -57,7 +57,7 @@ public static function isPharFile(string $path)
 
         return false;
 
-    }//end isPharFile()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public static function isReadable(string $path)
 
         return false;
 
-    }//end isReadable()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ public static function realpath(string $path)
 
         return false;
 
-    }//end realpath()
+    }
 
 
     /**
@@ -168,7 +168,7 @@ public static function stripBasepath(string $path, ?string $basepath)
 
         return $path;
 
-    }//end stripBasepath()
+    }
 
 
     /**
@@ -189,7 +189,7 @@ public static function detectLineEndings(string $contents)
 
         return $eolChar;
 
-    }//end detectLineEndings()
+    }
 
 
     /**
@@ -248,7 +248,7 @@ public static function isStdinATTY()
 
         return $isTTY;
 
-    }//end isStdinATTY()
+    }
 
 
     /**
@@ -270,7 +270,7 @@ public static function escapeshellcmd(string $cmd)
 
         return $cmd;
 
-    }//end escapeshellcmd()
+    }
 
 
     /**
@@ -319,7 +319,7 @@ public static function prepareForOutput(string $content, array $exclude = [])
 
         return $content;
 
-    }//end prepareForOutput()
+    }
 
 
     /**
@@ -333,7 +333,7 @@ public static function stripColors(string $text)
     {
         return preg_replace('`\033\[[0-9;]+m`', '', $text);
 
-    }//end stripColors()
+    }
 
 
     /**
@@ -418,7 +418,7 @@ public static function isCamelCaps(
 
         return true;
 
-    }//end isCamelCaps()
+    }
 
 
     /**
@@ -456,7 +456,7 @@ public static function isUnderscoreName(string $name)
 
         return $validName;
 
-    }//end isUnderscoreName()
+    }
 
 
     /**
@@ -530,7 +530,7 @@ public static function suggestType(string $varType)
             }//end if
         }//end if
 
-    }//end suggestType()
+    }
 
 
     /**
@@ -579,7 +579,7 @@ public static function getSniffCode($sniffClass)
         $category = $parts[($partsCount - 2)];
         return $standard . '.' . $category . '.' . $sniff;
 
-    }//end getSniffCode()
+    }
 
 
     /**
@@ -610,7 +610,7 @@ 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..6c69c6eefe 100644
--- a/src/Util/ExitCode.php
+++ b/src/Util/ExitCode.php
@@ -139,7 +139,7 @@ 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..2fc4ea5e23 100644
--- a/src/Util/Help.php
+++ b/src/Util/Help.php
@@ -149,7 +149,7 @@ public function __construct(Config $config, array $longOptions, string $shortOpt
 
         $this->setMaxOptionNameLength();
 
-    }//end __construct()
+    }
 
 
     /**
@@ -162,7 +162,7 @@ public function display()
         $this->printUsage();
         $this->printCategories();
 
-    }//end display()
+    }
 
 
     /**
@@ -212,7 +212,7 @@ private function filterOptions()
 
         $this->activeOptions = $filteredOptions;
 
-    }//end filterOptions()
+    }
 
 
     /**
@@ -237,7 +237,7 @@ private function setMaxOptionNameLength()
             $this->maxOptionNameLength = max($lengths);
         }
 
-    }//end setMaxOptionNameLength()
+    }
 
 
     /**
@@ -252,7 +252,7 @@ private function getMaxWidth()
     {
         return max(self::MIN_WIDTH, $this->config->reportWidth);
 
-    }//end getMaxWidth()
+    }
 
 
     /**
@@ -264,7 +264,7 @@ private function getDescriptionColumnWidth()
     {
         return ($this->getMaxWidth() - $this->maxOptionNameLength - $this->indentWidth - $this->gutterWidth);
 
-    }//end getDescriptionColumnWidth()
+    }
 
 
     /**
@@ -276,7 +276,7 @@ private function getDescriptionFollowupLineIndentLength()
     {
         return ($this->maxOptionNameLength + $this->indentWidth + $this->gutterWidth);
 
-    }//end getDescriptionFollowupLineIndentLength()
+    }
 
 
     /**
@@ -295,7 +295,7 @@ private function printUsage()
 
         echo self::INDENT . $command . ' [options] <file|directory>' . PHP_EOL;
 
-    }//end printUsage()
+    }
 
 
     /**
@@ -310,7 +310,7 @@ private function printCategories()
             $this->printCategoryOptions($options);
         }
 
-    }//end printCategories()
+    }
 
 
     /**
@@ -329,7 +329,7 @@ private function printCategoryHeader(string $header)
 
         echo PHP_EOL . $header . PHP_EOL;
 
-    }//end printCategoryHeader()
+    }
 
 
     /**
@@ -373,7 +373,7 @@ private function printCategoryOptions(array $options)
 
         echo $output;
 
-    }//end printCategoryOptions()
+    }
 
 
     /**
@@ -390,7 +390,7 @@ private function colorizeVariableInput(string $text)
     {
         return preg_replace('`(<(?:(?>[^<>]+)|(?R))*>)`', "\033[36m" . '$1' . "\033[32m", $text);
 
-    }//end colorizeVariableInput()
+    }
 
 
     /**
@@ -637,7 +637,7 @@ private function getAllOptions()
 
         return $options;
 
-    }//end getAllOptions()
+    }
 
 
-}//end class
+}
diff --git a/src/Util/IgnoreList.php b/src/Util/IgnoreList.php
index f277335730..442f0e9ba4 100644
--- a/src/Util/IgnoreList.php
+++ b/src/Util/IgnoreList.php
@@ -39,7 +39,7 @@ final class IgnoreList
     private function __construct()
     {
 
-    }//end __construct()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public static function getInstanceIgnoringNothing()
     {
         return new self();
 
-    }//end getInstanceIgnoringNothing()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ public static function getInstanceIgnoringAll()
         $instance->data['.default'] = true;
         return $instance;
 
-    }//end getInstanceIgnoringAll()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public static function getNewInstanceFrom(?IgnoreList $ignoreList)
 
         return clone $ignoreList;
 
-    }//end getNewInstanceFrom()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function set(string $code, bool $ignore)
 
         return $this;
 
-    }//end set()
+    }
 
 
     /**
@@ -148,7 +148,7 @@ public function isIgnored(string $code)
 
         return $returnValue;
 
-    }//end isIgnored()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public function ignoresNothing()
 
         return true;
 
-    }//end ignoresNothing()
+    }
 
 
     /**
@@ -200,7 +200,7 @@ public function ignoresEverything()
 
         return true;
 
-    }//end ignoresEverything()
+    }
 
 
-}//end class
+}
diff --git a/src/Util/MessageCollector.php b/src/Util/MessageCollector.php
index 3ece9e9ec0..6e3fc3ea77 100644
--- a/src/Util/MessageCollector.php
+++ b/src/Util/MessageCollector.php
@@ -115,7 +115,7 @@ public function add($message, $type = self::NOTICE)
             'type'    => $type,
         ];
 
-    }//end add()
+    }
 
 
     /**
@@ -129,7 +129,7 @@ public function containsBlockingErrors()
         $typeFrequency = array_count_values($seenTypes);
         return isset($typeFrequency[self::ERROR]);
 
-    }//end containsBlockingErrors()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ public function display(string $order = self::ORDERBY_SEVERITY)
             StatusWriter::write($allMessages, 0, 2);
         }
 
-    }//end display()
+    }
 
 
     /**
@@ -188,7 +188,7 @@ private function prefixAll(array $messages)
 
         return $messages;
 
-    }//end prefixAll()
+    }
 
 
     /**
@@ -221,7 +221,7 @@ private function prefix(string $message, int $type)
 
         return $message;
 
-    }//end prefix()
+    }
 
 
     /**
@@ -264,7 +264,7 @@ private function sortBySeverity(array $messages)
 
         return array_merge($errors, $warnings, $notices, $deprecations);
 
-    }//end sortBySeverity()
+    }
 
 
     /**
@@ -276,7 +276,7 @@ private function clearCache()
     {
         $this->cache = [];
 
-    }//end clearCache()
+    }
 
 
-}//end class
+}
diff --git a/src/Util/Standards.php b/src/Util/Standards.php
index e22b0880aa..ae3ed51b7b 100644
--- a/src/Util/Standards.php
+++ b/src/Util/Standards.php
@@ -47,7 +47,7 @@ public static function getInstalledStandardPaths()
 
         return $resolvedInstalledPaths;
 
-    }//end getInstalledStandardPaths()
+    }
 
 
     /**
@@ -145,7 +145,7 @@ public static function getInstalledStandardDetails(
 
         return $installedStandards;
 
-    }//end getInstalledStandardDetails()
+    }
 
 
     /**
@@ -216,7 +216,7 @@ public static function getInstalledStandards(
 
         return $installedStandards;
 
-    }//end getInstalledStandards()
+    }
 
 
     /**
@@ -263,7 +263,7 @@ public static function isInstalledStandard(string $standard)
 
         return false;
 
-    }//end isInstalledStandard()
+    }
 
 
     /**
@@ -308,7 +308,7 @@ public static function getInstalledStandardPath(string $standard)
 
         return null;
 
-    }//end getInstalledStandardPath()
+    }
 
 
     /**
@@ -337,7 +337,7 @@ public static function prepareInstalledStandardsForDisplay()
 
         return $output;
 
-    }//end prepareInstalledStandardsForDisplay()
+    }
 
 
     /**
@@ -351,7 +351,7 @@ 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..b35f944ebf 100644
--- a/src/Util/Timing.php
+++ b/src/Util/Timing.php
@@ -62,7 +62,7 @@ public static function startTiming()
 
         self::$startTime = microtime(true);
 
-    }//end startTiming()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public static function getDuration()
 
         return ((microtime(true) - self::$startTime) * 1000);
 
-    }//end getDuration()
+    }
 
 
     /**
@@ -93,7 +93,7 @@ public static function getDurationSince(float $startTime)
     {
         return ((microtime(true) - $startTime) * 1000);
 
-    }//end getDurationSince()
+    }
 
 
     /**
@@ -121,7 +121,7 @@ public static function getHumanReadableDuration(float $duration)
 
         return $timeString;
 
-    }//end getHumanReadableDuration()
+    }
 
 
     /**
@@ -152,7 +152,7 @@ public static function printRunTime(bool $force = false)
 
         self::$printed = true;
 
-    }//end printRunTime()
+    }
 
 
-}//end class
+}
diff --git a/src/Util/Tokens.php b/src/Util/Tokens.php
index 0e65797102..cc701fc113 100644
--- a/src/Util/Tokens.php
+++ b/src/Util/Tokens.php
@@ -943,7 +943,7 @@ public static function tokenName($token)
 
         return substr($token, 6);
 
-    }//end tokenName()
+    }
 
 
     /**
@@ -985,7 +985,7 @@ 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..54b7c3a210 100644
--- a/src/Util/Writers/StatusWriter.php
+++ b/src/Util/Writers/StatusWriter.php
@@ -68,7 +68,7 @@ public static function write(string $message, int $indent = 0, int $newlines = 1
 
         self::forceWrite($message, $indent, $newlines);
 
-    }//end write()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ public static function forceWrite(string $message, int $indent = 0, int $newline
 
         fwrite(self::$stream, $message);
 
-    }//end forceWrite()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public static function writeNewline(int $nr = 1)
     {
         self::write('', 0, $nr);
 
-    }//end writeNewline()
+    }
 
 
     /**
@@ -125,7 +125,7 @@ public static function forceWriteNewline(int $nr = 1)
     {
         self::forceWrite('', 0, $nr);
 
-    }//end forceWriteNewline()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ public static function pause()
         self::$paused = true;
         ++self::$pauseCount;
 
-    }//end pause()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ public static function resume()
             self::$paused = false;
         }
 
-    }//end resume()
+    }
 
 
     /**
@@ -168,7 +168,7 @@ public static function isPaused()
     {
         return self::$paused;
 
-    }//end isPaused()
+    }
 
 
-}//end class
+}
diff --git a/tests/ConfigDouble.php b/tests/ConfigDouble.php
index 42e14c75a5..2765bc0e39 100644
--- a/tests/ConfigDouble.php
+++ b/tests/ConfigDouble.php
@@ -69,7 +69,7 @@ public function __construct(array $cliArgs = [], bool $skipSettingStandard = fal
             $this->preventAutoDiscoveryScreenWidth();
         }
 
-    }//end __construct()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ public function __destruct()
         $this->setStaticConfigProperty('configData', null);
         $this->setStaticConfigProperty('configDataFile', null);
 
-    }//end __destruct()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ public function setCommandLineValues($args)
             $this->preventSearchingForRuleset();
         }
 
-    }//end setCommandLineValues()
+    }
 
 
     /**
@@ -114,7 +114,7 @@ private function resetSelectProperties()
     {
         $this->setStaticConfigProperty('executablePaths', []);
 
-    }//end resetSelectProperties()
+    }
 
 
     /**
@@ -130,7 +130,7 @@ private function preventReadingCodeSnifferConfFile()
         $this->setStaticConfigProperty('configData', []);
         $this->setStaticConfigProperty('configDataFile', '');
 
-    }//end preventReadingCodeSnifferConfFile()
+    }
 
 
     /**
@@ -154,7 +154,7 @@ private function preventSearchingForRuleset()
 
         self::setStaticConfigProperty('overriddenDefaults', $overriddenDefaults);
 
-    }//end preventSearchingForRuleset()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ private function preventAutoDiscoveryScreenWidth()
             $this->reportWidth = self::DEFAULT_REPORT_WIDTH;
         }
 
-    }//end preventAutoDiscoveryScreenWidth()
+    }
 
 
     /**
@@ -191,7 +191,7 @@ private function getStaticConfigProperty(string $name)
 
         return $property->getValue();
 
-    }//end getStaticConfigProperty()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ 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..d3cf4c5b02 100644
--- a/tests/Core/AbstractMethodTestCase.php
+++ b/tests/Core/AbstractMethodTestCase.php
@@ -62,7 +62,7 @@ public static function setUpBeforeClass(): void
         self::$phpcsFile = new LocalFile($pathToTestFile, $ruleset, $config);
         self::$phpcsFile->parse();
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ public static function tearDownAfterClass(): void
         self::$tabWidth  = 4;
         self::$phpcsFile = null;
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function testTestMarkersAreUnique()
     {
         $this->assertTestMarkersAreUnique(self::$phpcsFile);
 
-    }//end testTestMarkersAreUnique()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ public static function assertTestMarkersAreUnique(File $phpcsFile)
 
         self::assertSame(array_unique($seenComments), $seenComments, 'Duplicate test markers found.');
 
-    }//end assertTestMarkersAreUnique()
+    }
 
 
     /**
@@ -153,7 +153,7 @@ public function getTargetToken($commentString, $tokenType, $tokenContent = null)
     {
         return self::getTargetTokenFromFile(self::$phpcsFile, $commentString, $tokenType, $tokenContent);
 
-    }//end getTargetToken()
+    }
 
 
     /**
@@ -223,7 +223,7 @@ public static function getTargetTokenFromFile(File $phpcsFile, $commentString, $
 
         return $target;
 
-    }//end getTargetTokenFromFile()
+    }
 
 
     /**
@@ -239,7 +239,7 @@ 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..0d04534d66 100644
--- a/tests/Core/Autoloader/DetermineLoadedClassTest.php
+++ b/tests/Core/Autoloader/DetermineLoadedClassTest.php
@@ -30,7 +30,7 @@ public static function setUpBeforeClass(): void
     {
         include __DIR__ . '/TestFiles/Sub/C.inc';
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public function testOrdered()
         $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
-    }//end testOrdered()
+    }
 
 
     /**
@@ -118,7 +118,7 @@ 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..fb95e1b743 100644
--- a/tests/Core/Config/AbstractRealConfigTestCase.php
+++ b/tests/Core/Config/AbstractRealConfigTestCase.php
@@ -33,7 +33,7 @@ protected function setUp(): void
         self::setStaticConfigProperty('configData', []);
         self::setStaticConfigProperty('configDataFile', '');
 
-    }//end setUp()
+    }
 
 
     /**
@@ -45,7 +45,7 @@ protected function tearDown(): void
     {
         $_SERVER['argv'] = [];
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public static function tearDownAfterClass(): void
         self::setStaticConfigProperty('configDataFile', null);
         $_SERVER['argv'] = [];
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ protected static function setStaticConfigProperty($name, $value)
         $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..340446603e 100644
--- a/tests/Core/Config/ExtensionsArgTest.php
+++ b/tests/Core/Config/ExtensionsArgTest.php
@@ -37,7 +37,7 @@ public function testValidExtensions($passedValue, $expected)
 
         $this->assertSame($expected, $config->extensions);
 
-    }//end testValidExtensions()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ public static function dataValidExtensions()
             ],
         ];
 
-    }//end dataValidExtensions()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public function testOnlySetOnce()
 
         $this->assertSame(['php' => 'PHP'], $config->extensions);
 
-    }//end testOnlySetOnce()
+    }
 
 
     /**
@@ -140,7 +140,7 @@ public function testInvalidExtensions($passedValue)
 
         new ConfigDouble(["--extensions={$passedValue}"]);
 
-    }//end testInvalidExtensions()
+    }
 
 
     /**
@@ -164,7 +164,7 @@ public static function dataInvalidExtensions()
             ],
         ];
 
-    }//end dataInvalidExtensions()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Config/GeneratorArgTest.php b/tests/Core/Config/GeneratorArgTest.php
index d8e90c2549..d0042c8fa9 100644
--- a/tests/Core/Config/GeneratorArgTest.php
+++ b/tests/Core/Config/GeneratorArgTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
             $this->markTestSkipped('This test needs CS mode to run');
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function testValidGenerators($argumentValue, $expectedPropertyValue)
 
         $this->assertSame($expectedPropertyValue, $config->generator);
 
-    }//end testValidGenerators()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public static function dataValidGeneratorNames()
             ],
         ];
 
-    }//end dataValidGeneratorNames()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public function testOnlySetOnce()
 
         $this->assertSame('Text', $config->generator);
 
-    }//end testOnlySetOnce()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ public function testInvalidGenerator($generatorName)
 
         new ConfigDouble(["--generator={$generatorName}"]);
 
-    }//end testInvalidGenerator()
+    }
 
 
     /**
@@ -149,7 +149,7 @@ public static function dataInvalidGeneratorNames()
             [''],
         ];
 
-    }//end dataInvalidGeneratorNames()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Config/IniSetTest.php b/tests/Core/Config/IniSetTest.php
index 7d06d32b7d..7103e7c1fd 100644
--- a/tests/Core/Config/IniSetTest.php
+++ b/tests/Core/Config/IniSetTest.php
@@ -47,7 +47,7 @@ protected function tearDown(): void
             @ini_set($this->currentOption, $this->originalValue);
         }
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function testIniValueHandlingWhenValueIsAlreadyCorrect()
 
         $this->assertSame($this->originalValue, ini_get($this->currentOption));
 
-    }//end testIniValueHandlingWhenValueIsAlreadyCorrect()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ public function testIniValueIsUpdatedToTrueWhenNoValuePassed()
 
         $this->assertSame($expected, ini_get($this->currentOption));
 
-    }//end testIniValueIsUpdatedToTrueWhenNoValuePassed()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function testIniValueIsUpdated($option, $newValue, $alternativeValue)
 
         $this->assertSame($newValue, ini_get($option));
 
-    }//end testIniValueIsUpdated()
+    }
 
 
     /**
@@ -146,7 +146,7 @@ public static function dataIniValueIsUpdated()
             ],
         ];
 
-    }//end dataIniValueIsUpdated()
+    }
 
 
     /**
@@ -176,7 +176,7 @@ public function testIniValueIsUpdatedWhenOptionalBcmathExtensionIsAvailable()
 
         $this->assertSame($newValue, ini_get($this->currentOption));
 
-    }//end testIniValueIsUpdatedWhenOptionalBcmathExtensionIsAvailable()
+    }
 
 
     /**
@@ -212,7 +212,7 @@ public function testIniValueIsUpdatedWhenOptionalSqllite3ExtensionIsAvailable()
 
         $this->assertSame($newValue, ini_get($this->currentOption));
 
-    }//end testIniValueIsUpdatedWhenOptionalSqllite3ExtensionIsAvailable()
+    }
 
 
     /**
@@ -238,7 +238,7 @@ public function testIniValueIsSilentlyIgnoredWhenOptionalExtensionIsNotAvailable
 
         $this->assertFalse(ini_get($this->currentOption), 'This should be impossible: an option for a disabled extension cannot be set');
 
-    }//end testIniValueIsSilentlyIgnoredWhenOptionalExtensionIsNotAvailable()
+    }
 
 
     /**
@@ -258,7 +258,7 @@ public function testIniValueIsSilentlyIgnoredForUnknownIniName()
 
         $this->assertFalse(ini_get($this->currentOption), 'This should be impossible: an option which isn\'t known to PHP cannot be set');
 
-    }//end testIniValueIsSilentlyIgnoredForUnknownIniName()
+    }
 
 
     /**
@@ -287,7 +287,7 @@ public function testIniValueCannotBeUpdatedAtRuntime($option, $newValue, $altern
 
         new ConfigDouble(['-d', "$option=$newValue"]);
 
-    }//end testIniValueCannotBeUpdatedAtRuntime()
+    }
 
 
     /**
@@ -322,7 +322,7 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
             ],
         ];
 
-    }//end dataIniValueCannotBeUpdatedAtRuntime()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Config/IssueSquiz2675Test.php b/tests/Core/Config/IssueSquiz2675Test.php
index ee87f12645..61d5e687e0 100644
--- a/tests/Core/Config/IssueSquiz2675Test.php
+++ b/tests/Core/Config/IssueSquiz2675Test.php
@@ -37,7 +37,7 @@ public function testIssueSquiz2675()
 
         $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..dd557c168f 100644
--- a/tests/Core/Config/PrepareConfigDataForDisplayTest.php
+++ b/tests/Core/Config/PrepareConfigDataForDisplayTest.php
@@ -42,7 +42,7 @@ public function testPrepareConfigDataForDisplay($data, $expected)
 
         $this->assertSame($expected, $actual);
 
-    }//end testPrepareConfigDataForDisplay()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ public static function dataPrepareConfigDataForDisplay()
         ];
         // phpcs:enable
 
-    }//end dataPrepareConfigDataForDisplay()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ 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..ae46271b25 100644
--- a/tests/Core/Config/ReportArgsTest.php
+++ b/tests/Core/Config/ReportArgsTest.php
@@ -37,7 +37,7 @@ public function testReportFileDoesNotSetReportsCs()
         $this->assertStringEndsWith('/report.txt', $config->reportFile);
         $this->assertSame(['full' => null], $config->reports);
 
-    }//end testReportFileDoesNotSetReportsCs()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ 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..0c35e67cd6 100644
--- a/tests/Core/Config/ReportWidthTest.php
+++ b/tests/Core/Config/ReportWidthTest.php
@@ -37,7 +37,7 @@ public function testReportWidthDefault()
         $this->assertIsInt($config->reportWidth, 'Report width is not an integer');
         $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
 
-    }//end testReportWidthDefault()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile()
         $this->assertIsInt($config->reportWidth, 'Report width is not an integer');
         $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
 
-    }//end testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public function testReportWidthCanBeSetFromConfFile()
         $config = new Config(['--standard=PSR1']);
         $this->assertSame(120, $config->reportWidth);
 
-    }//end testReportWidthCanBeSetFromConfFile()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function testReportWidthCanBeSetFromCLI()
         $config = new Config();
         $this->assertSame(100, $config->reportWidth);
 
-    }//end testReportWidthCanBeSetFromCLI()
+    }
 
 
     /**
@@ -132,7 +132,7 @@ public function testReportWidthWhenSetFromCLIFirstValuePrevails()
         $config = new Config();
         $this->assertSame(100, $config->reportWidth);
 
-    }//end testReportWidthWhenSetFromCLIFirstValuePrevails()
+    }
 
 
     /**
@@ -165,7 +165,7 @@ public function testReportWidthSetFromCLIOverrulesConfFile()
         $config = new Config($cliArgs);
         $this->assertSame(180, $config->reportWidth);
 
-    }//end testReportWidthSetFromCLIOverrulesConfFile()
+    }
 
 
     /**
@@ -184,7 +184,7 @@ public function testReportWidthInputHandlingForAuto()
         $this->assertIsInt($config->reportWidth, 'Report width is not an integer');
         $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
 
-    }//end testReportWidthInputHandlingForAuto()
+    }
 
 
     /**
@@ -205,7 +205,7 @@ public function testReportWidthInputHandling($value, $expected)
 
         $this->assertSame($expected, $config->reportWidth);
 
-    }//end testReportWidthInputHandling()
+    }
 
 
     /**
@@ -254,7 +254,7 @@ public static function dataReportWidthInputHandling()
             ],
         ];
 
-    }//end dataReportWidthInputHandling()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Config/SniffsExcludeArgsTest.php b/tests/Core/Config/SniffsExcludeArgsTest.php
index b9643aa5a7..59cd61e2df 100644
--- a/tests/Core/Config/SniffsExcludeArgsTest.php
+++ b/tests/Core/Config/SniffsExcludeArgsTest.php
@@ -60,7 +60,7 @@ public function testInvalid($argument, $value, $errors, $suggestion)
 
         new ConfigDouble(["--$argument=$value"]);
 
-    }//end testInvalid()
+    }
 
 
     /**
@@ -196,7 +196,7 @@ public static function dataInvalid()
 
         return $data;
 
-    }//end dataInvalid()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ public function testValid($argument, $value, $result)
 
         $this->assertSame($result, $config->$argument);
 
-    }//end testValid()
+    }
 
 
     /**
@@ -277,7 +277,7 @@ public static function dataValid()
 
         return $data;
 
-    }//end dataValid()
+    }
 
 
     /**
@@ -300,7 +300,7 @@ public function testOnlySetOnce($argument)
 
         $this->assertSame(['StandardOne.Category.Sniff'], $config->$argument);
 
-    }//end testOnlySetOnce()
+    }
 
 
     /**
@@ -315,7 +315,7 @@ public static function dataOnlySetOnce()
             'exclude' => ['exclude'],
         ];
 
-    }//end dataOnlySetOnce()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/ErrorSuppressionTest.php b/tests/Core/ErrorSuppressionTest.php
index 47ad238574..b6266a0802 100644
--- a/tests/Core/ErrorSuppressionTest.php
+++ b/tests/Core/ErrorSuppressionTest.php
@@ -55,7 +55,7 @@ public function testSuppressError($before, $after, $expectedErrors = 0)
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
 
-    }//end testSuppressError()
+    }
 
 
     /**
@@ -135,7 +135,7 @@ public static function dataSuppressError()
             ],
         ];
 
-    }//end dataSuppressError()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public function testSuppressSomeErrors($before, $between, $expectedErrors = 1)
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
 
-    }//end testSuppressSomeErrors()
+    }
 
 
     /**
@@ -217,7 +217,7 @@ public static function dataSuppressSomeErrors()
             ],
         ];
 
-    }//end dataSuppressSomeErrors()
+    }
 
 
     /**
@@ -256,7 +256,7 @@ public function testSuppressWarning($before, $after, $expectedWarnings = 0)
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testSuppressWarning()
+    }
 
 
     /**
@@ -290,7 +290,7 @@ public static function dataSuppressWarning()
             ],
         ];
 
-    }//end dataSuppressWarning()
+    }
 
 
     /**
@@ -330,7 +330,7 @@ public function testSuppressLine($before, $after = '', $expectedErrors = 1)
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
 
-    }//end testSuppressLine()
+    }
 
 
     /**
@@ -388,7 +388,7 @@ public static function dataSuppressLine()
             ],
         ];
 
-    }//end dataSuppressLine()
+    }
 
 
     /**
@@ -411,7 +411,7 @@ public function testSuppressLineMidLine()
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
 
-    }//end testSuppressLineMidLine()
+    }
 
 
     /**
@@ -443,7 +443,7 @@ public function testSuppressLineWithinDocblock()
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
 
-    }//end testSuppressLineWithinDocblock()
+    }
 
 
     /**
@@ -481,7 +481,7 @@ public function testNestedSuppressLine($before, $after)
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
 
-    }//end testNestedSuppressLine()
+    }
 
 
     /**
@@ -523,7 +523,7 @@ public static function dataNestedSuppressLine()
             ],
         ];
 
-    }//end dataNestedSuppressLine()
+    }
 
 
     /**
@@ -566,7 +566,7 @@ function myFunction() {
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
 
-    }//end testSuppressScope()
+    }
 
 
     /**
@@ -608,7 +608,7 @@ public static function dataSuppressScope()
             ],
         ];
 
-    }//end dataSuppressScope()
+    }
 
 
     /**
@@ -650,7 +650,7 @@ class MyClass {}
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testSuppressFile()
+    }
 
 
     /**
@@ -702,7 +702,7 @@ public static function dataSuppressFile()
             ],
         ];
 
-    }//end dataSuppressFile()
+    }
 
 
     /**
@@ -748,7 +748,7 @@ public function testDisableSelected($before, $expectedErrors = 0, $expectedWarni
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testDisableSelected()
+    }
 
 
     /**
@@ -821,7 +821,7 @@ public static function dataDisableSelected()
             ],
         ];
 
-    }//end dataDisableSelected()
+    }
 
 
     /**
@@ -860,7 +860,7 @@ public function testEnableSelected($code, $expectedErrors, $expectedWarnings)
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testEnableSelected()
+    }
 
 
     /**
@@ -1069,7 +1069,7 @@ public static function dataEnableSelected()
             ],
         ];
 
-    }//end dataEnableSelected()
+    }
 
 
     /**
@@ -1113,7 +1113,7 @@ public function testIgnoreSelected($before, $expectedErrors, $expectedWarnings)
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testIgnoreSelected()
+    }
 
 
     /**
@@ -1160,7 +1160,7 @@ public static function dataIgnoreSelected()
             ],
         ];
 
-    }//end dataIgnoreSelected()
+    }
 
 
     /**
@@ -1199,7 +1199,7 @@ public function testCommenting($code, $expectedErrors, $expectedWarnings)
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
 
-    }//end testCommenting()
+    }
 
 
     /**
@@ -1260,7 +1260,7 @@ public static function dataCommenting()
             ],
         ];
 
-    }//end dataCommenting()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
index e5cc9be12b..91a28d777d 100644
--- a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
+++ b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
@@ -39,7 +39,7 @@ public function testRulesetIgnoredInternalErrorIsIgnored($sniffs, $exclude)
         $added = $phpcsFile->addError('No code found', 0, 'Internal.NoCodeFound');
         $this->assertFalse($added);
 
-    }//end testRulesetIgnoredInternalErrorIsIgnored()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ public function testOtherInternalErrorIsNotIgnored($sniffs, $exclude)
         $added = $phpcsFile->addError('Some other error', 0, 'Internal.SomeError');
         $this->assertTrue($added);
 
-    }//end testOtherInternalErrorIsNotIgnored()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public static function dataSniffSelection()
             ],
         ];
 
-    }//end dataSniffSelection()
+    }
 
 
     /**
@@ -120,7 +120,7 @@ private function getPhpcsFile($sniffs, $exclude)
 
         return $phpcsFile;
 
-    }//end getPhpcsFile()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/FindEndOfStatementTest.php b/tests/Core/Files/File/FindEndOfStatementTest.php
index f7875883a3..00c4557111 100644
--- a/tests/Core/Files/File/FindEndOfStatementTest.php
+++ b/tests/Core/Files/File/FindEndOfStatementTest.php
@@ -54,7 +54,7 @@ public function testEndIsNeverLessThanCurrentToken()
 
         $this->assertSame([], $errors);
 
-    }//end testEndIsNeverLessThanCurrentToken()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ public function testSimpleAssignment()
 
         $this->assertSame(($start + 5), $found);
 
-    }//end testSimpleAssignment()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ public function testControlStructure()
 
         $this->assertSame(($start + 6), $found);
 
-    }//end testControlStructure()
+    }
 
 
     /**
@@ -99,7 +99,7 @@ public function testClosureAssignment()
 
         $this->assertSame(($start + 13), $found);
 
-    }//end testClosureAssignment()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function testHeredocFunctionArg()
 
         $this->assertSame($start, $found);
 
-    }//end testHeredocFunctionArg()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function testSwitch()
 
         $this->assertSame(($start + 6), $found);
 
-    }//end testSwitch()
+    }
 
 
     /**
@@ -183,7 +183,7 @@ public function testStatementAsArrayValue()
 
         $this->assertSame(($start + 3), $found);
 
-    }//end testStatementAsArrayValue()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ public function testUseGroup()
 
         $this->assertSame(($start + 21), $found);
 
-    }//end testUseGroup()
+    }
 
 
     /**
@@ -213,7 +213,7 @@ public function testArrowFunctionArrayValue()
 
         $this->assertSame(($start + 9), $found);
 
-    }//end testArrowFunctionArrayValue()
+    }
 
 
     /**
@@ -231,7 +231,7 @@ public function testStaticArrowFunction()
 
         $this->assertSame($endOfStatementFn, $endOfStatementStatic);
 
-    }//end testStaticArrowFunction()
+    }
 
 
     /**
@@ -246,7 +246,7 @@ public function testArrowFunctionReturnValue()
 
         $this->assertSame(($start + 18), $found);
 
-    }//end testArrowFunctionReturnValue()
+    }
 
 
     /**
@@ -261,7 +261,7 @@ public function testArrowFunctionAsArgument()
 
         $this->assertSame(($start + 8), $found);
 
-    }//end testArrowFunctionAsArgument()
+    }
 
 
     /**
@@ -276,7 +276,7 @@ public function testArrowFunctionWithArrayAsArgument()
 
         $this->assertSame(($start + 17), $found);
 
-    }//end testArrowFunctionWithArrayAsArgument()
+    }
 
 
     /**
@@ -296,7 +296,7 @@ public function testMatchCase()
 
         $this->assertSame(($start + 1), $found);
 
-    }//end testMatchCase()
+    }
 
 
     /**
@@ -316,7 +316,7 @@ public function testMatchDefault()
 
         $this->assertSame($start, $found);
 
-    }//end testMatchDefault()
+    }
 
 
     /**
@@ -334,7 +334,7 @@ public function testMatchMultipleCase()
         $found  = self::$phpcsFile->findEndOfStatement($start);
         $this->assertSame(($start + 7), $found);
 
-    }//end testMatchMultipleCase()
+    }
 
 
     /**
@@ -349,7 +349,7 @@ public function testMatchDefaultComma()
 
         $this->assertSame(($start + 5), $found);
 
-    }//end testMatchDefaultComma()
+    }
 
 
     /**
@@ -369,7 +369,7 @@ public function testMatchFunctionCall()
 
         $this->assertSame(($start + 1), $found);
 
-    }//end testMatchFunctionCall()
+    }
 
 
     /**
@@ -391,7 +391,7 @@ public function testMatchFunctionCallArm()
 
         $this->assertSame(($start + 21), $found);
 
-    }//end testMatchFunctionCallArm()
+    }
 
 
     /**
@@ -411,7 +411,7 @@ public function testMatchClosure()
 
         $this->assertSame(($start + 14), $found);
 
-    }//end testMatchClosure()
+    }
 
 
     /**
@@ -431,7 +431,7 @@ public function testMatchArray()
 
         $this->assertSame(($start + 22), $found);
 
-    }//end testMatchArray()
+    }
 
 
     /**
@@ -451,7 +451,7 @@ public function testNestedMatch()
 
         $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..b0490688ca 100644
--- a/tests/Core/Files/File/FindExtendedClassNameTest.php
+++ b/tests/Core/Files/File/FindExtendedClassNameTest.php
@@ -30,7 +30,7 @@ public function testNonExistentToken()
         $result = self::$phpcsFile->findExtendedClassName(100000);
         $this->assertFalse($result);
 
-    }//end testNonExistentToken()
+    }
 
 
     /**
@@ -44,7 +44,7 @@ public function testNotAClass()
         $result = self::$phpcsFile->findExtendedClassName($token);
         $this->assertFalse($result);
 
-    }//end testNotAClass()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public function testFindExtendedClassName($identifier, $expected)
         $result  = self::$phpcsFile->findExtendedClassName($OOToken);
         $this->assertSame($expected, $result);
 
-    }//end testFindExtendedClassName()
+    }
 
 
     /**
@@ -151,7 +151,7 @@ public static function dataExtendedClass()
             ],
         ];
 
-    }//end dataExtendedClass()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
index ac6df164cb..7be2bc36d9 100644
--- a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
+++ b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
@@ -30,7 +30,7 @@ public function testNonExistentToken()
         $result = self::$phpcsFile->findImplementedInterfaceNames(100000);
         $this->assertFalse($result);
 
-    }//end testNonExistentToken()
+    }
 
 
     /**
@@ -44,7 +44,7 @@ public function testNotAClass()
         $result = self::$phpcsFile->findImplementedInterfaceNames($token);
         $this->assertFalse($result);
 
-    }//end testNotAClass()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function testFindImplementedInterfaceNames($identifier, $expected)
         $result  = self::$phpcsFile->findImplementedInterfaceNames($OOToken);
         $this->assertSame($expected, $result);
 
-    }//end testFindImplementedInterfaceNames()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public static function dataImplementedInterface()
             ],
         ];
 
-    }//end dataImplementedInterface()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/FindStartOfStatementTest.php b/tests/Core/Files/File/FindStartOfStatementTest.php
index e8f8453777..77cea0f896 100644
--- a/tests/Core/Files/File/FindStartOfStatementTest.php
+++ b/tests/Core/Files/File/FindStartOfStatementTest.php
@@ -56,7 +56,7 @@ public function testStartIsNeverMoreThanCurrentToken()
 
         $this->assertSame([], $errors);
 
-    }//end testStartIsNeverMoreThanCurrentToken()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function testSimpleAssignment()
 
         $this->assertSame(($start - 5), $found);
 
-    }//end testSimpleAssignment()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public function testFunctionCall()
 
         $this->assertSame(($start - 6), $found);
 
-    }//end testFunctionCall()
+    }
 
 
     /**
@@ -101,7 +101,7 @@ public function testFunctionCallArgument()
 
         $this->assertSame($start, $found);
 
-    }//end testFunctionCallArgument()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function testControlStructure()
 
         $this->assertSame(($start - 6), $found);
 
-    }//end testControlStructure()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ public function testClosureAssignment()
 
         $this->assertSame(($start - 11), $found);
 
-    }//end testClosureAssignment()
+    }
 
 
     /**
@@ -159,7 +159,7 @@ public function testHeredocFunctionArg()
 
         $this->assertSame($start, $found);
 
-    }//end testHeredocFunctionArg()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ public function testSwitch()
 
         $this->assertSame(($start - 1), $found);
 
-    }//end testSwitch()
+    }
 
 
     /**
@@ -233,7 +233,7 @@ public function testStatementAsArrayValue()
 
         $this->assertSame(($start - 5), $found);
 
-    }//end testStatementAsArrayValue()
+    }
 
 
     /**
@@ -248,7 +248,7 @@ public function testUseGroup()
 
         $this->assertSame(($start - 21), $found);
 
-    }//end testUseGroup()
+    }
 
 
     /**
@@ -263,7 +263,7 @@ public function testArrowFunctionArrayValue()
 
         $this->assertSame(($start - 7), $found);
 
-    }//end testArrowFunctionArrayValue()
+    }
 
 
     /**
@@ -278,7 +278,7 @@ public function testStaticArrowFunction()
 
         $this->assertSame(($start - 11), $found);
 
-    }//end testStaticArrowFunction()
+    }
 
 
     /**
@@ -293,7 +293,7 @@ public function testArrowFunctionReturnValue()
 
         $this->assertSame(($start - 18), $found);
 
-    }//end testArrowFunctionReturnValue()
+    }
 
 
     /**
@@ -309,7 +309,7 @@ public function testArrowFunctionAsArgument()
 
         $this->assertSame(($start - 8), $found);
 
-    }//end testArrowFunctionAsArgument()
+    }
 
 
     /**
@@ -325,7 +325,7 @@ public function testArrowFunctionWithArrayAsArgument()
 
         $this->assertSame(($start - 17), $found);
 
-    }//end testArrowFunctionWithArrayAsArgument()
+    }
 
 
     /**
@@ -340,7 +340,7 @@ public function testMatchCase()
 
         $this->assertSame(($start - 1), $found);
 
-    }//end testMatchCase()
+    }
 
 
     /**
@@ -355,7 +355,7 @@ public function testMatchDefault()
 
         $this->assertSame($start, $found);
 
-    }//end testMatchDefault()
+    }
 
 
     /**
@@ -375,7 +375,7 @@ public function testMatchMultipleCase()
 
         $this->assertSame(($start - 4), $found);
 
-    }//end testMatchMultipleCase()
+    }
 
 
     /**
@@ -395,7 +395,7 @@ public function testMatchDefaultComma()
 
         $this->assertSame($start, $found);
 
-    }//end testMatchDefaultComma()
+    }
 
 
     /**
@@ -410,7 +410,7 @@ public function testMatchFunctionCall()
 
         $this->assertSame(($start - 6), $found);
 
-    }//end testMatchFunctionCall()
+    }
 
 
     /**
@@ -432,7 +432,7 @@ public function testMatchFunctionCallArm()
 
         $this->assertSame(($start - 18), $found);
 
-    }//end testMatchFunctionCallArm()
+    }
 
 
     /**
@@ -453,7 +453,7 @@ public function testMatchClosure()
 
         $this->assertSame(($start - 10), $found);
 
-    }//end testMatchClosure()
+    }
 
 
     /**
@@ -483,7 +483,7 @@ public function testMatchArray()
         $found  = self::$phpcsFile->findStartOfStatement($start);
         $this->assertSame(($start - 26), $found);
 
-    }//end testMatchArray()
+    }
 
 
     /**
@@ -509,7 +509,7 @@ public function testNestedMatch()
 
         $this->assertSame(($start - 2), $found);
 
-    }//end testNestedMatch()
+    }
 
 
     /**
@@ -525,7 +525,7 @@ public function testOpenTag()
 
         $this->assertSame(($start - 1), $found);
 
-    }//end testOpenTag()
+    }
 
 
     /**
@@ -541,7 +541,7 @@ public function testOpenTagWithEcho()
 
         $this->assertSame(($start - 1), $found);
 
-    }//end testOpenTagWithEcho()
+    }
 
 
     /**
@@ -561,7 +561,7 @@ public function testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInAr
 
         $this->assertSame($expected, $found);
 
-    }//end testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInArray()
+    }
 
 
     /**
@@ -587,7 +587,7 @@ public function testFindStartInsideSwitchCaseDefaultStatements($testMarker, $tar
 
         $this->assertSame($expected, $found);
 
-    }//end testFindStartInsideSwitchCaseDefaultStatements()
+    }
 
 
     /**
@@ -687,7 +687,7 @@ public static function dataFindStartInsideSwitchCaseDefaultStatements()
             ],
         ];
 
-    }//end dataFindStartInsideSwitchCaseDefaultStatements()
+    }
 
 
     /**
@@ -712,7 +712,7 @@ public function testFindStartInsideClosedScopeNestedWithinMatch($testMarker, $ta
 
         $this->assertSame($expected, $found);
 
-    }//end testFindStartInsideClosedScopeNestedWithinMatch()
+    }
 
 
     /**
@@ -769,7 +769,7 @@ public static function dataFindStartInsideClosedScopeNestedWithinMatch()
             ],
         ];
 
-    }//end dataFindStartInsideClosedScopeNestedWithinMatch()
+    }
 
 
     /**
@@ -794,7 +794,7 @@ public function testFindStartInsideParenthesesNestedWithinMatch($testMarker, $ta
 
         $this->assertSame($expected, $found);
 
-    }//end testFindStartInsideParenthesesNestedWithinMatch()
+    }
 
 
     /**
@@ -849,7 +849,7 @@ public static function dataFindStartInsideParenthesesNestedWithinMatch()
             ],
         ];
 
-    }//end dataFindStartInsideParenthesesNestedWithinMatch()
+    }
 
 
     /**
@@ -875,7 +875,7 @@ public function testFindStartInsideParenthesesNestedWithinNestedMatch($testMarke
 
         $this->assertSame($expected, $found);
 
-    }//end testFindStartInsideParenthesesNestedWithinNestedMatch()
+    }
 
 
     /**
@@ -930,7 +930,7 @@ public static function dataFindStartInsideParenthesesNestedWithinNestedMatch()
             ],
         ];
 
-    }//end dataFindStartInsideParenthesesNestedWithinNestedMatch()
+    }
 
 
     /**
@@ -955,7 +955,7 @@ public function testFindStartInsideShortArrayNestedWithinMatch($testMarker, $tar
 
         $this->assertSame($expected, $found);
 
-    }//end testFindStartInsideShortArrayNestedWithinMatch()
+    }
 
 
     /**
@@ -983,7 +983,7 @@ public static function dataFindStartInsideShortArrayNestedWithinMatch()
             ],
         ];
 
-    }//end dataFindStartInsideShortArrayNestedWithinMatch()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/GetClassPropertiesTest.php b/tests/Core/Files/File/GetClassPropertiesTest.php
index 2a711a955b..36acbc1bbb 100644
--- a/tests/Core/Files/File/GetClassPropertiesTest.php
+++ b/tests/Core/Files/File/GetClassPropertiesTest.php
@@ -37,7 +37,7 @@ public function testNotAClassException($testMarker, $tokenType)
         $target = $this->getTargetToken($testMarker, $tokenType);
         self::$phpcsFile->getClassProperties($target);
 
-    }//end testNotAClassException()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public static function dataNotAClassException()
             ],
         ];
 
-    }//end dataNotAClassException()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ public function testGetClassProperties($testMarker, $expected)
         $result = self::$phpcsFile->getClassProperties($class);
         $this->assertSame($expected, $result);
 
-    }//end testGetClassProperties()
+    }
 
 
     /**
@@ -186,7 +186,7 @@ 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..7d3032a091 100644
--- a/tests/Core/Files/File/GetConditionTest.php
+++ b/tests/Core/Files/File/GetConditionTest.php
@@ -139,7 +139,7 @@ protected function setUp(): void
             }
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public function testNonExistentToken()
         $result = self::$phpcsFile->hasCondition(100000, T_IF);
         $this->assertFalse($result);
 
-    }//end testNonExistentToken()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public function testNonConditionalToken()
         $result = self::$phpcsFile->hasCondition($stackPtr, Tokens::OO_SCOPE_TOKENS);
         $this->assertFalse($result);
 
-    }//end testNonConditionalToken()
+    }
 
 
     /**
@@ -208,7 +208,7 @@ public function testGetCondition($testMarker, $expectedResults)
             );
         }
 
-    }//end testGetCondition()
+    }
 
 
     /**
@@ -279,7 +279,7 @@ public static function dataGetCondition()
             ],
         ];
 
-    }//end dataGetCondition()
+    }
 
 
     /**
@@ -313,7 +313,7 @@ public function testGetConditionReversed($testMarker, $expectedResults)
             );
         }
 
-    }//end testGetConditionReversed()
+    }
 
 
     /**
@@ -345,7 +345,7 @@ public static function dataGetConditionReversed()
 
         return $data;
 
-    }//end dataGetConditionReversed()
+    }
 
 
     /**
@@ -375,7 +375,7 @@ public function testHasCondition($testMarker, $expectedResults)
             );
         }
 
-    }//end testHasCondition()
+    }
 
 
     /**
@@ -446,7 +446,7 @@ public static function dataHasCondition()
             ],
         ];
 
-    }//end dataHasCondition()
+    }
 
 
     /**
@@ -484,7 +484,7 @@ public function testHasConditionMultipleTypes()
             '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..8475b493ec 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
@@ -31,7 +31,7 @@ public function testGetDeclarationName()
         $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..d9e44aab55 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
@@ -31,7 +31,7 @@ public function testGetDeclarationName()
         $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..0be8d23b37 100644
--- a/tests/Core/Files/File/GetDeclarationNameTest.php
+++ b/tests/Core/Files/File/GetDeclarationNameTest.php
@@ -39,7 +39,7 @@ public function testInvalidTokenPassed($testMarker, $targetType)
         $target = $this->getTargetToken($testMarker, $targetType);
         self::$phpcsFile->getDeclarationName($target);
 
-    }//end testInvalidTokenPassed()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ public static function dataInvalidTokenPassed()
             ],
         ];
 
-    }//end dataInvalidTokenPassed()
+    }
 
 
     /**
@@ -108,7 +108,7 @@ public function testGetDeclarationName($testMarker, $expected, $targetType = nul
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame($expected, $result);
 
-    }//end testGetDeclarationName()
+    }
 
 
     /**
@@ -207,7 +207,7 @@ public static function dataGetDeclarationName()
             ],
         ];
 
-    }//end dataGetDeclarationName()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/GetMemberPropertiesTest.php b/tests/Core/Files/File/GetMemberPropertiesTest.php
index aa2ad69354..cdb52f468e 100644
--- a/tests/Core/Files/File/GetMemberPropertiesTest.php
+++ b/tests/Core/Files/File/GetMemberPropertiesTest.php
@@ -46,7 +46,7 @@ public function testGetMemberProperties($identifier, $expected)
 
         $this->assertSame($expected, $result);
 
-    }//end testGetMemberProperties()
+    }
 
 
     /**
@@ -1845,7 +1845,7 @@ public static function dataGetMemberProperties()
             ],
         ];
 
-    }//end dataGetMemberProperties()
+    }
 
 
     /**
@@ -1864,7 +1864,7 @@ public function testNotClassPropertyException($identifier)
         $variable = $this->getTargetToken($identifier, T_VARIABLE);
         self::$phpcsFile->getMemberProperties($variable);
 
-    }//end testNotClassPropertyException()
+    }
 
 
     /**
@@ -1887,7 +1887,7 @@ public static function dataNotClassProperty()
             'property in enum (parse error)'                         => ['/* testEnumProperty */'],
         ];
 
-    }//end dataNotClassProperty()
+    }
 
 
     /**
@@ -1902,7 +1902,7 @@ 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..8d0293d08f 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError1Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError1Test.php
@@ -32,7 +32,7 @@ public function testParseError()
 
         $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..5a0178d439 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError2Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError2Test.php
@@ -32,7 +32,7 @@ public function testParseError()
 
         $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..3142f8e33d 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError3Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError3Test.php
@@ -31,7 +31,7 @@ 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..df94627a7e 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError4Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError4Test.php
@@ -31,7 +31,7 @@ public function testParseError()
 
         $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..4b0968b2c5 100644
--- a/tests/Core/Files/File/GetMethodParametersTest.php
+++ b/tests/Core/Files/File/GetMethodParametersTest.php
@@ -39,7 +39,7 @@ public function testUnexpectedTokenException($commentString, $targetTokenType)
         $target = $this->getTargetToken($commentString, $targetTokenType);
         self::$phpcsFile->getMethodParameters($target);
 
-    }//end testUnexpectedTokenException()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public static function dataUnexpectedTokenException()
             ],
         ];
 
-    }//end dataUnexpectedTokenException()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ public function testInvalidUse($identifier)
         $use = $this->getTargetToken($identifier, [T_USE]);
         self::$phpcsFile->getMethodParameters($use);
 
-    }//end testInvalidUse()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public static function dataInvalidUse()
             'TraitUse'       => ['/* testTraitUse */'],
         ];
 
-    }//end dataInvalidUse()
+    }
 
 
     /**
@@ -130,7 +130,7 @@ public function testNoParams($commentString, $targetTokenType = [T_FUNCTION, T_C
 
         $this->assertSame([], $result);
 
-    }//end testNoParams()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public static function dataNoParams()
             ],
         ];
 
-    }//end dataNoParams()
+    }
 
 
     /**
@@ -185,7 +185,7 @@ public function testPassByReference()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPassByReference()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ public function testArrayHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrayHint()
+    }
 
 
     /**
@@ -245,7 +245,7 @@ public function testVariable()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testVariable()
+    }
 
 
     /**
@@ -278,7 +278,7 @@ public function testSingleDefaultValue()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testSingleDefaultValue()
+    }
 
 
     /**
@@ -329,7 +329,7 @@ public function testDefaultValues()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testDefaultValues()
+    }
 
 
     /**
@@ -375,7 +375,7 @@ public function testTypeHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testTypeHint()
+    }
 
 
     /**
@@ -405,7 +405,7 @@ public function testSelfTypeHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testSelfTypeHint()
+    }
 
 
     /**
@@ -451,7 +451,7 @@ public function testNullableTypeHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNullableTypeHint()
+    }
 
 
     /**
@@ -484,7 +484,7 @@ public function testBitwiseAndConstantExpressionDefaultValue()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testBitwiseAndConstantExpressionDefaultValue()
+    }
 
 
     /**
@@ -530,7 +530,7 @@ public function testArrowFunction()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunction()
+    }
 
 
     /**
@@ -560,7 +560,7 @@ public function testArrowFunctionReturnByRef()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunctionReturnByRef()
+    }
 
 
     /**
@@ -611,7 +611,7 @@ public function testArrayDefaultValues()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrayDefaultValues()
+    }
 
 
     /**
@@ -659,7 +659,7 @@ public function testConstantDefaultValueSecondParam()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testConstantDefaultValueSecondParam()
+    }
 
 
     /**
@@ -707,7 +707,7 @@ public function testScalarTernaryExpressionInDefault()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testScalarTernaryExpressionInDefault()
+    }
 
 
     /**
@@ -737,7 +737,7 @@ public function testVariadicFunction()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testVariadicFunction()
+    }
 
 
     /**
@@ -767,7 +767,7 @@ public function testVariadicByRefFunction()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testVariadicByRefFunction()
+    }
 
 
     /**
@@ -812,7 +812,7 @@ public function testVariadicFunctionClassType()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testVariadicFunctionClassType()
+    }
 
 
     /**
@@ -857,7 +857,7 @@ public function testNameSpacedTypeDeclaration()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNameSpacedTypeDeclaration()
+    }
 
 
     /**
@@ -1046,7 +1046,7 @@ public function testWithAllTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testWithAllTypes()
+    }
 
 
     /**
@@ -1235,7 +1235,7 @@ public function testArrowFunctionWithAllTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunctionWithAllTypes()
+    }
 
 
     /**
@@ -1304,7 +1304,7 @@ public function testMessyDeclaration()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testMessyDeclaration()
+    }
 
 
     /**
@@ -1334,7 +1334,7 @@ public function testPHP8MixedTypeHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8MixedTypeHint()
+    }
 
 
     /**
@@ -1364,7 +1364,7 @@ public function testPHP8MixedTypeHintNullable()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8MixedTypeHintNullable()
+    }
 
 
     /**
@@ -1394,7 +1394,7 @@ public function testNamespaceOperatorTypeHint()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNamespaceOperatorTypeHint()
+    }
 
 
     /**
@@ -1439,7 +1439,7 @@ public function testPHP8UnionTypesSimple()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesSimple()
+    }
 
 
     /**
@@ -1484,7 +1484,7 @@ public function testPHP8UnionTypesWithSpreadOperatorAndReference()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesWithSpreadOperatorAndReference()
+    }
 
 
     /**
@@ -1517,7 +1517,7 @@ public function testPHP8UnionTypesSimpleWithBitwiseOrInDefault()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesSimpleWithBitwiseOrInDefault()
+    }
 
 
     /**
@@ -1547,7 +1547,7 @@ public function testPHP8UnionTypesTwoClasses()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesTwoClasses()
+    }
 
 
     /**
@@ -1577,7 +1577,7 @@ public function testPHP8UnionTypesAllBaseTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesAllBaseTypes()
+    }
 
 
     /**
@@ -1609,7 +1609,7 @@ public function testPHP8UnionTypesAllPseudoTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesAllPseudoTypes()
+    }
 
 
     /**
@@ -1639,7 +1639,7 @@ public function testPHP8UnionTypesNullable()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesNullable()
+    }
 
 
     /**
@@ -1672,7 +1672,7 @@ public function testPHP8PseudoTypeNull()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeNull()
+    }
 
 
     /**
@@ -1705,7 +1705,7 @@ public function testPHP8PseudoTypeFalse()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeFalse()
+    }
 
 
     /**
@@ -1738,7 +1738,7 @@ public function testPHP8PseudoTypeFalseAndBool()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeFalseAndBool()
+    }
 
 
     /**
@@ -1768,7 +1768,7 @@ public function testPHP8ObjectAndClass()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ObjectAndClass()
+    }
 
 
     /**
@@ -1798,7 +1798,7 @@ public function testPHP8PseudoTypeIterableAndArray()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeIterableAndArray()
+    }
 
 
     /**
@@ -1828,7 +1828,7 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8DuplicateTypeInUnionWhitespaceAndComment()
+    }
 
 
     /**
@@ -1906,7 +1906,7 @@ public function testPHP8ConstructorPropertyPromotionNoTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ConstructorPropertyPromotionNoTypes()
+    }
 
 
     /**
@@ -1978,7 +1978,7 @@ public function testPHP8ConstructorPropertyPromotionWithTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ConstructorPropertyPromotionWithTypes()
+    }
 
 
     /**
@@ -2026,7 +2026,7 @@ public function testPHP8ConstructorPropertyPromotionAndNormalParam()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ConstructorPropertyPromotionAndNormalParam()
+    }
 
 
     /**
@@ -2079,7 +2079,7 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnly()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81ConstructorPropertyPromotionWithReadOnly()
+    }
 
 
     /**
@@ -2133,7 +2133,7 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclarati
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration()
+    }
 
 
     /**
@@ -2187,7 +2187,7 @@ public function testPHP81ConstructorPropertyPromotionWithOnlyReadOnly()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81ConstructorPropertyPromotionWithOnlyReadOnly()
+    }
 
 
     /**
@@ -2303,7 +2303,7 @@ public function testPHP84ConstructorPropertyPromotionWithAsymVisibility()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP84ConstructorPropertyPromotionWithAsymVisibility()
+    }
 
 
     /**
@@ -2336,7 +2336,7 @@ public function testPHP8ConstructorPropertyPromotionGlobalFunction()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ConstructorPropertyPromotionGlobalFunction()
+    }
 
 
     /**
@@ -2387,7 +2387,7 @@ public function testPHP8ConstructorPropertyPromotionAbstractMethod()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ConstructorPropertyPromotionAbstractMethod()
+    }
 
 
     /**
@@ -2421,7 +2421,7 @@ public function testCommentsInParameter()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testCommentsInParameter()
+    }
 
 
     /**
@@ -2517,7 +2517,7 @@ public function testParameterAttributesInFunctionDeclaration()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testParameterAttributesInFunctionDeclaration()
+    }
 
 
     /**
@@ -2562,7 +2562,7 @@ public function testPHP8IntersectionTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8IntersectionTypes()
+    }
 
 
     /**
@@ -2608,7 +2608,7 @@ public function testPHP81IntersectionTypesWithSpreadOperatorAndReference()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81IntersectionTypesWithSpreadOperatorAndReference()
+    }
 
 
     /**
@@ -2638,7 +2638,7 @@ public function testPHP81MoreIntersectionTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81MoreIntersectionTypes()
+    }
 
 
     /**
@@ -2668,7 +2668,7 @@ public function testPHP81IllegalIntersectionTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81IllegalIntersectionTypes()
+    }
 
 
     /**
@@ -2698,7 +2698,7 @@ public function testPHP81NullableIntersectionTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81NullableIntersectionTypes()
+    }
 
 
     /**
@@ -2731,7 +2731,7 @@ public function testPHP82PseudoTypeTrue()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82PseudoTypeTrue()
+    }
 
 
     /**
@@ -2764,7 +2764,7 @@ public function testPHP82PseudoTypeFalseAndTrue()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82PseudoTypeFalseAndTrue()
+    }
 
 
     /**
@@ -2815,7 +2815,7 @@ public function testPHP81NewInInitializers()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81NewInInitializers()
+    }
 
 
     /**
@@ -2864,7 +2864,7 @@ public function testPHP82DNFTypes()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypes()
+    }
 
 
     /**
@@ -2910,7 +2910,7 @@ public function testPHP82DNFTypesWithSpreadOperatorAndReference()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypesWithSpreadOperatorAndReference()
+    }
 
 
     /**
@@ -2940,7 +2940,7 @@ public function testPHP82DNFTypesIllegalNullable()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypesIllegalNullable()
+    }
 
 
     /**
@@ -2970,7 +2970,7 @@ public function testPHP82DNFTypesInArrow()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypesInArrow()
+    }
 
 
     /**
@@ -3003,7 +3003,7 @@ public function testClosure()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosure()
+    }
 
 
     /**
@@ -3048,7 +3048,7 @@ public function testClosureUse()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
 
-    }//end testClosureUse()
+    }
 
 
     /**
@@ -3093,7 +3093,7 @@ public function testClosureUseWithReference()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
 
-    }//end testClosureUseWithReference()
+    }
 
 
     /**
@@ -3141,7 +3141,7 @@ public function testFunctionParamListWithTrailingComma()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testFunctionParamListWithTrailingComma()
+    }
 
 
     /**
@@ -3186,7 +3186,7 @@ public function testClosureParamListWithTrailingComma()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosureParamListWithTrailingComma()
+    }
 
 
     /**
@@ -3231,7 +3231,7 @@ public function testArrowFunctionParamListWithTrailingComma()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunctionParamListWithTrailingComma()
+    }
 
 
     /**
@@ -3276,7 +3276,7 @@ public function testClosureUseWithTrailingComma()
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
 
-    }//end testClosureUseWithTrailingComma()
+    }
 
 
     /**
@@ -3341,7 +3341,7 @@ private function getMethodParametersTestHelper($commentString, $expected, $targe
 
         $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..3f7fffc670 100644
--- a/tests/Core/Files/File/GetMethodPropertiesTest.php
+++ b/tests/Core/Files/File/GetMethodPropertiesTest.php
@@ -37,7 +37,7 @@ public function testNotAFunctionException($commentString, $targetTokenType)
         $next = $this->getTargetToken($commentString, $targetTokenType);
         self::$phpcsFile->getMethodProperties($next);
 
-    }//end testNotAFunctionException()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ public static function dataNotAFunctionException()
             ],
         ];
 
-    }//end dataNotAFunctionException()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ public function testBasicFunction()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testBasicFunction()
+    }
 
 
     /**
@@ -121,7 +121,7 @@ public function testReturnFunction()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnFunction()
+    }
 
 
     /**
@@ -147,7 +147,7 @@ public function testNestedClosure()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNestedClosure()
+    }
 
 
     /**
@@ -172,7 +172,7 @@ public function testBasicMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testBasicMethod()
+    }
 
 
     /**
@@ -197,7 +197,7 @@ public function testPrivateStaticMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPrivateStaticMethod()
+    }
 
 
     /**
@@ -222,7 +222,7 @@ public function testFinalMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testFinalMethod()
+    }
 
 
     /**
@@ -248,7 +248,7 @@ public function testProtectedReturnMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testProtectedReturnMethod()
+    }
 
 
     /**
@@ -274,7 +274,7 @@ public function testPublicReturnMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPublicReturnMethod()
+    }
 
 
     /**
@@ -300,7 +300,7 @@ public function testNullableReturnMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNullableReturnMethod()
+    }
 
 
     /**
@@ -326,7 +326,7 @@ public function testMessyNullableReturnMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testMessyNullableReturnMethod()
+    }
 
 
     /**
@@ -352,7 +352,7 @@ public function testReturnNamespace()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnNamespace()
+    }
 
 
     /**
@@ -378,7 +378,7 @@ public function testReturnMultilineNamespace()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnMultilineNamespace()
+    }
 
 
     /**
@@ -404,7 +404,7 @@ public function testReturnUnqualifiedName()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnUnqualifiedName()
+    }
 
 
     /**
@@ -430,7 +430,7 @@ public function testReturnPartiallyQualifiedName()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnPartiallyQualifiedName()
+    }
 
 
     /**
@@ -455,7 +455,7 @@ public function testAbstractMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testAbstractMethod()
+    }
 
 
     /**
@@ -481,7 +481,7 @@ public function testAbstractReturnMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testAbstractReturnMethod()
+    }
 
 
     /**
@@ -506,7 +506,7 @@ public function testInterfaceMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testInterfaceMethod()
+    }
 
 
     /**
@@ -532,7 +532,7 @@ public function testArrowFunction()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunction()
+    }
 
 
     /**
@@ -558,7 +558,7 @@ public function testReturnTypeStatic()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnTypeStatic()
+    }
 
 
     /**
@@ -584,7 +584,7 @@ public function testReturnTypeNullableStatic()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testReturnTypeNullableStatic()
+    }
 
 
     /**
@@ -610,7 +610,7 @@ public function testPHP8MixedTypeHint()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8MixedTypeHint()
+    }
 
 
     /**
@@ -636,7 +636,7 @@ public function testPHP8MixedTypeHintNullable()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8MixedTypeHintNullable()
+    }
 
 
     /**
@@ -662,7 +662,7 @@ public function testNamespaceOperatorTypeHint()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testNamespaceOperatorTypeHint()
+    }
 
 
     /**
@@ -688,7 +688,7 @@ public function testPHP8UnionTypesSimple()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesSimple()
+    }
 
 
     /**
@@ -714,7 +714,7 @@ public function testPHP8UnionTypesTwoClasses()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesTwoClasses()
+    }
 
 
     /**
@@ -740,7 +740,7 @@ public function testPHP8UnionTypesAllBaseTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesAllBaseTypes()
+    }
 
 
     /**
@@ -768,7 +768,7 @@ public function testPHP8UnionTypesAllPseudoTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesAllPseudoTypes()
+    }
 
 
     /**
@@ -794,7 +794,7 @@ public function testPHP8UnionTypesNullable()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8UnionTypesNullable()
+    }
 
 
     /**
@@ -820,7 +820,7 @@ public function testPHP8PseudoTypeNull()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeNull()
+    }
 
 
     /**
@@ -846,7 +846,7 @@ public function testPHP8PseudoTypeFalse()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeFalse()
+    }
 
 
     /**
@@ -872,7 +872,7 @@ public function testPHP8PseudoTypeFalseAndBool()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeFalseAndBool()
+    }
 
 
     /**
@@ -898,7 +898,7 @@ public function testPHP8ObjectAndClass()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8ObjectAndClass()
+    }
 
 
     /**
@@ -924,7 +924,7 @@ public function testPHP8PseudoTypeIterableAndArray()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8PseudoTypeIterableAndArray()
+    }
 
 
     /**
@@ -950,7 +950,7 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8DuplicateTypeInUnionWhitespaceAndComment()
+    }
 
 
     /**
@@ -976,7 +976,7 @@ public function testPHP81NeverType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81NeverType()
+    }
 
 
     /**
@@ -1002,7 +1002,7 @@ public function testPHP81NullableNeverType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81NullableNeverType()
+    }
 
 
     /**
@@ -1028,7 +1028,7 @@ public function testPHP8IntersectionTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP8IntersectionTypes()
+    }
 
 
     /**
@@ -1054,7 +1054,7 @@ public function testPHP81MoreIntersectionTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81MoreIntersectionTypes()
+    }
 
 
     /**
@@ -1080,7 +1080,7 @@ public function testPHP81IntersectionArrowFunction()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81IntersectionArrowFunction()
+    }
 
 
     /**
@@ -1106,7 +1106,7 @@ public function testPHP81IllegalIntersectionTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81IllegalIntersectionTypes()
+    }
 
 
     /**
@@ -1132,7 +1132,7 @@ public function testPHP81NullableIntersectionTypes()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP81NullableIntersectionTypes()
+    }
 
 
     /**
@@ -1158,7 +1158,7 @@ public function testPHP82PseudoTypeTrue()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82PseudoTypeTrue()
+    }
 
 
     /**
@@ -1184,7 +1184,7 @@ public function testPHP82PseudoTypeFalseAndTrue()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82PseudoTypeFalseAndTrue()
+    }
 
 
     /**
@@ -1210,7 +1210,7 @@ public function testPHP82DNFType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFType()
+    }
 
 
     /**
@@ -1236,7 +1236,7 @@ public function testPHP82DNFTypeAbstractMethod()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypeAbstractMethod()
+    }
 
 
     /**
@@ -1262,7 +1262,7 @@ public function testPHP82DNFTypeIllegalNullable()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypeIllegalNullable()
+    }
 
 
     /**
@@ -1288,7 +1288,7 @@ public function testPHP82DNFTypeClosure()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypeClosure()
+    }
 
 
     /**
@@ -1314,7 +1314,7 @@ public function testPHP82DNFTypeFn()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPHP82DNFTypeFn()
+    }
 
 
     /**
@@ -1342,7 +1342,7 @@ public function testPhpcsIssue1264()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testPhpcsIssue1264()
+    }
 
 
     /**
@@ -1371,7 +1371,7 @@ public function testArrowFunctionArrayReturnValue()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunctionArrayReturnValue()
+    }
 
 
     /**
@@ -1397,7 +1397,7 @@ public function testArrowFunctionReturnByRef()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testArrowFunctionReturnByRef()
+    }
 
 
     /**
@@ -1424,7 +1424,7 @@ public function testFunctionDeclarationNestedInTernaryPHPCS2975()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testFunctionDeclarationNestedInTernaryPHPCS2975()
+    }
 
 
     /**
@@ -1450,7 +1450,7 @@ public function testClosureWithUseNoReturnType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosureWithUseNoReturnType()
+    }
 
 
     /**
@@ -1477,7 +1477,7 @@ public function testClosureWithUseNoReturnTypeIllegalUseProp()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosureWithUseNoReturnTypeIllegalUseProp()
+    }
 
 
     /**
@@ -1503,7 +1503,7 @@ public function testClosureWithUseWithReturnType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosureWithUseWithReturnType()
+    }
 
 
     /**
@@ -1529,7 +1529,7 @@ public function testClosureWithUseMultiParamWithReturnType()
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
 
-    }//end testClosureWithUseMultiParamWithReturnType()
+    }
 
 
     /**
@@ -1556,7 +1556,7 @@ 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..dd7b43d557 100644
--- a/tests/Core/Files/File/GetTokensAsStringTest.php
+++ b/tests/Core/Files/File/GetTokensAsStringTest.php
@@ -31,7 +31,7 @@ public function testNonExistentToken()
 
         self::$phpcsFile->getTokensAsString(100000, 10);
 
-    }//end testNonExistentToken()
+    }
 
 
     /**
@@ -45,7 +45,7 @@ public function testNonIntegerStart()
 
         self::$phpcsFile->getTokensAsString(false, 10);
 
-    }//end testNonIntegerStart()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function testNonIntegerLength()
         $result = self::$phpcsFile->getTokensAsString(10, 1.5);
         $this->assertSame('', $result);
 
-    }//end testNonIntegerLength()
+    }
 
 
     /**
@@ -77,7 +77,7 @@ public function testLengthEqualToOrLessThanZero()
         $result = self::$phpcsFile->getTokensAsString(10, 0);
         $this->assertSame('', $result);
 
-    }//end testLengthEqualToOrLessThanZero()
+    }
 
 
     /**
@@ -95,7 +95,7 @@ public function testLengthBeyondEndOfFile()
             $result
         );
 
-    }//end testLengthBeyondEndOfFile()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function testGetTokensAsString($testMarker, $startTokenType, $length, $ex
         $result = self::$phpcsFile->getTokensAsString($start, $length);
         $this->assertSame($expected, $result);
 
-    }//end testGetTokensAsString()
+    }
 
 
     /**
@@ -270,7 +270,7 @@ public static function dataGetTokensAsString()
             ],
         ];
 
-    }//end dataGetTokensAsString()
+    }
 
 
     /**
@@ -291,7 +291,7 @@ public function testGetOrigContent($testMarker, $startTokenType, $length, $expec
         $result = self::$phpcsFile->getTokensAsString($start, $length, true);
         $this->assertSame($expected, $result);
 
-    }//end testGetOrigContent()
+    }
 
 
     /**
@@ -328,7 +328,7 @@ public static function dataGetOrigContent()
             ],
         ];
 
-    }//end dataGetOrigContent()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/File/IsReferenceTest.php b/tests/Core/Files/File/IsReferenceTest.php
index 4ebc3732e7..80dd26f4a2 100644
--- a/tests/Core/Files/File/IsReferenceTest.php
+++ b/tests/Core/Files/File/IsReferenceTest.php
@@ -37,7 +37,7 @@ public function testNotBitwiseAndToken($testMarker, $targetTokens)
         $target = $this->getTargetToken($testMarker, $targetTokens);
         $this->assertFalse(self::$phpcsFile->isReference($target));
 
-    }//end testNotBitwiseAndToken()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public static function dataNotBitwiseAndToken()
             ],
         ];
 
-    }//end dataNotBitwiseAndToken()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ public function testIsReference($testMarker, $expected)
         $result     = self::$phpcsFile->isReference($bitwiseAnd);
         $this->assertSame($expected, $result);
 
-    }//end testIsReference()
+    }
 
 
     /**
@@ -390,7 +390,7 @@ public static function dataIsReference()
             ],
         ];
 
-    }//end dataIsReference()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Files/FileList/AbstractFileListTestCase.php b/tests/Core/Files/FileList/AbstractFileListTestCase.php
index da9370009d..7b2eec8196 100644
--- a/tests/Core/Files/FileList/AbstractFileListTestCase.php
+++ b/tests/Core/Files/FileList/AbstractFileListTestCase.php
@@ -47,7 +47,7 @@ public static function setUpBeforeClass(): void
             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..9c48b8dd7c 100644
--- a/tests/Core/Files/FileList/AddFileTest.php
+++ b/tests/Core/Files/FileList/AddFileTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
         self::$config->files = [];
         $this->fileList      = new FileList(self::$config, self::$ruleset);
 
-    }//end setUp()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function testAddFile($fileName, $fileObject = null)
             );
         }
 
-    }//end testAddFile()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ public static function dataAddFile()
             ],
         ];
 
-    }//end dataAddFile()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ public function testAddFileShouldNotAddTheSameFileTwice()
         $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..84924d2eef 100644
--- a/tests/Core/Files/FileList/ConstructTest.php
+++ b/tests/Core/Files/FileList/ConstructTest.php
@@ -62,7 +62,7 @@ public function testConstruct($files, $expectedFiles)
             $i++;
         }
 
-    }//end testConstruct()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ 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..55ef99b414 100644
--- a/tests/Core/Files/FileList/FilterDouble.php
+++ b/tests/Core/Files/FileList/FilterDouble.php
@@ -25,7 +25,7 @@ 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..968ed1c65e 100644
--- a/tests/Core/Filters/AbstractFilterTestCase.php
+++ b/tests/Core/Filters/AbstractFilterTestCase.php
@@ -46,7 +46,7 @@ public static function setUpBeforeClass(): void
         self::$config  = new ConfigDouble();
         self::$ruleset = new Ruleset(self::$config);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public static function tearDownAfterClass(): void
             self::$config->__destruct();
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -99,7 +99,7 @@ protected function getMockedClass($className, array $constructorArgs = [], $meth
         return $mockedObj->getMock()
             ->setConstructorArgs($constructorArgs);
 
-    }//end getMockedClass()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ protected function getFilteredResultsAsArray(Filter $filter)
 
         return $files;
 
-    }//end getFilteredResultsAsArray()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ protected static function getBaseDir()
     {
         return dirname(__DIR__, 3);
 
-    }//end getBaseDir()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ protected static function getFakeFileList()
             $basedir . '/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
         ];
 
-    }//end getFakeFileList()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ 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..672e462c70 100644
--- a/tests/Core/Filters/Filter/AcceptTest.php
+++ b/tests/Core/Filters/Filter/AcceptTest.php
@@ -36,7 +36,7 @@ public static function setUpBeforeClass(): void
         self::$config  = new ConfigDouble(["--standard=$standard", '--ignore=*/somethingelse/*']);
         self::$ruleset = new Ruleset(self::$config);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public function testExcludePatterns($inputPaths, $expectedOutput)
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter));
 
-    }//end testExcludePatterns()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ 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..f989fcc791 100644
--- a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
+++ b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
@@ -35,7 +35,7 @@ public function testFileWithoutExtensionIsAcceptedWhenExplicitlyRequested()
 
         $this->assertSame([$fileWithoutExt], $this->getFilteredResultsAsArray($filter));
 
-    }//end testFileWithoutExtensionIsAcceptedWhenExplicitlyRequested()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ 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..f7c6b56169 100644
--- a/tests/Core/Filters/GitModifiedTest.php
+++ b/tests/Core/Filters/GitModifiedTest.php
@@ -48,7 +48,7 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname()
 
         $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj));
 
-    }//end testFileNamePassesAsBasePathWillTranslateToDirname()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function testAcceptOnlyGitModified($inputPaths, $outputGitModified, $expe
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
 
-    }//end testAcceptOnlyGitModified()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ public static function dataAcceptOnlyGitModified()
 
         return $testCases;
 
-    }//end dataAcceptOnlyGitModified()
+    }
 
 
     /**
@@ -230,7 +230,7 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
 
         $this->assertSame($expected, $result);
 
-    }//end testExecAlwaysReturnsArray()
+    }
 
 
     /**
@@ -264,7 +264,7 @@ public static function dataExecAlwaysReturnsArray()
             ],
         ];
 
-    }//end dataExecAlwaysReturnsArray()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Filters/GitStagedTest.php b/tests/Core/Filters/GitStagedTest.php
index 9c43be3782..5d9523aa45 100644
--- a/tests/Core/Filters/GitStagedTest.php
+++ b/tests/Core/Filters/GitStagedTest.php
@@ -48,7 +48,7 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname()
 
         $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj));
 
-    }//end testFileNamePassesAsBasePathWillTranslateToDirname()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function testAcceptOnlyGitStaged($inputPaths, $outputGitStaged, $expected
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
 
-    }//end testAcceptOnlyGitStaged()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ public static function dataAcceptOnlyGitStaged()
 
         return $testCases;
 
-    }//end dataAcceptOnlyGitStaged()
+    }
 
 
     /**
@@ -230,7 +230,7 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
 
         $this->assertSame($expected, $result);
 
-    }//end testExecAlwaysReturnsArray()
+    }
 
 
     /**
@@ -264,7 +264,7 @@ public static function dataExecAlwaysReturnsArray()
             ],
         ];
 
-    }//end dataExecAlwaysReturnsArray()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Fixer/FixFileReturnValueTest.php b/tests/Core/Fixer/FixFileReturnValueTest.php
index 6266fb4181..f919242191 100644
--- a/tests/Core/Fixer/FixFileReturnValueTest.php
+++ b/tests/Core/Fixer/FixFileReturnValueTest.php
@@ -40,7 +40,7 @@ public function testReturnValueIsTrueWhenFileWasFixed()
 
         $this->assertTrue($fixed);
 
-    }//end testReturnValueIsTrueWhenFileWasFixed()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public function testReturnValueIsFalse($standard)
 
         $this->assertFalse($fixed);
 
-    }//end testReturnValueIsFalse()
+    }
 
 
     /**
@@ -83,7 +83,7 @@ public static function dataReturnValueIsFalse()
             ],
         ];
 
-    }//end dataReturnValueIsFalse()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Fixer/GenerateDiffTest.php b/tests/Core/Fixer/GenerateDiffTest.php
index 87d7f1fc26..0171e97711 100644
--- a/tests/Core/Fixer/GenerateDiffTest.php
+++ b/tests/Core/Fixer/GenerateDiffTest.php
@@ -57,7 +57,7 @@ public static function setUpBeforeClass(): void
         self::$phpcsFile->parse();
         self::$phpcsFile->fixer->startFile(self::$phpcsFile);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function testGenerateDiffNoFile()
 
         $this->assertSame('', $diff);
 
-    }//end testGenerateDiffNoFile()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ public function testGenerateDiff($filePath)
 
         $this->assertStringEqualsFile($expectedDiffFile, $diff);
 
-    }//end testGenerateDiff()
+    }
 
 
     /**
@@ -139,7 +139,7 @@ public static function dataGenerateDiff()
             ],
         ];
 
-    }//end dataGenerateDiff()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ public function testGenerateDiffColoured()
 
         $this->assertSame($expected, $diff);
 
-    }//end testGenerateDiffColoured()
+    }
 
 
     /**
@@ -219,7 +219,7 @@ public function testGenerateDiffDifferentLineEndings()
 
         $this->assertSame($expected, $diff);
 
-    }//end testGenerateDiffDifferentLineEndings()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Generators/GeneratorTest.php b/tests/Core/Generators/GeneratorTest.php
index d7864272d5..2adc8dbd6c 100644
--- a/tests/Core/Generators/GeneratorTest.php
+++ b/tests/Core/Generators/GeneratorTest.php
@@ -43,7 +43,7 @@ public function testConstructor($standard, array $expected)
         $generator = new MockGenerator($ruleset);
         $this->assertSame($expected, $generator->docFiles);
 
-    }//end testConstructor()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public static function dataConstructor()
             ],
         ];
 
-    }//end dataConstructor()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public function testGeneratingInvalidDocsResultsInException()
         $generator = new MockGenerator($ruleset);
         $generator->generate();
 
-    }//end testGeneratingInvalidDocsResultsInException()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ public function testGeneratingDocs($standard, $expected)
         $generator = new MockGenerator($ruleset);
         $generator->generate();
 
-    }//end testGeneratingDocs()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ public static function dataGeneratingDocs()
             ],
         ];
 
-    }//end dataGeneratingDocs()
+    }
 
 
     /**
@@ -193,7 +193,7 @@ 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..582d065334 100644
--- a/tests/Core/Generators/HTMLTest.php
+++ b/tests/Core/Generators/HTMLTest.php
@@ -43,7 +43,7 @@ public function testGeneratingInvalidDocsResultsInException()
         $generator = new HTML($ruleset);
         $generator->generate();
 
-    }//end testGeneratingInvalidDocsResultsInException()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public function testDocs($standard, $pathToExpected)
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
 
-    }//end testDocs()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ public static function dataDocs()
             ],
         ];
 
-    }//end dataDocs()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function testDocSpecifics($sniffs, $pathToExpected)
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
 
-    }//end testDocSpecifics()
+    }
 
 
     /**
@@ -252,7 +252,7 @@ public static function dataDocSpecifics()
             ],
         ];
 
-    }//end dataDocSpecifics()
+    }
 
 
     /**
@@ -278,7 +278,7 @@ public function testAnchorLinks()
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
 
-    }//end testAnchorLinks()
+    }
 
 
     /**
@@ -308,7 +308,7 @@ public function testFooter()
             $this->assertRegExp($regex, $footer);
         }
 
-    }//end testFooter()
+    }
 
 
     /**
@@ -333,7 +333,7 @@ public function testFooterResetsErrorReportingToOriginalSetting()
 
         $this->assertSame($expected, error_reporting());
 
-    }//end testFooterResetsErrorReportingToOriginalSetting()
+    }
 
 
     /**
@@ -373,7 +373,7 @@ 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..802d0c4c3a 100644
--- a/tests/Core/Generators/MarkdownTest.php
+++ b/tests/Core/Generators/MarkdownTest.php
@@ -43,7 +43,7 @@ public function testGeneratingInvalidDocsResultsInException()
         $generator = new Markdown($ruleset);
         $generator->generate();
 
-    }//end testGeneratingInvalidDocsResultsInException()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public function testDocs($standard, $pathToExpected)
         $generator = new MarkdownDouble($ruleset);
         $generator->generate();
 
-    }//end testDocs()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ public static function dataDocs()
             ],
         ];
 
-    }//end dataDocs()
+    }
 
 
     /**
@@ -127,7 +127,7 @@ public function testDocSpecifics($sniffs, $pathToExpected)
         $generator = new MarkdownDouble($ruleset);
         $generator->generate();
 
-    }//end testDocSpecifics()
+    }
 
 
     /**
@@ -252,7 +252,7 @@ public static function dataDocSpecifics()
             ],
         ];
 
-    }//end dataDocSpecifics()
+    }
 
 
     /**
@@ -280,7 +280,7 @@ public function testFooter()
             $this->assertRegExp($regex, $footer);
         }
 
-    }//end testFooter()
+    }
 
 
     /**
@@ -305,7 +305,7 @@ public function testFooterResetsErrorReportingToOriginalSetting()
 
         $this->assertSame($expected, error_reporting());
 
-    }//end testFooterResetsErrorReportingToOriginalSetting()
+    }
 
 
     /**
@@ -345,7 +345,7 @@ 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..4ed723a824 100644
--- a/tests/Core/Generators/TextTest.php
+++ b/tests/Core/Generators/TextTest.php
@@ -49,7 +49,7 @@ public function testDocs($standard, $pathToExpected)
         $generator = new Text($ruleset);
         $generator->generate();
 
-    }//end testDocs()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ public static function dataDocs()
             ],
         ];
 
-    }//end dataDocs()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public function testDocSpecifics($sniffs, $pathToExpected)
         $generator = new Text($ruleset);
         $generator->generate();
 
-    }//end testDocSpecifics()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ public static function dataDocSpecifics()
             ],
         ];
 
-    }//end dataDocSpecifics()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Reporter/MagicMethodsTest.php b/tests/Core/Reporter/MagicMethodsTest.php
index d0d3f0a471..5d209b2734 100644
--- a/tests/Core/Reporter/MagicMethodsTest.php
+++ b/tests/Core/Reporter/MagicMethodsTest.php
@@ -36,7 +36,7 @@ public function testMagicIssetReturnsFalseForUnknownProperty()
 
         $this->assertFalse(isset($reporter->unknown));
 
-    }//end testMagicIssetReturnsFalseForUnknownProperty()
+    }
 
 
     /**
@@ -51,7 +51,7 @@ public function testMagicGetThrowsExceptionForUnsupportedProperty()
 
         (new Reporter(new ConfigDouble()))->invalid;
 
-    }//end testMagicGetThrowsExceptionForUnsupportedProperty()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function testMagicGetReturnsValueForSupportedProperty($propertyName, $set
         $this->assertTrue(isset($reporter->$propertyName));
         $this->assertSame($expectedValue, $reporter->$propertyName);
 
-    }//end testMagicGetReturnsValueForSupportedProperty()
+    }
 
 
     /**
@@ -112,7 +112,7 @@ public static function dataMagicGetReturnsValueForSupportedProperty()
             ],
         ];
 
-    }//end dataMagicGetReturnsValueForSupportedProperty()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ public function testMagicSetThrowsException()
         $reporter = new Reporter(new ConfigDouble());
         $reporter->totalFixable = 10;
 
-    }//end testMagicSetThrowsException()
+    }
 
 
     /**
@@ -144,7 +144,7 @@ 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..c9616321dc 100644
--- a/tests/Core/Ruleset/AbstractRulesetTestCase.php
+++ b/tests/Core/Ruleset/AbstractRulesetTestCase.php
@@ -34,7 +34,7 @@ protected function assertXObjectHasProperty($propertyName, $object, $message = '
             $this->assertObjectHasAttribute($propertyName, $object, $message);
         }
 
-    }//end assertXObjectHasProperty()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ protected function assertXObjectNotHasProperty($propertyName, $object, $message
             $this->assertObjectNotHasAttribute($propertyName, $object, $message);
         }
 
-    }//end assertXObjectNotHasProperty()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ protected function expectRuntimeExceptionMessage($message)
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($message);
 
-    }//end expectRuntimeExceptionMessage()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ protected function expectRuntimeExceptionRegex($regex)
             $this->expectExceptionMessageRegExp($regex);
         }
 
-    }//end expectRuntimeExceptionRegex()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ConstructorTest.php b/tests/Core/Ruleset/ConstructorTest.php
index 43cc724c8f..fe88569e16 100644
--- a/tests/Core/Ruleset/ConstructorTest.php
+++ b/tests/Core/Ruleset/ConstructorTest.php
@@ -40,7 +40,7 @@ public function testHandlingStandardsPassedViaCLI($cliArgs, $expected)
 
         $this->assertSame($expected, $ruleset->name);
 
-    }//end testHandlingStandardsPassedViaCLI()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public static function dataHandlingStandardsPassedViaCLI()
             ],
         ];
 
-    }//end dataHandlingStandardsPassedViaCLI()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ public function testStandardsAreRegisteredWithAutoloader($cliArgs, $expected)
             $this->assertSame($namespacedStandardName, $autoloadPaths[$path], 'Expected (namespaced) standard name does not match');
         }
 
-    }//end testStandardsAreRegisteredWithAutoloader()
+    }
 
 
     /**
@@ -162,7 +162,7 @@ public static function dataStandardsAreRegisteredWithAutoloader()
 
         return $data;
 
-    }//end dataStandardsAreRegisteredWithAutoloader()
+    }
 
 
     /**
@@ -190,7 +190,7 @@ public function testCachingVersusRestrictions($cliArgs, $cache, $expected)
 
         $this->assertSame($expected, $actual);
 
-    }//end testCachingVersusRestrictions()
+    }
 
 
     /**
@@ -268,7 +268,7 @@ public static function dataCachingVersusRestrictions()
 
         ];
 
-    }//end dataCachingVersusRestrictions()
+    }
 
 
     /**
@@ -286,7 +286,7 @@ public function testNoSniffsRegisteredException()
 
         new Ruleset($config);
 
-    }//end testNoSniffsRegisteredException()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/DisplayCachedMessagesTest.php b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
index 6431a59884..c7ee39e14b 100644
--- a/tests/Core/Ruleset/DisplayCachedMessagesTest.php
+++ b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
@@ -45,7 +45,7 @@ public function testDisplayCachedMessagesStaysSilentWithoutErrors()
 
         $this->assertStderrOutputSameString('');
 
-    }//end testDisplayCachedMessagesStaysSilentWithoutErrors()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function testBlockingErrorsAreDisplayedViaAnException($messages, $expecte
 
         $this->invokeDisplayCachedMessages($ruleset);
 
-    }//end testBlockingErrorsAreDisplayedViaAnException()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public static function dataBlockingErrorsAreDisplayedViaAnException()
             ],
         ];
 
-    }//end dataBlockingErrorsAreDisplayedViaAnException()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ public function testNonBlockingErrorsGenerateOutput($messages, $expected)
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testNonBlockingErrorsGenerateOutput()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public static function dataNonBlockingErrorsGenerateOutput()
             ],
         ];
 
-    }//end dataNonBlockingErrorsGenerateOutput()
+    }
 
 
     /**
@@ -200,7 +200,7 @@ public function testBlockingErrorsAlwaysShow($configArgs)
 
         $this->invokeDisplayCachedMessages($ruleset);
 
-    }//end testBlockingErrorsAlwaysShow()
+    }
 
 
     /**
@@ -224,7 +224,7 @@ public function testNonBlockingErrorsDoNotShowUnderSpecificCircumstances($config
 
         $this->assertStderrOutputSameString('');
 
-    }//end testNonBlockingErrorsDoNotShowUnderSpecificCircumstances()
+    }
 
 
     /**
@@ -255,7 +255,7 @@ public static function dataSelectiveDisplayOfMessages()
 
         return $data;
 
-    }//end dataSelectiveDisplayOfMessages()
+    }
 
 
     /**
@@ -274,7 +274,7 @@ private function getPlainRuleset()
 
         return $ruleset;
 
-    }//end getPlainRuleset()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ private function mockCachedMessages(Ruleset $ruleset, $messages)
 
         (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false);
 
-    }//end mockCachedMessages()
+    }
 
 
     /**
@@ -314,7 +314,7 @@ private function invokeDisplayCachedMessages(Ruleset $ruleset)
         $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..6312453519 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
@@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void
     {
         self::$homepath = getenv('HOME');
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ public static function tearDownAfterClass(): void
             putenv('HOME');
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ protected function setUp(): void
         $fakeHomePath = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'FakeHomePath';
         putenv("HOME=$fakeHomePath");
 
-    }//end setUp()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ public function testHomePathRefGetsExpandedAndFindsSniff()
 
         $this->assertSame($expected, $ruleset->sniffCodes);
 
-    }//end testHomePathRefGetsExpandedAndFindsSniff()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid()
 
         new Ruleset($config);
 
-    }//end testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
index 67283d1acc..d7be439d02 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
@@ -38,7 +38,7 @@ public function testInternalRefDoesNotGetExpanded()
 
         $this->assertSame($expected, $ruleset->sniffCodes);
 
-    }//end testInternalRefDoesNotGetExpanded()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ 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..918ede91ce 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
@@ -42,7 +42,7 @@ public function testRulesetRelativePathReferences()
 
         $this->assertSame($expected, $ruleset->sniffCodes);
 
-    }//end testRulesetRelativePathReferences()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function testUnresolvableReferenceThrowsException($standard, $replacement
 
         new Ruleset($config);
 
-    }//end testUnresolvableReferenceThrowsException()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ 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..116ac50dbb 100644
--- a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
+++ b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
@@ -61,7 +61,7 @@ public function testExpandSniffDirectory()
 
         $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..e89d69276a 100644
--- a/tests/Core/Ruleset/ExplainTest.php
+++ b/tests/Core/Ruleset/ExplainTest.php
@@ -54,7 +54,7 @@ public function testExplain()
 
         $ruleset->explain();
 
-    }//end testExplain()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function testExplainAlwaysDisplaysCompleteSniffName()
 
         $ruleset->explain();
 
-    }//end testExplainAlwaysDisplaysCompleteSniffName()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function testExplainSingleSniff()
 
         $ruleset->explain();
 
-    }//end testExplainSingleSniff()
+    }
 
 
     /**
@@ -162,7 +162,7 @@ public function testExplainCustomRuleset()
 
         $ruleset->explain();
 
-    }//end testExplainCustomRuleset()
+    }
 
 
     /**
@@ -207,7 +207,7 @@ public function testExplainWithDeprecatedSniffs()
 
         $ruleset->explain();
 
-    }//end testExplainWithDeprecatedSniffs()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/GetIgnorePatternsTest.php b/tests/Core/Ruleset/GetIgnorePatternsTest.php
index ec1de10d2d..177fb56862 100644
--- a/tests/Core/Ruleset/GetIgnorePatternsTest.php
+++ b/tests/Core/Ruleset/GetIgnorePatternsTest.php
@@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void
         $config        = new ConfigDouble(["--standard=$standard"]);
         self::$ruleset = new Ruleset($config);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ public function testGetIgnorePatterns($listener, $expected)
     {
         $this->assertSame($expected, self::$ruleset->getIgnorePatterns($listener));
 
-    }//end testGetIgnorePatterns()
+    }
 
 
     /**
@@ -103,7 +103,7 @@ public static function dataGetIgnorePatterns()
             ],
         ];
 
-    }//end dataGetIgnorePatterns()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/GetIncludePatternsTest.php b/tests/Core/Ruleset/GetIncludePatternsTest.php
index b162f4a98d..e75e7f0a4a 100644
--- a/tests/Core/Ruleset/GetIncludePatternsTest.php
+++ b/tests/Core/Ruleset/GetIncludePatternsTest.php
@@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void
         $config        = new ConfigDouble(["--standard=$standard"]);
         self::$ruleset = new Ruleset($config);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ public function testGetIncludePatterns($listener, $expected)
     {
         $this->assertSame($expected, self::$ruleset->getIncludePatterns($listener));
 
-    }//end testGetIncludePatterns()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public static function dataGetIncludePatterns()
             ],
         ];
 
-    }//end dataGetIncludePatterns()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
index b20fb7aebc..3cdd27a003 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
@@ -64,7 +64,7 @@ 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..9f0c18afde 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void
             self::$ruleset = new Ruleset($config);
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ public function testSniffWhereRegisterDoesNotReturnAnArrayThrowsException()
         $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()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ public function testSniffWithRegisterMethodReturningEmptyArrayIsSilentlyIgnored(
             );
         }
 
-    }//end testSniffWithRegisterMethodReturningEmptyArrayIsSilentlyIgnored()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function testRegistersSniffsToListenToTokens($sniffClass, $expectedCount)
 
         $this->assertSame($expectedCount, $counter);
 
-    }//end testRegistersSniffsToListenToTokens()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public static function dataSniffListensToTokenss()
             ],
         ];
 
-    }//end dataSniffListensToTokenss()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public function testRegistersWhenADeprecatedSniffIsLoaded()
         $this->assertIsArray($actualValue);
         $this->assertCount(1, $actualValue);
 
-    }//end testRegistersWhenADeprecatedSniffIsLoaded()
+    }
 
 
     /**
@@ -196,7 +196,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()
+    }
 
 
     /**
@@ -220,7 +220,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()
+    }
 
 
     /**
@@ -250,7 +250,7 @@ public static function dataTriggersPropertySettingWhenPropertiesProvided()
             ],
         ];
 
-    }//end dataTriggersPropertySettingWhenPropertiesProvided()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ public function testSetsClassAndSourceIndexes()
             }//end foreach
         }//end foreach
 
-    }//end testSetsClassAndSourceIndexes()
+    }
 
 
     /**
@@ -332,7 +332,7 @@ public function testSetsIncludePatternsToEmptyArrayByDefault()
             }
         }//end foreach
 
-    }//end testSetsIncludePatternsToEmptyArrayByDefault()
+    }
 
 
     /**
@@ -367,7 +367,7 @@ public function testSetsIgnorePatternsToEmptyArrayByDefault()
             }
         }//end foreach
 
-    }//end testSetsIgnorePatternsToEmptyArrayByDefault()
+    }
 
 
     /**
@@ -414,7 +414,7 @@ public function testSetsIncludeAndIgnorePatterns($token, $sniffClass, $patternTy
             sprintf('Unexpected value for "%s" key for sniff class %s for token %s', $patternType, $sniffClass, Tokens::tokenName($token))
         );
 
-    }//end testSetsIncludeAndIgnorePatterns()
+    }
 
 
     /**
@@ -444,7 +444,7 @@ public static function dataSetsIncludeAndIgnorePatterns()
             ],
         ];
 
-    }//end dataSetsIncludeAndIgnorePatterns()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
index 17e2a24235..f362352dd9 100644
--- a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
+++ b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
@@ -37,7 +37,7 @@ public function testInvalidTypeHandling()
 
         new Ruleset($config);
 
-    }//end testInvalidTypeHandling()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
index b7a4d67695..83989c3bc2 100644
--- a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
@@ -44,7 +44,7 @@ protected function setUp(): void
             self::$ruleset = new Ruleset($config);
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -76,7 +76,7 @@ public function testShouldProcessSeverityCsonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
 
-    }//end testShouldProcessSeverityCsonly()
+    }
 
 
     /**
@@ -107,7 +107,7 @@ public function testShouldProcessSeverityCbfonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertRulesetPropertySame(4, $sniffCode, $key);
 
-    }//end testShouldProcessSeverityCbfonly()
+    }
 
 
     /**
@@ -136,7 +136,7 @@ public function testShouldProcessTypeCsonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
 
-    }//end testShouldProcessTypeCsonly()
+    }
 
 
     /**
@@ -167,7 +167,7 @@ public function testShouldProcessTypeCbfonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertRulesetPropertySame('error', $sniffCode, $key);
 
-    }//end testShouldProcessTypeCbfonly()
+    }
 
 
     /**
@@ -196,7 +196,7 @@ public function testShouldProcessMessageCsonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
 
-    }//end testShouldProcessMessageCsonly()
+    }
 
 
     /**
@@ -230,7 +230,7 @@ public function testShouldProcessMessageCbfonly()
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertRulesetPropertySame('A different warning but only for phpcbf', $sniffCode, $key);
 
-    }//end testShouldProcessMessageCbfonly()
+    }
 
 
     /**
@@ -261,7 +261,7 @@ public function testShouldProcessIncludePatternCsonly()
         $sniffCode = 'PSR2.Files.ClosingTag';
         $this->assertArrayNotHasKey($sniffCode, self::$ruleset->includePatterns, "Sniff $sniffCode was registered");
 
-    }//end testShouldProcessIncludePatternCsonly()
+    }
 
 
     /**
@@ -294,7 +294,7 @@ public function testShouldProcessIncludePatternCbfonly()
         $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()
+    }
 
 
     /**
@@ -325,7 +325,7 @@ public function testShouldProcessExcludePatternCsonly()
         $sniffCode = 'PSR2.Methods.FunctionClosingBrace';
         $this->assertArrayNotHasKey($sniffCode, self::$ruleset->ignorePatterns, "Sniff $sniffCode was registered");
 
-    }//end testShouldProcessExcludePatternCsonly()
+    }
 
 
     /**
@@ -358,7 +358,7 @@ public function testShouldProcessExcludePatternCbfonly()
         $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()
+    }
 
 
     /**
@@ -394,7 +394,7 @@ public function testShouldProcessPropertiesCsonly()
         $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName;
         $this->assertSame($propertyDefault, $actualValue, 'cbf-only property change directive was applied');
 
-    }//end testShouldProcessPropertiesCsonly()
+    }
 
 
     /**
@@ -432,7 +432,7 @@ public function testShouldProcessPropertiesCbfonly()
         $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName;
         $this->assertSame($propertyChanged, $actualValue, 'cbf-only property change directive not applied');
 
-    }//end testShouldProcessPropertiesCbfonly()
+    }
 
 
     /**
@@ -474,7 +474,7 @@ public function testShouldProcessPropertyCsonly()
         $this->assertXObjectHasProperty($propertyName, $sniffObject);
         $this->assertSame($expectedDefault, $sniffObject->$propertyName, 'cbf-only property change directive was applied');
 
-    }//end testShouldProcessPropertyCsonly()
+    }
 
 
     /**
@@ -518,7 +518,7 @@ public function testShouldProcessPropertyCbfonly()
         $this->assertXObjectHasProperty($propertyName, $sniffObject);
         $this->assertSame($expected, $sniffObject->$propertyName, 'cbf-only property change directive not applied');
 
-    }//end testShouldProcessPropertyCbfonly()
+    }
 
 
     /**
@@ -546,7 +546,7 @@ public function testShouldProcessElementCsonly()
 
         $this->verifyShouldProcessElement($expected);
 
-    }//end testShouldProcessElementCsonly()
+    }
 
 
     /**
@@ -576,7 +576,7 @@ public function testShouldProcessElementCbfonly()
 
         $this->verifyShouldProcessElement($expected);
 
-    }//end testShouldProcessElementCbfonly()
+    }
 
 
     /**
@@ -602,7 +602,7 @@ private function verifyShouldProcessElement($expected)
         $actualValue = $sniffObject->$propertyName;
         $this->assertSame($expected, $actualValue, 'Selective element directives not applied correctly');
 
-    }//end verifyShouldProcessElement()
+    }
 
 
     /**
@@ -619,7 +619,7 @@ private function assertHasRulesetDirective($sniffCode, $key)
         $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()
+    }
 
 
     /**
@@ -639,7 +639,7 @@ private function assertNotHasRulesetDirective($sniffCode, $key)
             $this->fail("Directive $key is registered for sniff $sniffCode");
         }
 
-    }//end assertNotHasRulesetDirective()
+    }
 
 
     /**
@@ -658,7 +658,7 @@ 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..40e4490ce4 100644
--- a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
@@ -82,7 +82,7 @@ public function testShouldProcessAutoloadCsonly()
             'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was loaded, while it shouldn\'t have been'
         );
 
-    }//end testShouldProcessAutoloadCsonly()
+    }
 
 
     /**
@@ -140,7 +140,7 @@ public function testShouldProcessAutoloadCbfonly()
             'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was not loaded'
         );
 
-    }//end testShouldProcessAutoloadCbfonly()
+    }
 
 
     /**
@@ -158,7 +158,7 @@ public function testFileNotFoundException()
         $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..e87d2dc0e7 100644
--- a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
@@ -48,7 +48,7 @@ public function testBrokenRulesetEmptyFile()
 
         new Ruleset($config);
 
-    }//end testBrokenRulesetEmptyFile()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public function testBrokenRulesetSingleError()
 
         new Ruleset($config);
 
-    }//end testBrokenRulesetSingleError()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public function testBrokenRulesetMultiError()
 
         new Ruleset($config);
 
-    }//end testBrokenRulesetMultiError()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
index bd3a0261a7..9470b8dd42 100644
--- a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
             new Ruleset(self::$config);
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public static function tearDownAfterClass(): void
             self::$config->__destruct();
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function testCliArgs($name, $expected)
     {
         $this->assertSame($expected, self::$config->{$name});
 
-    }//end testCliArgs()
+    }
 
 
     /**
@@ -153,7 +153,7 @@ public static function dataCliArgs()
             ],
         ];
 
-    }//end dataCliArgs()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public function testCliArgsWithPaths($name, $expected)
 
         $this->assertSame($expected, $actual);
 
-    }//end testCliArgsWithPaths()
+    }
 
 
     /**
@@ -211,7 +211,7 @@ public static function dataCliArgsWithPaths()
 
         return $data;
 
-    }//end dataCliArgsWithPaths()
+    }
 
 
     /**
@@ -233,7 +233,7 @@ 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..80ca3ccd47 100644
--- a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
             new Ruleset(self::$config);
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public static function tearDownAfterClass(): void
             self::$config->__destruct();
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public function testConfigDirectives($name, $expected)
     {
         $this->assertSame($expected, self::$config->getConfigData($name));
 
-    }//end testConfigDirectives()
+    }
 
 
     /**
@@ -147,7 +147,7 @@ public static function dataConfigDirectives()
             ],
         ];
 
-    }//end dataConfigDirectives()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
index 44b4c8439c..f85d3ef929 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
@@ -65,7 +65,7 @@ public static function setUpBeforeClass(): void
             }
         }
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ protected function setUp(): void
             self::$initialized = true;
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ public static function tearDownAfterClass(): void
             ini_set($name, $value);
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public function testIniDirectives($name, $expected)
     {
         $this->assertSame($expected, ini_get($name));
 
-    }//end testIniDirectives()
+    }
 
 
     /**
@@ -169,7 +169,7 @@ public static function dataIniDirectives()
             ],
         ];
 
-    }//end dataIniDirectives()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
index dd5d7101fc..22dff3e068 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
@@ -48,7 +48,7 @@ protected function tearDown(): void
             @ini_set($this->currentOption, $this->originalValue);
         }
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public function testIniValueIsUpdated()
 
         $this->assertSame($expected, ini_get($this->currentOption));
 
-    }//end testIniValueIsUpdated()
+    }
 
 
     /**
@@ -103,7 +103,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()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
             ],
         ];
 
-    }//end dataIniValueCannotBeUpdatedAtRuntime()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
index 2606ea48b2..121dd8141b 100644
--- a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
@@ -63,7 +63,7 @@ public static function setUpBeforeClass(): void
             }
         }
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ protected function setUp(): void
             self::$ruleset = new Ruleset(self::$config);
         }
 
-    }//end setUp()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ public static function tearDownAfterClass(): void
             ini_set($name, $value);
         }
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -125,7 +125,7 @@ public function testShouldProcessConfigCsonly()
         $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()
+    }
 
 
     /**
@@ -146,7 +146,7 @@ public function testShouldProcessConfigCbfonly()
         $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()
+    }
 
 
     /**
@@ -173,7 +173,7 @@ public function testShouldProcessArgCsonly()
         $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()
+    }
 
 
     /**
@@ -202,7 +202,7 @@ public function testShouldProcessArgCbfonly()
         $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()
+    }
 
 
     /**
@@ -223,7 +223,7 @@ public function testShouldProcessIniCsonly()
         $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()
+    }
 
 
     /**
@@ -245,7 +245,7 @@ public function testShouldProcessIniCbfonly()
         $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()
+    }
 
 
     /**
@@ -267,7 +267,7 @@ public function testShouldProcessExcludePatternCsonly()
 
         $this->assertSame($expected, self::$ruleset->ignorePatterns);
 
-    }//end testShouldProcessExcludePatternCsonly()
+    }
 
 
     /**
@@ -291,7 +291,7 @@ public function testShouldProcessExcludePatternCbfonly()
 
         $this->assertSame($expected, self::$ruleset->ignorePatterns);
 
-    }//end testShouldProcessExcludePatternCbfonly()
+    }
 
 
     /**
@@ -310,7 +310,7 @@ public function testShouldProcessRuleCsonly()
         $this->assertArrayHasKey('Generic.Arrays.ArrayIndent', self::$ruleset->sniffCodes);
         $this->assertArrayNotHasKey('PSR2.Classes.ClassDeclaration', self::$ruleset->sniffCodes);
 
-    }//end testShouldProcessRuleCsonly()
+    }
 
 
     /**
@@ -331,7 +331,7 @@ public function testShouldProcessRuleCbfonly()
         $this->assertArrayNotHasKey('Generic.Arrays.ArrayIndent', self::$ruleset->sniffCodes);
         $this->assertArrayHasKey('PSR2.Classes.ClassDeclaration', self::$ruleset->sniffCodes);
 
-    }//end testShouldProcessRuleCbfonly()
+    }
 
 
     /**
@@ -354,7 +354,7 @@ public function testShouldProcessRuleExcludeCsonly()
 
         $this->assertSame($expected, self::$ruleset->ruleset);
 
-    }//end testShouldProcessRuleExcludeCsonly()
+    }
 
 
     /**
@@ -379,7 +379,7 @@ 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..6b985f737a 100644
--- a/tests/Core/Ruleset/ProcessRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetTest.php
@@ -39,7 +39,7 @@ public function testSniffsFileNotDirectory()
 
         $this->assertSame($expected, $ruleset->sniffCodes);
 
-    }//end testSniffsFileNotDirectory()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function testAutoExpandSniffsDirectory()
 
         $this->assertSame($expected, $actual);
 
-    }//end testAutoExpandSniffsDirectory()
+    }
 
 
     /**
@@ -112,7 +112,7 @@ public function testExcludeSniffGroup()
 
         $this->assertSame($expected, $actual);
 
-    }//end testExcludeSniffGroup()
+    }
 
 
     /*
@@ -140,7 +140,7 @@ public function testIniWithoutValue()
 
         $this->assertSame('1', $actualValue);
 
-    }//end testIniWithoutValue()
+    }
 
 
     /**
@@ -169,7 +169,7 @@ public function testIncludeSingleErrorCode()
         $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()
+    }
 
 
     /**
@@ -203,7 +203,7 @@ public function testErrorCodeIncludeAfterExclude()
         $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()
+    }
 
 
     /**
@@ -220,7 +220,7 @@ public function testRuleWithoutRefIsIgnored()
         $this->assertArrayNotHasKey($sniffCode, $ruleset->sniffCodes, "Sniff $sniffCode registered");
         $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted");
 
-    }//end testRuleWithoutRefIsIgnored()
+    }
 
 
     /**
@@ -240,7 +240,7 @@ public function testRuleExcludeWithoutNameIsIgnored()
         $sniffCode = 'Generic.PHP.BacktickOperator.Found';
         $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted");
 
-    }//end testRuleExcludeWithoutNameIsIgnored()
+    }
 
 
     /**
@@ -261,7 +261,7 @@ 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..db7d2a29c2 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
@@ -48,7 +48,7 @@ public function testUsingOldSchoolArrayFormatThrowsError()
         $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..a11bfcbf9d 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingTest.php
@@ -56,7 +56,7 @@ public function testTypeHandlingWhenSetViaRuleset($propertyName, $expected)
 
         $this->assertSame($expected, $sniffObject->$propertyName);
 
-    }//end testTypeHandlingWhenSetViaRuleset()
+    }
 
 
     /**
@@ -75,7 +75,7 @@ public function testTypeHandlingWhenSetInline($propertyName, $expected)
 
         $this->assertSame($expected, $sniffObject->$propertyName);
 
-    }//end testTypeHandlingWhenSetInline()
+    }
 
 
     /**
@@ -190,7 +190,7 @@ public static function dataTypeHandling()
             ],
         ];
 
-    }//end dataTypeHandling()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ public static function dataArrayPropertyExtending()
             ],
         ];
 
-    }//end dataArrayPropertyExtending()
+    }
 
 
     /**
@@ -327,7 +327,7 @@ private function getSniffObjectForRuleset()
 
         return $sniffObject;
 
-    }//end getSniffObjectForRuleset()
+    }
 
 
     /**
@@ -364,7 +364,7 @@ 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..c095aef43d 100644
--- a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
@@ -37,7 +37,7 @@ public function testNoNoticesForSniffsImplementingInterface()
 
         new Ruleset($config);
 
-    }//end testNoNoticesForSniffsImplementingInterface()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ public function testErrorWhenSniffDoesntImplementInterface()
 
         new Ruleset($config);
 
-    }//end testErrorWhenSniffDoesntImplementInterface()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
index c06385faab..e4d1e7acad 100644
--- a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
@@ -40,7 +40,7 @@ public static function setUpBeforeClass(): void
         $standard     = __DIR__ . '/RegisterSniffsRemovedTokenizersTest.xml';
         self::$config = new ConfigDouble(["--standard=$standard"]);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function testUnsupportedTokenizersTriggerError($expected)
 
         new Ruleset(self::$config);
 
-    }//end testUnsupportedTokenizersTriggerError()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public static function dataUnsupportedTokenizersTriggerError()
             ],
         ];
 
-    }//end dataUnsupportedTokenizersTriggerError()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/RegisterSniffsTest.php b/tests/Core/Ruleset/RegisterSniffsTest.php
index 28af8f5dc2..6c7cb8d250 100644
--- a/tests/Core/Ruleset/RegisterSniffsTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsTest.php
@@ -83,7 +83,7 @@ public static function setUpBeforeClass(): void
 
         self::$psr1SniffAbsolutePaths = self::relativeToAbsoluteSniffFiles($standardsDir, self::$psr1SniffFiles);
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ public static function relativeToAbsoluteSniffFiles($baseDir, $relativePaths)
 
         return $fileList;
 
-    }//end relativeToAbsoluteSniffFiles()
+    }
 
 
     /**
@@ -118,7 +118,7 @@ protected function setUp(): void
         // Clear out the Ruleset::$sniffs property.
         self::$ruleset->sniffs = [];
 
-    }//end setUp()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ public function testRegisteredSniffsShouldBeTheSame()
         $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs));
         $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs));
 
-    }//end testRegisteredSniffsShouldBeTheSame()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public function testRegisteredSniffsWithRestrictions()
 
         $this->assertSame($expected, $actual);
 
-    }//end testRegisteredSniffsWithRestrictions()
+    }
 
 
     /**
@@ -194,7 +194,7 @@ public function testRegisteredSniffsWithExclusions()
 
         $this->assertSame($expected, $actual);
 
-    }//end testRegisteredSniffsWithExclusions()
+    }
 
 
     /**
@@ -227,7 +227,7 @@ public function testRegisteredSniffsBothRestrictionsAndExclusions()
 
         $this->assertSame($expected, array_keys(self::$ruleset->sniffs));
 
-    }//end testRegisteredSniffsBothRestrictionsAndExclusions()
+    }
 
 
     /**
@@ -255,7 +255,7 @@ public function testRegisterSniffsFiltersOutAbstractClasses()
         $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs));
         $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs));
 
-    }//end testRegisterSniffsFiltersOutAbstractClasses()
+    }
 
 
     /**
@@ -283,7 +283,7 @@ public function testRegisteredSniffsFiltersOutFilePathsWithoutSniffsDir()
         $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..2eff690833 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
@@ -72,7 +72,7 @@ protected function setUp(): void
         $config        = new ConfigDouble(["--standard={$this->standard}"]);
         $this->ruleset = new Ruleset($config);
 
-    }//end setUp()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ protected function tearDown(): void
     {
         file_put_contents($this->standard, $this->contents);
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function testLinuxStylePathRuleInclusion()
             $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..ed7bca10d9 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
@@ -69,7 +69,7 @@ protected function setUp(): void
         $config        = new ConfigDouble(["--standard={$this->standard}"]);
         $this->ruleset = new Ruleset($config);
 
-    }//end setUp()
+    }
 
 
     /**
@@ -81,7 +81,7 @@ protected function tearDown(): void
     {
         file_put_contents($this->standard, $this->contents);
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ public function testWindowsStylePathRuleInclusion()
             $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..d18416f3d1 100644
--- a/tests/Core/Ruleset/RuleInclusionTest.php
+++ b/tests/Core/Ruleset/RuleInclusionTest.php
@@ -76,7 +76,7 @@ protected function setUp(): void
             self::$ruleset = new Ruleset($config);
         }//end if
 
-    }//end setUp()
+    }
 
 
     /**
@@ -88,7 +88,7 @@ public function tearDown(): void
     {
         file_put_contents(self::$standard, self::$contents);
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public function testHasSniffCodes()
     {
         $this->assertCount(49, self::$ruleset->sniffCodes);
 
-    }//end testHasSniffCodes()
+    }
 
 
     /**
@@ -118,7 +118,7 @@ public function testRegisteredSniffCodes($key, $value)
         $this->assertArrayHasKey($key, self::$ruleset->sniffCodes);
         $this->assertSame($value, self::$ruleset->sniffCodes[$key]);
 
-    }//end testRegisteredSniffCodes()
+    }
 
 
     /**
@@ -329,7 +329,7 @@ public static function dataRegisteredSniffCodes()
             ],
         ];
 
-    }//end dataRegisteredSniffCodes()
+    }
 
 
     /**
@@ -352,7 +352,7 @@ public function testSettingProperties($sniffClass, $propertyName, $expectedValue
         $actualValue = self::$ruleset->sniffs[$sniffClass]->$propertyName;
         $this->assertSame($expectedValue, $actualValue);
 
-    }//end testSettingProperties()
+    }
 
 
     /**
@@ -419,7 +419,7 @@ public static function dataSettingProperties()
             ],
         ];
 
-    }//end dataSettingProperties()
+    }
 
 
     /**
@@ -438,7 +438,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()
+    }
 
 
     /**
@@ -469,7 +469,7 @@ public static function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilen
             ],
         ];
 
-    }//end dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Ruleset/SetSniffPropertyTest.php b/tests/Core/Ruleset/SetSniffPropertyTest.php
index 723fa32feb..3565c75b9a 100644
--- a/tests/Core/Ruleset/SetSniffPropertyTest.php
+++ b/tests/Core/Ruleset/SetSniffPropertyTest.php
@@ -64,7 +64,7 @@ public function testSniffPropertiesGetSetWhenAllowed($name)
             $this->assertSame($expectedValue, $sniffObject->$name, 'Property value not set to expected value');
         }
 
-    }//end testSniffPropertiesGetSetWhenAllowed()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public static function dataSniffPropertiesGetSetWhenAllowed()
             'Property allowed as sniff has magic __set() method' => ['AllowedViaMagicMethod'],
         ];
 
-    }//end dataSniffPropertiesGetSetWhenAllowed()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public function testSetPropertyAppliesPropertyToMultipleSniffsInCategory()
         $errorMsg    = sprintf('Property %s registered for sniff %s which does not support it', $propertyName, $sniffClass);
         $this->assertFalse($hasProperty, $errorMsg);
 
-    }//end testSetPropertyAppliesPropertyToMultipleSniffsInCategory()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ public function testSetPropertyThrowsErrorOnInvalidProperty()
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
 
-    }//end testSetPropertyThrowsErrorOnInvalidProperty()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public function testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
 
-    }//end testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
+    }
 
 
     /**
@@ -181,7 +181,7 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStand
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
 
-    }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandard()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCateg
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
 
-    }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategory()
+    }
 
 
     /**
@@ -232,7 +232,7 @@ public function testDirectCallIgnoredPropertyForUnusedSniff()
         $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()
+    }
 
 
     /**
@@ -277,7 +277,7 @@ 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..a22d09d5fb 100644
--- a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
+++ b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
@@ -42,7 +42,7 @@ public function testHasSniffDeprecations($standard, $expected)
 
         $this->assertSame($expected, $ruleset->hasSniffDeprecations());
 
-    }//end testHasSniffDeprecations()
+    }
 
 
     /**
@@ -65,7 +65,7 @@ public static function dataHasSniffDeprecations()
             ],
         ];
 
-    }//end dataHasSniffDeprecations()
+    }
 
 
     /**
@@ -93,7 +93,7 @@ public function testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs =
 
         $this->assertStderrOutputSameString('');
 
-    }//end testDeprecatedSniffsListDoesNotShow()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ public static function dataDeprecatedSniffsListDoesNotShow()
             ],
         ];
 
-    }//end dataDeprecatedSniffsListDoesNotShow()
+    }
 
 
     /**
@@ -142,7 +142,7 @@ public function testDeprecatedSniffsListDoesNotShowNeedsCsMode($standard, $addit
 
         $this->testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs);
 
-    }//end testDeprecatedSniffsListDoesNotShowNeedsCsMode()
+    }
 
 
     /**
@@ -161,7 +161,7 @@ public static function dataDeprecatedSniffsListDoesNotShowNeedsCsMode()
             ],
         ];
 
-    }//end dataDeprecatedSniffsListDoesNotShowNeedsCsMode()
+    }
 
 
     /**
@@ -187,7 +187,7 @@ public function testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDepre
 
         $this->assertStderrOutputSameString('');
 
-    }//end testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDeprecated()
+    }
 
 
     /**
@@ -220,7 +220,7 @@ public function testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExc
 
         $this->assertStderrOutputSameString('');
 
-    }//end testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExcluded()
+    }
 
 
     /**
@@ -287,7 +287,7 @@ public function testDeprecatedSniffsWarning()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testDeprecatedSniffsWarning()
+    }
 
 
     /**
@@ -319,7 +319,7 @@ public function testReportWidthIsRespected($reportWidth, $expectedOutput)
 
         $this->assertStderrOutputSameString($expectedOutput);
 
-    }//end testReportWidthIsRespected()
+    }
 
 
     /**
@@ -402,7 +402,7 @@ public static function dataReportWidthIsRespected()
         ];
         // phpcs:enable
 
-    }//end dataReportWidthIsRespected()
+    }
 
 
     /**
@@ -448,7 +448,7 @@ public function testDeprecatedSniffsAreListedAlphabetically()
             'WithReplacement sniff not registered'
         );
 
-    }//end testDeprecatedSniffsAreListedAlphabetically()
+    }
 
 
     /**
@@ -473,7 +473,7 @@ public function testExceptionIsThrownOnIncorrectlyImplementedInterface($standard
 
         $ruleset->showSniffDeprecations();
 
-    }//end testExceptionIsThrownOnIncorrectlyImplementedInterface()
+    }
 
 
     /**
@@ -508,7 +508,7 @@ public static function dataExceptionIsThrownOnIncorrectlyImplementedInterface()
             ],
         ];
 
-    }//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..f498a96058 100644
--- a/tests/Core/Runner/PrintProgressDotsTest.php
+++ b/tests/Core/Runner/PrintProgressDotsTest.php
@@ -45,7 +45,7 @@ public function testProgressDotCs($colors, $code, $sniffs, $expected)
 
         $this->checkProgressDot($colors, $code, $sniffs, $expected);
 
-    }//end testProgressDotCs()
+    }
 
 
     /**
@@ -107,7 +107,7 @@ public static function dataProgressDotCs()
             ],
         ];
 
-    }//end dataProgressDotCs()
+    }
 
 
     /**
@@ -132,7 +132,7 @@ public function testProgressDotCbf($colors, $code, $sniffs, $expected)
 
         $this->checkProgressDot($colors, $code, $sniffs, $expected, true);
 
-    }//end testProgressDotCbf()
+    }
 
 
     /**
@@ -182,7 +182,7 @@ public static function dataProgressDotCbf()
             ],
         ];
 
-    }//end dataProgressDotCbf()
+    }
 
 
     /**
@@ -220,7 +220,7 @@ private function checkProgressDot($colors, $code, $sniffs, $expected, $enableFix
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end checkProgressDot()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Runner/PrintProgressTest.php b/tests/Core/Runner/PrintProgressTest.php
index fed0fb0f1d..aeae376ae2 100644
--- a/tests/Core/Runner/PrintProgressTest.php
+++ b/tests/Core/Runner/PrintProgressTest.php
@@ -73,7 +73,7 @@ public static function setUpBeforeClass(): void
         self::$fileWithoutErrorsOrWarnings = new DummyFile($content, self::$ruleset, self::$config);
         self::$fileWithoutErrorsOrWarnings->process();
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ protected function tearDown(): void
         // Reset all static properties on the StatusWriter class.
         $this->resetStatusWriterProperties();
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -105,7 +105,7 @@ public static function tearDownAfterClass(): void
         // automagically triggered when this object is destroyed, but we can't definitively rely on that).
         self::$config->__destruct();
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -125,7 +125,7 @@ public function testNoProgressIsShownWhenDisabled()
 
         $this->assertStderrOutputSameString('');
 
-    }//end testNoProgressIsShownWhenDisabled()
+    }
 
 
     /**
@@ -150,7 +150,7 @@ public function testProgressDotSkippedFiles()
 
         $this->assertStderrOutputSameString('.S.S.S.S.S 10 / 10 (100%)' . PHP_EOL);
 
-    }//end testProgressDotSkippedFiles()
+    }
 
 
     /**
@@ -173,7 +173,7 @@ public function testEndOfLineSummary($nrOfFiles, $expected)
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testEndOfLineSummary()
+    }
 
 
     /**
@@ -234,7 +234,7 @@ 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..f666b43c7c 100644
--- a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
+++ b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
@@ -45,7 +45,7 @@ public function testPhpcs($sourceDir, $extraArgs)
 
         $this->verifyOutput();
 
-    }//end testPhpcs()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public function testPhpcbf($sourceDir, $extraArgs)
 
         $this->verifyOutput();
 
-    }//end testPhpcbf()
+    }
 
 
     /**
@@ -93,7 +93,7 @@ public static function data()
             ],
         ];
 
-    }//end data()
+    }
 
 
     /**
@@ -119,7 +119,7 @@ private function setupTest($sourceDir, $extraArgs)
 
         $this->expectNoStdoutOutput();
 
-    }//end setupTest()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ private function verifyOutput()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end verifyOutput()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Runner/RunPHPCSExplainTest.php b/tests/Core/Runner/RunPHPCSExplainTest.php
index ea0eb71de1..482e1a85fd 100644
--- a/tests/Core/Runner/RunPHPCSExplainTest.php
+++ b/tests/Core/Runner/RunPHPCSExplainTest.php
@@ -67,7 +67,7 @@ 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..e94ee28efe 100644
--- a/tests/Core/Runner/RunPHPCSGeneratorTest.php
+++ b/tests/Core/Runner/RunPHPCSGeneratorTest.php
@@ -66,7 +66,7 @@ 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..2e7580f970 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTest.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTest.php
@@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void
         self::$sniff = new AbstractArraySniffTestable();
         parent::setUpBeforeClass();
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -64,7 +64,7 @@ public function testSimpleValues()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testSimpleValues()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public function testSimpleKeyValues()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testSimpleKeyValues()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ public function testMissingKeys()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testMissingKeys()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public function testMultiTokenKeys()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testMultiTokenKeys()
+    }
 
 
     /**
@@ -193,7 +193,7 @@ public function testMissingKeysCoalesceTernary()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testMissingKeysCoalesceTernary()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ public function testTernaryValues()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testTernaryValues()
+    }
 
 
     /**
@@ -253,7 +253,7 @@ public function testHeredocValues()
 
         $this->assertSame($expected, self::$sniff->indicies);
 
-    }//end testHeredocValues()
+    }
 
 
     /**
@@ -289,7 +289,7 @@ 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..0a15290018 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTestable.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTestable.php
@@ -40,7 +40,7 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arra
     {
         $this->indicies = $indices;
 
-    }//end processSingleLineArray()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
     {
         $this->indicies = $indices;
 
-    }//end processMultiLineArray()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Standards/StandardRulesetsQATest.php b/tests/Core/Standards/StandardRulesetsQATest.php
index 3adba78133..124aefb035 100644
--- a/tests/Core/Standards/StandardRulesetsQATest.php
+++ b/tests/Core/Standards/StandardRulesetsQATest.php
@@ -49,7 +49,7 @@ public function testBuildInStandardsDoNotContainErrors($standard)
         // Make sure sniffs were registered.
         $this->assertGreaterThanOrEqual(1, count($ruleset->sniffCodes));
 
-    }//end testBuildInStandardsDoNotContainErrors()
+    }
 
 
     /**
@@ -76,7 +76,7 @@ public static function dataBuildInStandards()
 
         return $data;
 
-    }//end dataBuildInStandards()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/StatusWriterTestHelper.php b/tests/Core/StatusWriterTestHelper.php
index 8fa25bbf33..7644ecafaf 100644
--- a/tests/Core/StatusWriterTestHelper.php
+++ b/tests/Core/StatusWriterTestHelper.php
@@ -33,7 +33,7 @@ protected function setUp(): void
     {
         $this->redirectStatusWriterOutputToStream();
 
-    }//end setUp()
+    }
 
 
     /**
@@ -47,7 +47,7 @@ protected function tearDown(): void
     {
         $this->resetStatusWriterProperties();
 
-    }//end tearDown()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ protected function redirectStatusWriterOutputToStream(): void
         $streamProperty->setValue(null, $this->stream);
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false);
 
-    }//end redirectStatusWriterOutputToStream()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ protected function resetStatusWriterStream(): void
         $streamProperty->setValue(null, STDERR);
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false);
 
-    }//end resetStatusWriterStream()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ protected function resetStatusWriterProperties(): void
 
         $this->resetStatusWriterStream();
 
-    }//end resetStatusWriterProperties()
+    }
 
 
     /**
@@ -118,7 +118,7 @@ public function expectNoStdoutOutput()
     {
         $this->expectOutputString('');
 
-    }//end expectNoStdoutOutput()
+    }
 
 
     /**
@@ -136,7 +136,7 @@ public function assertStderrOutputSameString($expected)
         $this->assertIsString($output);
         $this->assertSame($expected, $output);
 
-    }//end assertStderrOutputSameString()
+    }
 
 
     /**
@@ -160,7 +160,7 @@ public function assertStderrOutputMatchesRegex($regex)
             $this->assertRegExp($regex, $output);
         }
 
-    }//end assertStderrOutputMatchesRegex()
+    }
 
 
-}//end trait
+}
diff --git a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
index 79fd22af6c..832986e8f9 100644
--- a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
+++ b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
@@ -68,7 +68,7 @@ protected function setUp(): void
             $this->phpcsFile->parse();
         }//end if
 
-    }//end setUp()
+    }
 
 
     /**
@@ -89,7 +89,7 @@ public function testTestMarkersAreUnique()
     {
         AbstractMethodTestCase::assertTestMarkersAreUnique($this->phpcsFile);
 
-    }//end testTestMarkersAreUnique()
+    }
 
 
     /**
@@ -108,7 +108,7 @@ protected function getTargetToken($commentString, $tokenType, $tokenContent = nu
     {
         return AbstractMethodTestCase::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent);
 
-    }//end getTargetToken()
+    }
 
 
     /**
@@ -126,7 +126,7 @@ public static function clearResolvedTokensCache()
         $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..aec228025e 100644
--- a/tests/Core/Tokenizers/Comment/CommentTestCase.php
+++ b/tests/Core/Tokenizers/Comment/CommentTestCase.php
@@ -68,7 +68,7 @@ public function testDocblockOpenerCloser($marker, $closerOffset, $expectedTags)
             );
         }
 
-    }//end testDocblockOpenerCloser()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ protected function checkTokenSequence($startPtr, array $expectedSequence)
             );
         }//end for
 
-    }//end checkTokenSequence()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
index 1fee11597e..54be9721d3 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
@@ -35,7 +35,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function testLiveCoding()
 
         $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..dcdecaf9a4 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
@@ -35,7 +35,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ public function testLiveCoding()
 
         $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..a19f7ce523 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
@@ -35,7 +35,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public function testLiveCoding()
 
         $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..84fd74bc6f 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
@@ -35,7 +35,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ public function testLiveCoding()
 
         $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..657f8ac8f7 100644
--- a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
@@ -68,7 +68,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ public function testEmptyDocblock()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testEmptyDocblock()
+    }
 
 
     /**
@@ -204,7 +204,7 @@ public function testMultilineDocblock()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultilineDocblock()
+    }
 
 
     /**
@@ -254,7 +254,7 @@ public function testMultilineDocblockNoStars()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultilineDocblockNoStars()
+    }
 
 
     /**
@@ -332,7 +332,7 @@ public function testMultilineDocblockIndented()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultilineDocblockIndented()
+    }
 
 
     /**
@@ -360,7 +360,7 @@ public function testMultilineDocblockOpenerNotOnOwnLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultilineDocblockOpenerNotOnOwnLine()
+    }
 
 
     /**
@@ -389,7 +389,7 @@ public function testMultilineDocblockCloserNotOnOwnLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultilineDocblockCloserNotOnOwnLine()
+    }
 
 
     /**
@@ -433,7 +433,7 @@ public function testMultilineDocblockStarsNotAligned()
 
         $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..c27da175cf 100644
--- a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
@@ -113,7 +113,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -136,7 +136,7 @@ public function testSingleLineDocIgnoreFileAnnotation()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocIgnoreFileAnnotation()
+    }
 
 
     /**
@@ -157,7 +157,7 @@ public function testSingleLineDocIgnoreAnnotation()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocIgnoreAnnotation()
+    }
 
 
     /**
@@ -178,7 +178,7 @@ public function testSingleLineDocDisableAnnotation()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocDisableAnnotation()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ public function testSingleLineDocEnableAnnotationNoWhitespace()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocEnableAnnotationNoWhitespace()
+    }
 
 
     /**
@@ -229,7 +229,7 @@ public function testMultiLineDocIgnoreFileAnnotationAtStart()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreFileAnnotationAtStart()
+    }
 
 
     /**
@@ -260,7 +260,7 @@ public function testMultiLineDocIgnoreAnnotationAtStart()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreAnnotationAtStart()
+    }
 
 
     /**
@@ -291,7 +291,7 @@ public function testMultiLineDocDisableAnnotationAtStart()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocDisableAnnotationAtStart()
+    }
 
 
     /**
@@ -327,7 +327,7 @@ public function testMultiLineDocEnableAnnotationAtStart()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocEnableAnnotationAtStart()
+    }
 
 
     /**
@@ -366,7 +366,7 @@ public function testMultiLineDocIgnoreFileAnnotationInMiddle()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreFileAnnotationInMiddle()
+    }
 
 
     /**
@@ -407,7 +407,7 @@ public function testMultiLineDocIgnoreAnnotationInMiddle()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreAnnotationInMiddle()
+    }
 
 
     /**
@@ -451,7 +451,7 @@ public function testMultiLineDocDisableAnnotationInMiddle()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocDisableAnnotationInMiddle()
+    }
 
 
     /**
@@ -493,7 +493,7 @@ public function testMultiLineDocEnableAnnotationInMiddle()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocEnableAnnotationInMiddle()
+    }
 
 
     /**
@@ -527,7 +527,7 @@ public function testMultiLineDocIgnoreFileAnnotationAtEnd()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreFileAnnotationAtEnd()
+    }
 
 
     /**
@@ -561,7 +561,7 @@ public function testMultiLineDocIgnoreAnnotationAtEnd()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocIgnoreAnnotationAtEnd()
+    }
 
 
     /**
@@ -597,7 +597,7 @@ public function testMultiLineDocDisableAnnotationAtEnd()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testMultiLineDocDisableAnnotationAtEnd()
+    }
 
 
     /**
@@ -631,7 +631,7 @@ public function testMultiLineDocEnableAnnotationAtEnd()
 
         $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..d52ce6c7bd 100644
--- a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
@@ -60,7 +60,7 @@ public static function dataDocblockOpenerCloser()
             ],
         ];
 
-    }//end dataDocblockOpenerCloser()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ public function testEmptyBlockCommentNoWhiteSpace()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testEmptyBlockCommentNoWhiteSpace()
+    }
 
 
     /**
@@ -101,7 +101,7 @@ public function testEmptyDocblockNoWhiteSpace()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testEmptyDocblockNoWhiteSpace()
+    }
 
 
     /**
@@ -121,7 +121,7 @@ public function testEmptyDocblockWithWhiteSpace()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testEmptyDocblockWithWhiteSpace()
+    }
 
 
     /**
@@ -142,7 +142,7 @@ public function testSingleLineDocblockNoTag()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocblockNoTag()
+    }
 
 
     /**
@@ -165,7 +165,7 @@ public function testSingleLineDocblockWithTag1()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocblockWithTag1()
+    }
 
 
     /**
@@ -188,7 +188,7 @@ public function testSingleLineDocblockWithTag2()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testSingleLineDocblockWithTag2()
+    }
 
 
     /**
@@ -211,7 +211,7 @@ public function testSingleLineDocblockWithTag3()
 
         $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..78468096c2 100644
--- a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
+++ b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
@@ -34,7 +34,7 @@ public function testAnonClassNoParentheses($testMarker)
         $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$anonClass]);
         $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$anonClass]);
 
-    }//end testAnonClassNoParentheses()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function testAnonClassNoParenthesesNextOpenClose($testMarker)
         $this->assertArrayHasKey('parenthesis_owner', $tokens[$closer]);
         $this->assertSame($function, $tokens[$closer]['parenthesis_owner']);
 
-    }//end testAnonClassNoParenthesesNextOpenClose()
+    }
 
 
     /**
@@ -86,7 +86,7 @@ public static function dataAnonClassNoParentheses()
             ],
         ];
 
-    }//end dataAnonClassNoParentheses()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ public function testAnonClassWithParentheses($testMarker)
         $this->assertSame($opener, $tokens[$closer]['parenthesis_opener']);
         $this->assertSame($closer, $tokens[$closer]['parenthesis_closer']);
 
-    }//end testAnonClassWithParentheses()
+    }
 
 
     /**
@@ -152,7 +152,7 @@ public static function dataAnonClassWithParentheses()
             ],
         ];
 
-    }//end dataAnonClassWithParentheses()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
index 84faa88a10..0fe0f5a290 100644
--- a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
@@ -36,7 +36,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()
+    }
 
 
     /**
@@ -70,7 +70,7 @@ public static function dataArrayKeyword()
             ],
         ];
 
-    }//end dataArrayKeyword()
+    }
 
 
     /**
@@ -94,7 +94,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()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ public static function dataArrayType()
             ],
         ];
 
-    }//end dataArrayType()
+    }
 
 
     /**
@@ -168,7 +168,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()
+    }
 
 
     /**
@@ -194,7 +194,7 @@ public static function dataNotArrayKeyword()
             ],
         ];
 
-    }//end dataNotArrayKeyword()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/AttributesTest.php b/tests/Core/Tokenizers/PHP/AttributesTest.php
index 75d3b458f2..5cc84deb35 100644
--- a/tests/Core/Tokenizers/PHP/AttributesTest.php
+++ b/tests/Core/Tokenizers/PHP/AttributesTest.php
@@ -58,7 +58,7 @@ function ($token) use ($attribute, $length) {
 
         $this->assertSame($tokenCodes, $map);
 
-    }//end testAttribute()
+    }
 
 
     /**
@@ -267,7 +267,7 @@ public static function dataAttribute()
             ],
         ];
 
-    }//end dataAttribute()
+    }
 
 
     /**
@@ -291,7 +291,7 @@ public function testTwoAttributesOnTheSameLine()
         $this->assertSame(T_ATTRIBUTE, $tokens[($closer + 2)]['code']);
         $this->assertArrayHasKey('attribute_closer', $tokens[($closer + 2)]);
 
-    }//end testTwoAttributesOnTheSameLine()
+    }
 
 
     /**
@@ -314,7 +314,7 @@ public function testAttributeAndLineComment()
         $this->assertSame(T_WHITESPACE, $tokens[($closer + 1)]['code']);
         $this->assertSame(T_COMMENT, $tokens[($closer + 2)]['code']);
 
-    }//end testAttributeAndLineComment()
+    }
 
 
     /**
@@ -367,7 +367,7 @@ function ($token) use ($attribute, $length) {
 
         $this->assertSame($tokenCodes, $map);
 
-    }//end testAttributeOnParameters()
+    }
 
 
     /**
@@ -422,7 +422,7 @@ public static function dataAttributeOnParameters()
             ],
         ];
 
-    }//end dataAttributeOnParameters()
+    }
 
 
     /**
@@ -474,7 +474,7 @@ public function testAttributeContainingTextLookingLikeCloseTag($testMarker, arra
             ++$i;
         }
 
-    }//end testAttributeContainingTextLookingLikeCloseTag()
+    }
 
 
     /**
@@ -573,7 +573,7 @@ public static function dataAttributeOnTextLookingLikeCloseTag()
             ],
         ];
 
-    }//end dataAttributeOnTextLookingLikeCloseTag()
+    }
 
 
     /**
@@ -594,7 +594,7 @@ public function testInvalidAttribute()
         $this->assertArrayHasKey('attribute_closer', $tokens[$attribute]);
         $this->assertNull($tokens[$attribute]['attribute_closer']);
 
-    }//end testInvalidAttribute()
+    }
 
 
     /**
@@ -688,7 +688,7 @@ 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..7cb592d612 100644
--- a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
@@ -60,7 +60,7 @@ public function testAsymmetricVisibility($testMarker, $testType, $testContent)
             'Token tokenized as ' . $tokenArray['type'] . ' (content)'
         );
 
-    }//end testAsymmetricVisibility()
+    }
 
 
     /**
@@ -198,7 +198,7 @@ public static function dataAsymmetricVisibility()
             ],
         ];
 
-    }//end dataAsymmetricVisibility()
+    }
 
 
     /**
@@ -234,7 +234,7 @@ public function testNotAsymmetricVisibility($testMarker, $testType, $testContent
             'Token tokenized as ' . $tokenArray['type'] . ' (code)'
         );
 
-    }//end testNotAsymmetricVisibility()
+    }
 
 
     /**
@@ -325,7 +325,7 @@ public static function dataNotAsymmetricVisibility()
             ],
         ];
 
-    }//end dataNotAsymmetricVisibility()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
index d411d697bb..8003bb6138 100644
--- a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
@@ -66,7 +66,7 @@ public function testEnums($testMarker, $testContent, $openerOffset, $closerOffse
         $this->assertSame($scopeOpener, $tokens[$scopeCloser]['scope_opener']);
         $this->assertSame($scopeCloser, $tokens[$scopeCloser]['scope_closer']);
 
-    }//end testEnums()
+    }
 
 
     /**
@@ -123,7 +123,7 @@ public static function dataEnums()
             ],
         ];
 
-    }//end dataEnums()
+    }
 
 
     /**
@@ -151,7 +151,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()
+    }
 
 
     /**
@@ -228,7 +228,7 @@ public static function dataNotEnums()
             ],
         ];
 
-    }//end dataNotEnums()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
index d706083e91..18d6a1a942 100644
--- a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
@@ -39,7 +39,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()
+    }
 
 
     /**
@@ -114,7 +114,7 @@ public static function dataExplicitOctalNotation()
             ],
         ];
 
-    }//end dataExplicitOctalNotation()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
index 92d567a7d3..be1e352f54 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
@@ -38,7 +38,7 @@ public function testUnfinishedArrowFunction()
         $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..c769502844 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
@@ -32,7 +32,7 @@ public function testSimple($testMarker)
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 12);
 
-    }//end testSimple()
+    }
 
 
     /**
@@ -53,7 +53,7 @@ public static function dataSimple()
             ],
         ];
 
-    }//end dataSimple()
+    }
 
 
     /**
@@ -69,7 +69,7 @@ public function testWhitespace()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 6, 13);
 
-    }//end testWhitespace()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public function testComment()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 15);
 
-    }//end testComment()
+    }
 
 
     /**
@@ -101,7 +101,7 @@ public function testHeredoc()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 9);
 
-    }//end testHeredoc()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public function testNestedOuter()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 25);
 
-    }//end testNestedOuter()
+    }
 
 
     /**
@@ -148,7 +148,7 @@ public function testNestedInner()
         $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()
+    }
 
 
     /**
@@ -183,7 +183,7 @@ public function testNestedSharedCloser()
         $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()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ public function testFunctionCall()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 17);
 
-    }//end testFunctionCall()
+    }
 
 
     /**
@@ -215,7 +215,7 @@ public function testChainedFunctionCall()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 12, 'bracket');
 
-    }//end testChainedFunctionCall()
+    }
 
 
     /**
@@ -231,7 +231,7 @@ public function testFunctionArgument()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 15, 'comma');
 
-    }//end testFunctionArgument()
+    }
 
 
     /**
@@ -247,7 +247,7 @@ public function testClosure()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 60, 'comma');
 
-    }//end testClosure()
+    }
 
 
     /**
@@ -263,7 +263,7 @@ public function testArrayIndex()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 17, 'comma');
 
-    }//end testArrayIndex()
+    }
 
 
     /**
@@ -279,7 +279,7 @@ public function testReturnType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18, 'comma');
 
-    }//end testReturnType()
+    }
 
 
     /**
@@ -295,7 +295,7 @@ public function testReference()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 6, 9);
 
-    }//end testReference()
+    }
 
 
     /**
@@ -311,7 +311,7 @@ public function testGrouped()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 8);
 
-    }//end testGrouped()
+    }
 
 
     /**
@@ -327,7 +327,7 @@ public function testArrayValue()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 9, 'comma');
 
-    }//end testArrayValue()
+    }
 
 
     /**
@@ -343,7 +343,7 @@ public function testArrayValueNoTrailingComma()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 8, 'closing parenthesis');
 
-    }//end testArrayValueNoTrailingComma()
+    }
 
 
     /**
@@ -359,7 +359,7 @@ public function testYield()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 14);
 
-    }//end testYield()
+    }
 
 
     /**
@@ -375,7 +375,7 @@ public function testReturnTypeNullableFullyQualifiedClassName()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 10, 13);
 
-    }//end testReturnTypeNullableFullyQualifiedClassName()
+    }
 
 
     /**
@@ -391,7 +391,7 @@ public function testReturnTypeNullablePartiallyQualifiedClassName()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 10, 13);
 
-    }//end testReturnTypeNullablePartiallyQualifiedClassName()
+    }
 
 
     /**
@@ -407,7 +407,7 @@ public function testNullableUnqualifiedClassName()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 16);
 
-    }//end testNullableUnqualifiedClassName()
+    }
 
 
     /**
@@ -423,7 +423,7 @@ public function testNamespaceRelativeClassNameInTypes()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 12, 15);
 
-    }//end testNamespaceRelativeClassNameInTypes()
+    }
 
 
     /**
@@ -442,7 +442,7 @@ public function testKeywordReturnTypes($testMarker)
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 14);
 
-    }//end testKeywordReturnTypes()
+    }
 
 
     /**
@@ -490,7 +490,7 @@ public static function dataKeywordReturnTypes()
             ],
         ];
 
-    }//end dataKeywordReturnTypes()
+    }
 
 
     /**
@@ -506,7 +506,7 @@ public function testUnionParamType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 21);
 
-    }//end testUnionParamType()
+    }
 
 
     /**
@@ -522,7 +522,7 @@ public function testUnionReturnType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
 
-    }//end testUnionReturnType()
+    }
 
 
     /**
@@ -538,7 +538,7 @@ public function testUnionReturnTypeWithTrue()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
 
-    }//end testUnionReturnTypeWithTrue()
+    }
 
 
     /**
@@ -554,7 +554,7 @@ public function testUnionReturnTypeWithFalse()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
 
-    }//end testUnionReturnTypeWithFalse()
+    }
 
 
     /**
@@ -570,7 +570,7 @@ public function testIntersectionParamType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 27);
 
-    }//end testIntersectionParamType()
+    }
 
 
     /**
@@ -586,7 +586,7 @@ public function testIntersectionReturnType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 19);
 
-    }//end testIntersectionReturnType()
+    }
 
 
     /**
@@ -602,7 +602,7 @@ public function testDNFParamType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 17, 29);
 
-    }//end testDNFParamType()
+    }
 
 
     /**
@@ -618,7 +618,7 @@ public function testDNFReturnType()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 27);
 
-    }//end testDNFReturnType()
+    }
 
 
     /**
@@ -634,7 +634,7 @@ public function testDNFParamTypeWithReturnByRef()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 22);
 
-    }//end testDNFParamTypeWithReturnByRef()
+    }
 
 
     /**
@@ -686,7 +686,7 @@ public function testTernary()
         $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()
+    }
 
 
     /**
@@ -702,7 +702,7 @@ public function testTernaryWithTypes()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 27);
 
-    }//end testTernaryWithTypes()
+    }
 
 
     /**
@@ -718,7 +718,7 @@ public function testWithMatchValue()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 44);
 
-    }//end testWithMatchValue()
+    }
 
 
     /**
@@ -734,7 +734,7 @@ public function testWithMatchValueAndMore()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 48);
 
-    }//end testWithMatchValueAndMore()
+    }
 
 
     /**
@@ -762,7 +762,7 @@ public function testInMatchValue($testMarker, $openerOffset, $closerOffset, $exp
 
         $this->assertSame($expectedCloserType, $tokens[($token + $closerOffset)]['type'], 'Mismatched scope closer type');
 
-    }//end testInMatchValue()
+    }
 
 
     /**
@@ -805,7 +805,7 @@ public static function dataInMatchValue()
             ],
         ];
 
-    }//end dataInMatchValue()
+    }
 
 
     /**
@@ -821,7 +821,7 @@ public function testNestedInMethod()
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 17);
 
-    }//end testNestedInMethod()
+    }
 
 
     /**
@@ -857,7 +857,7 @@ public function testNotAnArrowFunction($testMarker, $testContent = 'fn', $expect
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set');
 
-    }//end testNotAnArrowFunction()
+    }
 
 
     /**
@@ -927,7 +927,7 @@ public static function dataNotAnArrowFunction()
             ],
         ];
 
-    }//end dataNotAnArrowFunction()
+    }
 
 
     /**
@@ -979,7 +979,7 @@ private function backfillHelper($token, $skipScopeCloserCheck = false)
         $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()
+    }
 
 
     /**
@@ -1011,7 +1011,7 @@ private function scopePositionTestHelper($token, $openerOffset, $closerOffset, $
         $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..e1b31fbd68 100644
--- a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
@@ -43,7 +43,7 @@ public function testMatchExpression($testMarker, $openerOffset, $closerOffset, $
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
         $this->parenthesisTestHelper($token);
 
-    }//end testMatchExpression()
+    }
 
 
     /**
@@ -195,7 +195,7 @@ public static function dataMatchExpression()
             ],
         ];
 
-    }//end dataMatchExpression()
+    }
 
 
     /**
@@ -237,7 +237,7 @@ public function testNotAMatchStructure($testMarker, $testContent = 'match', $exp
             $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set for opener after');
         }
 
-    }//end testNotAMatchStructure()
+    }
 
 
     /**
@@ -348,7 +348,7 @@ public static function dataNotAMatchStructure()
             ],
         ];
 
-    }//end dataNotAMatchStructure()
+    }
 
 
     /**
@@ -371,7 +371,7 @@ public function testSwitchExpression($testMarker, $openerOffset, $closerOffset)
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
         $this->parenthesisTestHelper($token);
 
-    }//end testSwitchExpression()
+    }
 
 
     /**
@@ -401,7 +401,7 @@ public static function dataSwitchExpression()
             ],
         ];
 
-    }//end dataSwitchExpression()
+    }
 
 
     /**
@@ -424,7 +424,7 @@ public function testSwitchCaseVersusMatch($testMarker, $openerOffset, $closerOff
 
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
 
-    }//end testSwitchCaseVersusMatch()
+    }
 
 
     /**
@@ -464,7 +464,7 @@ public static function dataSwitchCaseVersusMatch()
             ],
         ];
 
-    }//end dataSwitchCaseVersusMatch()
+    }
 
 
     /**
@@ -528,7 +528,7 @@ private function scopeTestHelper($token, $openerOffset, $closerOffset, $skipScop
             }
         }
 
-    }//end scopeTestHelper()
+    }
 
 
     /**
@@ -558,7 +558,7 @@ private function parenthesisTestHelper($token)
         $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..9ef8eef5cd 100644
--- a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
@@ -38,7 +38,7 @@ public function testBackfill($marker, $type, $value)
         $this->assertSame($type, $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not ' . $type . ' (type)');
         $this->assertSame($value, $tokenArray['content']);
 
-    }//end testBackfill()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ public static function dataTestBackfill()
             ],
         ];
 
-    }//end dataTestBackfill()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public function testNoBackfill($testMarker, $expectedTokens)
             $this->assertSame($expectedToken['content'], $tokens[$i]['content']);
         }
 
-    }//end testNoBackfill()
+    }
 
 
     /**
@@ -396,7 +396,7 @@ 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..19da12e422 100644
--- a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
@@ -37,7 +37,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()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ public static function dataReadonly()
             ],
         ];
 
-    }//end dataReadonly()
+    }
 
 
     /**
@@ -199,7 +199,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()
+    }
 
 
     /**
@@ -275,7 +275,7 @@ public static function dataNotReadonly()
             ],
         ];
 
-    }//end dataNotReadonly()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
index 78aeb7236c..0c9f8ec47f 100644
--- a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
+++ b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
@@ -34,7 +34,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()
+    }
 
 
     /**
@@ -68,7 +68,7 @@ public static function dataBitwiseOr()
             'live coding / undetermined'                 => ['/* testLiveCoding */'],
         ];
 
-    }//end dataBitwiseOr()
+    }
 
 
     /**
@@ -90,7 +90,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()
+    }
 
 
     /**
@@ -167,7 +167,7 @@ public static function dataTypeUnion()
             '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..75f23b4155 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
@@ -38,7 +38,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()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public static function dataStrings()
             'xor'          => ['/* testXor */'],
         ];
 
-    }//end dataStrings()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
index 093f7900f1..8417ac2612 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
@@ -35,7 +35,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()
+    }
 
 
     /**
@@ -139,7 +139,7 @@ public static function dataStrings()
             'method call: static with dnf look a like param'  => ['/* testKeywordAsFunctionCallNameShouldBeStringStaticDNFLookaLike */'],
         ];
 
-    }//end dataStrings()
+    }
 
 
     /**
@@ -178,7 +178,7 @@ public function testKeywords($testMarker, $expectedTokenType)
             'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)'
         );
 
-    }//end testKeywords()
+    }
 
 
     /**
@@ -566,7 +566,7 @@ public static function dataKeywords()
             ],
         ];
 
-    }//end dataKeywords()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
index 26dfd1476f..8405db3a3b 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
@@ -44,7 +44,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()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public static function dataBrokenDNFTypeCantEndOnOpenParenthesis()
             '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..925e21b9a2 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
@@ -53,7 +53,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()
+    }
 
 
     /**
@@ -72,7 +72,7 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingClosePar
             'Return type'      => ['/* testBrokenReturnDNFTypeParensMissingClose */'],
         ];
 
-    }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens()
+    }
 
 
     /**
@@ -112,7 +112,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()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenPare
             'Return type'      => ['/* testBrokenReturnDNFTypeParensMissingOpen */'],
         ];
 
-    }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens()
+    }
 
 
     /**
@@ -193,7 +193,7 @@ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched($t
             }//end switch
         }//end for
 
-    }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched()
+    }
 
 
     /**
@@ -212,7 +212,7 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmat
             '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..8c6849bfe5 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesTest.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
@@ -90,7 +90,7 @@ public function testNormalParentheses($testMarker, $skipCheckInside = false)
             );
         }
 
-    }//end testNormalParentheses()
+    }
 
 
     /**
@@ -267,7 +267,7 @@ public static function dataNormalParentheses()
             ],
         ];
 
-    }//end dataNormalParentheses()
+    }
 
 
     /**
@@ -372,7 +372,7 @@ public function testDNFTypeParentheses($testMarker)
             );
         }
 
-    }//end testDNFTypeParentheses()
+    }
 
 
     /**
@@ -560,7 +560,7 @@ public static function dataDNFTypeParentheses()
             ],
         ];
 
-    }//end dataDNFTypeParentheses()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
index c06e43e781..792d5064b7 100644
--- a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
@@ -41,7 +41,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()
+    }
 
 
     /**
@@ -96,7 +96,7 @@ public static function dataMatchDefault()
             ],
         ];
 
-    }//end dataMatchDefault()
+    }
 
 
     /**
@@ -121,7 +121,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()
+    }
 
 
     /**
@@ -151,7 +151,7 @@ public static function dataSwitchDefault()
             ],
         ];
 
-    }//end dataSwitchDefault()
+    }
 
 
     /**
@@ -184,7 +184,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()
+    }
 
 
     /**
@@ -265,7 +265,7 @@ public static function dataNotDefaultKeyword()
             ],
         ];
 
-    }//end dataNotDefaultKeyword()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
index 1e9163716c..f22e33b916 100644
--- a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
@@ -37,7 +37,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()
+    }
 
 
     /**
@@ -98,7 +98,7 @@ public static function dataDoubleArrow()
             'short_array_with_default_in_key_with_match' => ['/* testShortArrayArrowWithClassConstantKeyWithNestedMatch */'],
         ];
 
-    }//end dataDoubleArrow()
+    }
 
 
     /**
@@ -122,7 +122,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()
+    }
 
 
     /**
@@ -185,7 +185,7 @@ public static function dataMatchArrow()
             'in_short_array_value_with_default_key'   => ['/* testMatchArrowNestedInShortArrayWithClassConstantKey */'],
         ];
 
-    }//end dataMatchArrow()
+    }
 
 
     /**
@@ -209,7 +209,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()
+    }
 
 
     /**
@@ -231,7 +231,7 @@ 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..4262a09630 100644
--- a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
@@ -34,7 +34,7 @@ public function testDoubleQuotedString($testMarker, $expectedContent)
         $target = $this->getTargetToken($testMarker, T_DOUBLE_QUOTED_STRING);
         $this->assertSame($expectedContent, $tokens[$target]['content']);
 
-    }//end testDoubleQuotedString()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ 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..7d906f8217 100644
--- a/tests/Core/Tokenizers/PHP/EnumCaseTest.php
+++ b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
@@ -34,7 +34,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()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public static function dataEnumCases()
             'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'],
         ];
 
-    }//end dataEnumCases()
+    }
 
 
     /**
@@ -78,7 +78,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()
+    }
 
 
     /**
@@ -100,7 +100,7 @@ public static function dataNotEnumCases()
             'switch case, body after semicolon declares enum'    => ['/* testCaseInSwitchWhenCreatingEnumInSwitch2 */'],
         ];
 
-    }//end dataNotEnumCases()
+    }
 
 
     /**
@@ -122,7 +122,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()
+    }
 
 
     /**
@@ -145,7 +145,7 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"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..cdff29fa79 100644
--- a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
@@ -36,7 +36,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()
+    }
 
 
     /**
@@ -107,7 +107,7 @@ public static function dataExitIsKeyword()
             ],
         ];
 
-    }//end dataExitIsKeyword()
+    }
 
 
     /**
@@ -134,7 +134,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()
+    }
 
 
     /**
@@ -243,7 +243,7 @@ public static function dataNotExitKeyword()
             ],
         ];
 
-    }//end dataNotExitKeyword()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/FinallyTest.php b/tests/Core/Tokenizers/PHP/FinallyTest.php
index 2466a50ea2..1b4ed8c19a 100644
--- a/tests/Core/Tokenizers/PHP/FinallyTest.php
+++ b/tests/Core/Tokenizers/PHP/FinallyTest.php
@@ -34,7 +34,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()
+    }
 
 
     /**
@@ -52,7 +52,7 @@ public static function dataFinallyNonKeyword()
             '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..f0f91a0571 100644
--- a/tests/Core/Tokenizers/PHP/GotoLabelTest.php
+++ b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
@@ -40,7 +40,7 @@ public function testGotoStatement($testMarker, $testContent)
         $this->assertIsInt($label);
         $this->assertSame($testContent, $tokens[$label]['content']);
 
-    }//end testGotoStatement()
+    }
 
 
     /**
@@ -92,7 +92,7 @@ public static function dataGotoStatement()
             ],
         ];
 
-    }//end dataGotoStatement()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ public function testGotoDeclaration($testMarker, $testContent)
         $this->assertSame('T_GOTO_COLON', $tokens[$next]['type']);
         $this->assertSame(':', $tokens[$next]['content']);
 
-    }//end testGotoDeclaration()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public static function dataGotoDeclaration()
             ],
         ];
 
-    }//end dataGotoDeclaration()
+    }
 
 
     /**
@@ -208,7 +208,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()
+    }
 
 
     /**
@@ -275,7 +275,7 @@ public static function dataNotAGotoDeclaration()
             ],
         ];
 
-    }//end dataNotAGotoDeclaration()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
index 868a8c315c..90aa0d3a0d 100644
--- a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
@@ -45,7 +45,7 @@ public function testHeredocSingleLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testHeredocSingleLine()
+    }
 
 
     /**
@@ -67,7 +67,7 @@ public function testNowdocSingleLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testNowdocSingleLine()
+    }
 
 
     /**
@@ -91,7 +91,7 @@ public function testHeredocMultiLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testHeredocMultiLine()
+    }
 
 
     /**
@@ -115,7 +115,7 @@ public function testNowdocMultiLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testNowdocMultiLine()
+    }
 
 
     /**
@@ -139,7 +139,7 @@ public function testHeredocEndsOnBlankLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testHeredocEndsOnBlankLine()
+    }
 
 
     /**
@@ -163,7 +163,7 @@ public function testNowdocEndsOnBlankLine()
 
         $this->checkTokenSequence($target, $expectedSequence);
 
-    }//end testNowdocEndsOnBlankLine()
+    }
 
 
     /**
@@ -207,7 +207,7 @@ private function checkTokenSequence($startPtr, array $expectedSequence)
             );
         }//end for
 
-    }//end checkTokenSequence()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
index 2966792137..94ebc91e0c 100644
--- a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
@@ -35,7 +35,7 @@ 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..75630bf13a 100644
--- a/tests/Core/Tokenizers/PHP/HeredocStringTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
@@ -34,7 +34,7 @@ public function testHeredocString($testMarker, $expectedContent)
         $target = $this->getTargetToken($testMarker, T_HEREDOC);
         $this->assertSame($expectedContent . "\n", $tokens[$target]['content']);
 
-    }//end testHeredocString()
+    }
 
 
     /**
@@ -56,7 +56,7 @@ public function testHeredocStringWrapped($testMarker, $expectedContent)
         $target     = $this->getTargetToken($testMarker, T_HEREDOC);
         $this->assertSame('Do ' . $expectedContent . " Something\n", $tokens[$target]['content']);
 
-    }//end testHeredocStringWrapped()
+    }
 
 
     /**
@@ -155,7 +155,7 @@ public static function dataHeredocString()
             ],
         ];
 
-    }//end dataHeredocString()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
index d6084d8e58..8590e90c74 100644
--- a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
+++ b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
@@ -66,7 +66,7 @@ public function testNamedFunctionCallArguments($testMarker, $parameters)
             );
         }//end foreach
 
-    }//end testNamedFunctionCallArguments()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ public static function dataNamedFunctionCallArguments()
             ],
         ];
 
-    }//end dataNamedFunctionCallArguments()
+    }
 
 
     /**
@@ -328,7 +328,7 @@ public function testOtherTstringInFunctionCall($testMarker, $content)
             'Token tokenized as ' . $tokens[$label]['type'] . ', not T_STRING (type)'
         );
 
-    }//end testOtherTstringInFunctionCall()
+    }
 
 
     /**
@@ -359,7 +359,7 @@ public static function dataOtherTstringInFunctionCall()
             ],
         ];
 
-    }//end dataOtherTstringInFunctionCall()
+    }
 
 
     /**
@@ -411,7 +411,7 @@ public function testMixedPositionalAndNamedArgsWithTernary()
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
 
-    }//end testMixedPositionalAndNamedArgsWithTernary()
+    }
 
 
     /**
@@ -508,7 +508,7 @@ public function testNamedArgWithTernary()
             'Second arg ternary: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)'
         );
 
-    }//end testNamedArgWithTernary()
+    }
 
 
     /**
@@ -589,7 +589,7 @@ public function testTernaryWithFunctionCallsInThenElse()
             'Function in else: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
 
-    }//end testTernaryWithFunctionCallsInThenElse()
+    }
 
 
     /**
@@ -619,7 +619,7 @@ public function testTernaryWithConstantsInThenElse()
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)'
         );
 
-    }//end testTernaryWithConstantsInThenElse()
+    }
 
 
     /**
@@ -681,7 +681,7 @@ public function testSwitchStatement()
             'Default case: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
 
-    }//end testSwitchStatement()
+    }
 
 
     /**
@@ -727,7 +727,7 @@ public function testParseErrorVariableLabel()
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
 
-    }//end testParseErrorVariableLabel()
+    }
 
 
     /**
@@ -771,7 +771,7 @@ public function testOtherColonsInTernary($testMarker)
             }
         }
 
-    }//end testOtherColonsInTernary()
+    }
 
 
     /**
@@ -792,7 +792,7 @@ public static function dataOtherColonsInTernary()
             ],
         ];
 
-    }//end dataOtherColonsInTernary()
+    }
 
 
     /**
@@ -843,7 +843,7 @@ public function testReservedKeywordsAsName($testMarker, $tokenTypes, $tokenConte
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
 
-    }//end testReservedKeywordsAsName()
+    }
 
 
     /**
@@ -986,7 +986,7 @@ public static function dataReservedKeywordsAsName()
 
         return $data;
 
-    }//end dataReservedKeywordsAsName()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
index 55612b338e..4e362c3794 100644
--- a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
@@ -57,7 +57,7 @@ public function testIdentifierTokenization($testMarker, $expectedTokens)
             ++$identifier;
         }
 
-    }//end testIdentifierTokenization()
+    }
 
 
     /**
@@ -1286,7 +1286,7 @@ 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..a02c8c50ad 100644
--- a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
+++ b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
@@ -37,7 +37,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()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ public static function dataNullable()
             'function return type, nullable callable'        => ['/* testFunctionReturnTypeNullableCallable */'],
         ];
 
-    }//end dataNullable()
+    }
 
 
     /**
@@ -83,7 +83,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()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public static function dataInlineThen()
             '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..e4e34fee5b 100644
--- a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
+++ b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
@@ -42,7 +42,7 @@ public function testObjectOperator()
         $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()
+    }
 
 
     /**
@@ -63,7 +63,7 @@ public function testNullsafeObjectOperator($testMarker)
         $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()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ public static function dataNullsafeObjectOperator()
             'illegal nullsafe operator (write context)' => ['/* testNullsafeObjectOperatorWriteContext */'],
         ];
 
-    }//end dataNullsafeObjectOperator()
+    }
 
 
     /**
@@ -109,7 +109,7 @@ public function testTernaryThen($testMarker, $testObjectOperator = false)
             $this->assertSame('T_OBJECT_OPERATOR', $tokens[$next]['type'], 'Failed asserting type is object operator');
         }
 
-    }//end testTernaryThen()
+    }
 
 
     /**
@@ -138,7 +138,7 @@ public static function dataTernaryThen()
             ],
         ];
 
-    }//end dataTernaryThen()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
index acaabab82b..38dbf7035b 100644
--- a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
     {
         parent::clearResolvedTokensCache();
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -52,7 +52,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()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ public static function dataStrings()
             'constant declaration: parent as name after type'                   => ['/* testParentIsNameForTypedConstant */'],
         ];
 
-    }//end dataStrings()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public function testKeywords($testMarker, $expectedTokenType)
             'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)'
         );
 
-    }//end testKeywords()
+    }
 
 
     /**
@@ -737,7 +737,7 @@ public static function dataKeywords()
             ],
         ];
 
-    }//end dataKeywords()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
index d5cc6e7538..c2b66d0ce8 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
@@ -56,7 +56,7 @@ 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..2c9b507d3d 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
@@ -48,7 +48,7 @@ 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..2401539382 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
@@ -48,7 +48,7 @@ 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..41f157d819 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
@@ -34,7 +34,7 @@ public function testLongOpenTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
 
-    }//end testLongOpenTag()
+    }
 
 
     /**
@@ -132,7 +132,7 @@ public static function dataLongOpenTag()
 
         return $data;
 
-    }//end dataLongOpenTag()
+    }
 
 
     /**
@@ -150,7 +150,7 @@ public function testCaseLongOpenTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
 
-    }//end testCaseLongOpenTag()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public static function dataCaseLongOpenTag()
 
         return $data;
 
-    }//end dataCaseLongOpenTag()
+    }
 
 
     /**
@@ -191,7 +191,7 @@ public function testShortOpenEchoTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
 
-    }//end testShortOpenEchoTag()
+    }
 
 
     /**
@@ -203,7 +203,7 @@ public static function dataShortOpenEchoTag()
     {
         return self::getOpenTagTokenizationProvider('ShortOpenEcho', 'T_OPEN_TAG_WITH_ECHO', '<?=');
 
-    }//end dataShortOpenEchoTag()
+    }
 
 
     /**
@@ -224,7 +224,7 @@ public function testShortOpenTag($testMarker, array $expectedTokens)
 
         $this->checkTokenSequence($testMarker, $expectedTokens);
 
-    }//end testShortOpenTag()
+    }
 
 
     /**
@@ -236,7 +236,7 @@ public static function dataShortOpenTag()
     {
         return self::getOpenTagTokenizationProvider('ShortOpen', 'T_OPEN_TAG', '<?');
 
-    }//end dataShortOpenTag()
+    }
 
 
     /**
@@ -282,7 +282,7 @@ private function checkTokenSequence($testMarker, array $expectedTokens)
             ++$stackPtr;
         }//end foreach
 
-    }//end checkTokenSequence()
+    }
 
 
     /**
@@ -413,7 +413,7 @@ private static function getOpenTagTokenizationProvider($tagtype, $tokenType, $to
             ],
         ];
 
-    }//end getOpenTagTokenizationProvider()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
index c2f07d33d4..fb71c10965 100644
--- a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
     {
         parent::clearResolvedTokensCache();
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public function testBracesAndColon()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testBracesAndColon()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ public function testNamedParamColon()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testNamedParamColon()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public function testReturnTypeColon()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testReturnTypeColon()
+    }
 
 
     /**
@@ -130,7 +130,7 @@ public function testConcat()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testConcat()
+    }
 
 
     /**
@@ -160,7 +160,7 @@ public function testSimpleMathTokens()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testSimpleMathTokens()
+    }
 
 
     /**
@@ -184,7 +184,7 @@ public function testUnaryPlusMinus()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testUnaryPlusMinus()
+    }
 
 
     /**
@@ -212,7 +212,7 @@ public function testBitwiseTokens()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testBitwiseTokens()
+    }
 
 
     /**
@@ -237,7 +237,7 @@ public function testBitwiseOrInCatch()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testBitwiseOrInCatch()
+    }
 
 
     /**
@@ -257,7 +257,7 @@ public function testLessThan()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testLessThan()
+    }
 
 
     /**
@@ -277,7 +277,7 @@ public function testGreaterThan()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testGreaterThan()
+    }
 
 
     /**
@@ -297,7 +297,7 @@ public function testBooleanNot()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testBooleanNot()
+    }
 
 
     /**
@@ -319,7 +319,7 @@ public function testComma()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testComma()
+    }
 
 
     /**
@@ -341,7 +341,7 @@ public function testAsperand()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testAsperand()
+    }
 
 
     /**
@@ -363,7 +363,7 @@ public function testDollarAndCurlies()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testDollarAndCurlies()
+    }
 
 
     /**
@@ -384,7 +384,7 @@ public function testBacktick()
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
 
-    }//end testBacktick()
+    }
 
 
     /**
@@ -425,7 +425,7 @@ 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..623a24e262 100644
--- a/tests/Core/Tokenizers/PHP/ShortArrayTest.php
+++ b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
@@ -42,7 +42,7 @@ public function testSquareBrackets($testMarker)
             $this->assertSame('T_CLOSE_SQUARE_BRACKET', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SQUARE_BRACKET (type)');
         }
 
-    }//end testSquareBrackets()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public static function dataSquareBrackets()
             'live coding'                                    => ['/* testLiveCoding */'],
         ];
 
-    }//end dataSquareBrackets()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public function testShortArrays($testMarker)
             $this->assertSame('T_CLOSE_SHORT_ARRAY', $tokenArray['type'], 'Token tokenized as ' . $tokenArray['type'] . ', not T_CLOSE_SHORT_ARRAY (type)');
         }
 
-    }//end testShortArrays()
+    }
 
 
     /**
@@ -143,7 +143,7 @@ public static function dataShortArrays()
             '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..bcf5796abf 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
@@ -54,7 +54,7 @@ public function testCommentTokenization($testMarker, $expectedTokens)
             ++$comment;
         }
 
-    }//end testCommentTokenization()
+    }
 
 
     /**
@@ -1058,7 +1058,7 @@ 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..ad0811b4af 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
@@ -51,7 +51,7 @@ public function testCommentTokenization($testMarker, $expectedTokens)
             ++$comment;
         }
 
-    }//end testCommentTokenization()
+    }
 
 
     /**
@@ -369,7 +369,7 @@ 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..119d34259b 100644
--- a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
+++ b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
@@ -35,7 +35,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()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public static function dataBitwiseAnd()
             'live coding / undetermined'                 => ['/* testLiveCoding */'],
         ];
 
-    }//end dataBitwiseAnd()
+    }
 
 
     /**
@@ -93,7 +93,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()
+    }
 
 
     /**
@@ -162,7 +162,7 @@ public static function dataTypeIntersection()
             '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..096689b14c 100644
--- a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
+++ b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
@@ -44,7 +44,7 @@ public function testTernaryIsInlineThen()
             'Token tokenized as ' . $tokens[$target]['type'] . ', not T_INLINE_THEN (type)'
         );
 
-    }//end testTernaryIsInlineThen()
+    }
 
 
     /**
@@ -80,7 +80,7 @@ public function testUntypedConstant($testMarker)
             );
         }
 
-    }//end testUntypedConstant()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public static function dataUntypedConstant()
             ],
         ];
 
-    }//end dataUntypedConstant()
+    }
 
 
     /**
@@ -144,7 +144,7 @@ public function testTypedConstant($testMarker, array $sequence)
             ++$current;
         }
 
-    }//end testTypedConstant()
+    }
 
 
     /**
@@ -258,7 +258,7 @@ public static function dataTypedConstant()
 
         return $data;
 
-    }//end dataTypedConstant()
+    }
 
 
     /**
@@ -368,7 +368,7 @@ public static function dataNullableTypedConstant()
 
         return $data;
 
-    }//end dataNullableTypedConstant()
+    }
 
 
     /**
@@ -450,7 +450,7 @@ public static function dataUnionTypedConstant()
 
         return $data;
 
-    }//end dataUnionTypedConstant()
+    }
 
 
     /**
@@ -488,7 +488,7 @@ public static function dataIntersectionTypedConstant()
 
         return $data;
 
-    }//end dataIntersectionTypedConstant()
+    }
 
 
     /**
@@ -633,7 +633,7 @@ 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..8c4922ac13 100644
--- a/tests/Core/Tokenizers/PHP/YieldTest.php
+++ b/tests/Core/Tokenizers/PHP/YieldTest.php
@@ -42,7 +42,7 @@ public function testYieldKeyword($testMarker, $expectedContent)
 
         $this->assertSame($expectedContent, $tokenArray['content'], 'Token content does not match expectation');
 
-    }//end testYieldKeyword()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public static function dataYieldKeyword()
             ],
         ];
 
-    }//end dataYieldKeyword()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public function testYieldFromKeywordSingleToken($testMarker, $expectedContent)
             $this->assertSame($expectedContent, $tokenArray['content'], 'Token content does not match expectation');
         }
 
-    }//end testYieldFromKeywordSingleToken()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public static function dataYieldFromKeywordSingleToken()
             ],
         ];
 
-    }//end dataYieldFromKeywordSingleToken()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ public function testYieldFromKeywordMultiToken($testMarker, $expectedTokens)
             ++$target;
         }
 
-    }//end testYieldFromKeywordMultiToken()
+    }
 
 
     /**
@@ -382,7 +382,7 @@ public static function dataYieldFromKeywordMultiToken()
             ],
         ];
 
-    }//end dataYieldFromKeywordMultiToken()
+    }
 
 
     /**
@@ -403,7 +403,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()
+    }
 
 
     /**
@@ -426,7 +426,7 @@ public static function dataYieldNonKeyword()
             '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..8d8d4667eb 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
@@ -70,7 +70,7 @@ public function testNormalParentheses($testMarker, $owner = false)
             $this->assertSame($closePtr, $tokens[$i]['nested_parenthesis'][$openPtr], 'Nested parenthesis closer not set correctly');
         }
 
-    }//end testNormalParentheses()
+    }
 
 
     /**
@@ -175,7 +175,7 @@ public static function dataNormalParentheses()
             ],
         ];
 
-    }//end dataNormalParentheses()
+    }
 
 
     /**
@@ -224,7 +224,7 @@ public function testDNFTypeParentheses($testMarker)
             $this->assertSame($closePtr, $tokens[$i]['nested_parenthesis'][$openPtr], 'Nested parenthesis closer not set correctly');
         }//end for
 
-    }//end testDNFTypeParentheses()
+    }
 
 
     /**
@@ -368,7 +368,7 @@ public static function dataDNFTypeParentheses()
             ],
         ];
 
-    }//end dataDNFTypeParentheses()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
index fb9f049396..a07744e806 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
@@ -48,7 +48,7 @@ public function testHeredocNowdocCloserTabReplacement($testMarker, $expected)
             $this->assertSame($value, $tokens[$closer][$key], "Value for key $key does not match expectation.");
         }
 
-    }//end testHeredocNowdocCloserTabReplacement()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ 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..25b6f9c389 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
@@ -45,7 +45,7 @@ public function testHeredocNowdocOpenerTabReplacement($testMarker, $expected)
             $this->assertSame($value, $tokens[$opener][$key], "Value for key $key does not match expectation.");
         }
 
-    }//end testHeredocNowdocOpenerTabReplacement()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ 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..38dd896893 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
@@ -101,7 +101,7 @@ public static function getTabReplacementExpected()
             ],
         ];
 
-    }//end getTabReplacementExpected()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
index 75dbbf4c16..fbc09038d9 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
@@ -47,7 +47,7 @@ public function testYieldFromTabReplacement($testMarker, $expected, $content = n
             $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation.");
         }
 
-    }//end testYieldFromTabReplacement()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ 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..520efdb11f 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
@@ -40,7 +40,7 @@ public function testArrayKeyword($testMarker, $testContent = 'array')
         $this->assertArrayHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is not set');
         $this->assertArrayHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is not set');
 
-    }//end testArrayKeyword()
+    }
 
 
     /**
@@ -74,7 +74,7 @@ public static function dataArrayKeyword()
             ],
         ];
 
-    }//end dataArrayKeyword()
+    }
 
 
     /**
@@ -102,7 +102,7 @@ public function testArrayType($testMarker, $testContent = 'array')
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set');
 
-    }//end testArrayType()
+    }
 
 
     /**
@@ -151,7 +151,7 @@ public static function dataArrayType()
             ],
         ];
 
-    }//end dataArrayType()
+    }
 
 
     /**
@@ -180,7 +180,7 @@ public function testNotArrayKeyword($testMarker, $testContent = 'array')
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set');
 
-    }//end testNotArrayKeyword()
+    }
 
 
     /**
@@ -206,7 +206,7 @@ public static function dataNotArrayKeyword()
             ],
         ];
 
-    }//end dataNotArrayKeyword()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
index f0b449f6d3..27ffd2ca57 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
@@ -34,7 +34,7 @@ public function testLiveCoding()
         $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..3b00e6e15e 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
@@ -37,7 +37,7 @@ public function testUseNotClosure($testMarker)
         $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$use], 'parenthesis_opener key is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$use], 'parenthesis_closer key is set');
 
-    }//end testUseNotClosure()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ public static function dataUseNotClosure()
             ],
         ];
 
-    }//end dataUseNotClosure()
+    }
 
 
     /**
@@ -116,7 +116,7 @@ public function testUseNotClosureNextOpenClose($testMarker, $expectedOwnerCode =
             );
         }
 
-    }//end testUseNotClosureNextOpenClose()
+    }
 
 
     /**
@@ -133,7 +133,7 @@ public static function dataUseNotClosureNextOpenClose()
 
         return $data;
 
-    }//end dataUseNotClosureNextOpenClose()
+    }
 
 
     /**
@@ -174,7 +174,7 @@ public function testClosureUse($testMarker)
         $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()
+    }
 
 
     /**
@@ -189,7 +189,7 @@ public static function dataClosureUse()
             '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..578cf27883 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
@@ -64,7 +64,7 @@ public function testParenthesesWithOwner($testMarker, $tokenCode)
         $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()
+    }
 
 
     /**
@@ -226,7 +226,7 @@ public static function dataParenthesesWithOwner()
             ],
         ];
 
-    }//end dataParenthesesWithOwner()
+    }
 
 
     /**
@@ -260,7 +260,7 @@ public function testParenthesesWithoutOwner($testMarker)
         $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()
+    }
 
 
     /**
@@ -288,7 +288,7 @@ public static function dataParenthesesWithoutOwner()
             ],
         ];
 
-    }//end dataParenthesesWithoutOwner()
+    }
 
 
     /**
@@ -313,7 +313,7 @@ public function testParenthesesOwnerWithoutParentheses($testMarker, $tokenCode)
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, $tokenType . ' token has "parenthesis_opener" key');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, $tokenType . ' token has "parenthesis_closer" key');
 
-    }//end testParenthesesOwnerWithoutParentheses()
+    }
 
 
     /**
@@ -338,7 +338,7 @@ public static function dataParenthesesOwnerWithoutParentheses()
             ],
         ];
 
-    }//end dataParenthesesOwnerWithoutParentheses()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
index 9af2915515..22b941d06e 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
@@ -38,7 +38,7 @@ public function testEnumCases($testMarker)
         $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set');
         $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set');
 
-    }//end testEnumCases()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public static function dataEnumCases()
             'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'],
         ];
 
-    }//end dataEnumCases()
+    }
 
 
     /**
@@ -126,7 +126,7 @@ public function testNotEnumCases($testMarker, $expectedTokens, $testCloserMarker
             )
         );
 
-    }//end testNotEnumCases()
+    }
 
 
     /**
@@ -217,7 +217,7 @@ public static function dataNotEnumCases()
             ],
         ];
 
-    }//end dataNotEnumCases()
+    }
 
 
     /**
@@ -243,7 +243,7 @@ public function testKeywordAsEnumCaseNameShouldBeString($testMarker)
         $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set');
         $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set');
 
-    }//end testKeywordAsEnumCaseNameShouldBeString()
+    }
 
 
     /**
@@ -266,7 +266,7 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"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..fbc9fa0cc5 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
@@ -74,7 +74,7 @@ public function testMatchDefault($testMarker, $testContent = 'default')
             sprintf('Scope closer is set. Marker: %s.', $testMarker)
         );
 
-    }//end testMatchDefault()
+    }
 
 
     /**
@@ -129,7 +129,7 @@ public static function dataMatchDefault()
             ],
         ];
 
-    }//end dataMatchDefault()
+    }
 
 
     /**
@@ -284,7 +284,7 @@ public function testSwitchDefault($testMarker, $openerMarker, $closerMarker, $co
             }
         }//end if
 
-    }//end testSwitchDefault()
+    }
 
 
     /**
@@ -342,7 +342,7 @@ public static function dataSwitchDefault()
             ],
         ];
 
-    }//end dataSwitchDefault()
+    }
 
 
     /**
@@ -391,7 +391,7 @@ public function testNotDefaultKeyword($testMarker, $testContent = 'DEFAULT')
             sprintf('Scope closer is set. Marker: %s.', $testMarker)
         );
 
-    }//end testNotDefaultKeyword()
+    }
 
 
     /**
@@ -468,7 +468,7 @@ public static function dataNotDefaultKeyword()
             ],
         ];
 
-    }//end dataNotDefaultKeyword()
+    }
 
 
     /**
@@ -491,7 +491,7 @@ public function testIssue3326()
         $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..489c540bce 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
@@ -70,7 +70,7 @@ public function testIfElseWithNestedCaseMissingBreakSharedClosers()
             )
         );
 
-    }//end testIfElseWithNestedCaseMissingBreakSharedClosers()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
index 7b4b9f6d94..b82ee9ab25 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
@@ -84,7 +84,7 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker
             )
         );
 
-    }//end testSwitchScope()
+    }
 
 
     /**
@@ -154,7 +154,7 @@ 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..692ed376ab 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
@@ -51,7 +51,7 @@ public function testScopeSetting($testMarker, $tokenTypes, $open = [T_OPEN_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()
+    }
 
 
     /**
@@ -92,7 +92,7 @@ public static function dataScopeSetting()
             ],
         ];
 
-    }//end dataScopeSetting()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
index fbe95c4130..937a594b25 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
@@ -55,7 +55,7 @@ public function testTabWidthNotSet()
         $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()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public function testLengthSettingRespectsEncoding()
         $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()
+    }
 
 
     /**
@@ -117,7 +117,7 @@ public function testLengthSettingFallsBackToBytesWhenTextContainsIllegalChars()
         $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..938093bb6e 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
@@ -105,7 +105,7 @@ 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..1151f0f92c 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
@@ -105,7 +105,7 @@ 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..a071cf1d41 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
@@ -105,7 +105,7 @@ 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..ae6bac3284 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
@@ -105,7 +105,7 @@ 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..d452082612 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
@@ -49,7 +49,7 @@ public static function setUpBeforeClass(): void
             throw new Exception(sprintf('Failed to copy test case file "ReplaceTabsInTokenTest.inc" to %s', self::$caseFileName));
         }
 
-    }//end setUpBeforeClass()
+    }
 
 
     /**
@@ -61,7 +61,7 @@ public static function tearDownAfterClass(): void
     {
         @unlink(self::$caseFileName);
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -94,7 +94,7 @@ public function testNoReplacementsAreMadeWhenNoTabsAreFound($testMarker, $testTa
             $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation.");
         }
 
-    }//end testNoReplacementsAreMadeWhenNoTabsAreFound()
+    }
 
 
     /**
@@ -129,7 +129,7 @@ public static function dataNoReplacementsAreMadeWhenNoTabsAreFound()
             ],
         ];
 
-    }//end dataNoReplacementsAreMadeWhenNoTabsAreFound()
+    }
 
 
     /**
@@ -161,7 +161,7 @@ public function testTabReplacement($testMarker, $testTarget, $expected, $offset
             $this->assertSame($value, $tokens[$target][$key], "Value for key $key does not match expectation.");
         }
 
-    }//end testTabReplacement()
+    }
 
 
     /**
@@ -252,7 +252,7 @@ public static function dataTabReplacement()
 
         return $data;
 
-    }//end dataTabReplacement()
+    }
 
 
     /**
@@ -267,4 +267,4 @@ public static function dataTabReplacement()
     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..6be2e61473 100644
--- a/tests/Core/Util/Common/EscapeshellcmdTest.php
+++ b/tests/Core/Util/Common/EscapeshellcmdTest.php
@@ -42,7 +42,7 @@ public function testEscapeshellcmd($command, $expected, $expectedWin = null)
 
         $this->assertSame($expected, Common::escapeshellcmd($command));
 
-    }//end testEscapeshellcmd()
+    }
 
 
     /**
@@ -85,7 +85,7 @@ public static function dataEscapeshellcmd()
             ],
         ];
 
-    }//end dataEscapeshellcmd()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Common/GetSniffCodeTest.php b/tests/Core/Util/Common/GetSniffCodeTest.php
index 36002b05b9..9db672cff2 100644
--- a/tests/Core/Util/Common/GetSniffCodeTest.php
+++ b/tests/Core/Util/Common/GetSniffCodeTest.php
@@ -40,7 +40,7 @@ public function testGetSniffCodeThrowsExceptionOnInvalidInput($input)
 
         Common::getSniffCode($input);
 
-    }//end testGetSniffCodeThrowsExceptionOnInvalidInput()
+    }
 
 
     /**
@@ -57,7 +57,7 @@ public static function dataGetSniffCodeThrowsExceptionOnInvalidInput()
             'Class name is empty'        => [''],
         ];
 
-    }//end dataGetSniffCodeThrowsExceptionOnInvalidInput()
+    }
 
 
     /**
@@ -79,7 +79,7 @@ public function testGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass(
 
         Common::getSniffCode($input);
 
-    }//end testGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass()
+    }
 
 
     /**
@@ -104,7 +104,7 @@ public static function dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTes
             'Fully qualified class name, category called Sniffs'            => ['CompanyName\\Sniffs\\Sniffs\\InvalidCategorySniff'],
         ];
 
-    }//end dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass()
+    }
 
 
     /**
@@ -121,7 +121,7 @@ public function testGetSniffCode($fqnClass, $expected)
     {
         $this->assertSame($expected, Common::getSniffCode($fqnClass));
 
-    }//end testGetSniffCode()
+    }
 
 
     /**
@@ -160,7 +160,7 @@ public static function dataGetSniffCode()
             ],
         ];
 
-    }//end dataGetSniffCode()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Common/IsCamelCapsTest.php b/tests/Core/Util/Common/IsCamelCapsTest.php
index ef12b322a8..4f0bff2695 100644
--- a/tests/Core/Util/Common/IsCamelCapsTest.php
+++ b/tests/Core/Util/Common/IsCamelCapsTest.php
@@ -35,7 +35,7 @@ public function testValidNotClassFormatPublic($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, false, true, $strict));
 
-    }//end testValidNotClassFormatPublic()
+    }
 
 
     /**
@@ -62,7 +62,7 @@ public static function dataValidNotClassFormatPublic()
             ],
         ];
 
-    }//end dataValidNotClassFormatPublic()
+    }
 
 
     /**
@@ -78,7 +78,7 @@ public function testInvalidNotClassFormatPublic($name)
     {
         $this->assertFalse(Common::isCamelCaps($name, false, true, true));
 
-    }//end testInvalidNotClassFormatPublic()
+    }
 
 
     /**
@@ -136,7 +136,7 @@ public static function dataInvalidNotClassFormatPublic()
             ],
         ];
 
-    }//end dataInvalidNotClassFormatPublic()
+    }
 
 
     /**
@@ -153,7 +153,7 @@ public function testValidNotClassFormatPrivate($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, false, false, $strict));
 
-    }//end testValidNotClassFormatPrivate()
+    }
 
 
     /**
@@ -188,7 +188,7 @@ public static function dataValidNotClassFormatPrivate()
             ],
         ];
 
-    }//end dataValidNotClassFormatPrivate()
+    }
 
 
     /**
@@ -205,7 +205,7 @@ public function testInvalidNotClassFormatPrivate($name, $strict)
     {
         $this->assertFalse(Common::isCamelCaps($name, false, false, $strict));
 
-    }//end testInvalidNotClassFormatPrivate()
+    }
 
 
     /**
@@ -268,7 +268,7 @@ public static function dataInvalidNotClassFormatPrivate()
             ],
         ];
 
-    }//end dataInvalidNotClassFormatPrivate()
+    }
 
 
     /**
@@ -285,7 +285,7 @@ public function testValidClassFormatPublic($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, true, true, $strict));
 
-    }//end testValidClassFormatPublic()
+    }
 
 
     /**
@@ -332,7 +332,7 @@ public static function dataValidClassFormatPublic()
             ],
         ];
 
-    }//end dataValidClassFormatPublic()
+    }
 
 
     /**
@@ -348,7 +348,7 @@ public function testInvalidClassFormat($name)
     {
         $this->assertFalse(Common::isCamelCaps($name, true));
 
-    }//end testInvalidClassFormat()
+    }
 
 
     /**
@@ -375,7 +375,7 @@ public static function dataInvalidClassFormat()
             ],
         ];
 
-    }//end dataInvalidClassFormat()
+    }
 
 
     /**
@@ -395,7 +395,7 @@ public function testInvalidClassFormatWithVisibilityPublicFlag($name, $visibilit
     {
         $this->assertFalse(Common::isCamelCaps($name, true, $visibilityPublic));
 
-    }//end testInvalidClassFormatWithVisibilityPublicFlag()
+    }
 
 
     /**
@@ -426,7 +426,7 @@ public static function dataInvalidClassFormatWithVisibilityPublicFlag()
             ],
         ];
 
-    }//end dataInvalidClassFormatWithVisibilityPublicFlag()
+    }
 
 
     /**
@@ -442,7 +442,7 @@ public function testValidDefaultArguments($name)
     {
         $this->assertTrue(Common::isCamelCaps($name));
 
-    }//end testValidDefaultArguments()
+    }
 
 
     /**
@@ -463,7 +463,7 @@ public static function dataValidDefaultArguments()
             ],
         ];
 
-    }//end dataValidDefaultArguments()
+    }
 
 
     /**
@@ -479,7 +479,7 @@ public function testInvalidDefaultArguments($name)
     {
         $this->assertFalse(Common::isCamelCaps($name));
 
-    }//end testInvalidDefaultArguments()
+    }
 
 
     /**
@@ -506,7 +506,7 @@ public static function dataInvalidDefaultArguments()
             ],
         ];
 
-    }//end dataInvalidDefaultArguments()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Common/PrepareForOutputTest.php b/tests/Core/Util/Common/PrepareForOutputTest.php
index f9ad07af51..ef60b1cfdf 100644
--- a/tests/Core/Util/Common/PrepareForOutputTest.php
+++ b/tests/Core/Util/Common/PrepareForOutputTest.php
@@ -38,7 +38,7 @@ public function testPrepareForOutput($content, $exclude, $expected, $expectedWin
     {
         $this->assertSame($expected, Common::prepareForOutput($content, $exclude));
 
-    }//end testPrepareForOutput()
+    }
 
 
     /**
@@ -58,7 +58,7 @@ public function testPrepareForOutputWindows($content, $exclude, $expected, $expe
     {
         $this->assertSame($expectedWin, Common::prepareForOutput($content, $exclude));
 
-    }//end testPrepareForOutputWindows()
+    }
 
 
     /**
@@ -107,7 +107,7 @@ public static function dataPrepareForOutput()
             ],
         ];
 
-    }//end dataPrepareForOutput()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Common/StripColorsTest.php b/tests/Core/Util/Common/StripColorsTest.php
index ff253b8b8e..bdc4805068 100644
--- a/tests/Core/Util/Common/StripColorsTest.php
+++ b/tests/Core/Util/Common/StripColorsTest.php
@@ -35,7 +35,7 @@ public function testStripColors($text, $expected)
     {
         $this->assertSame($expected, Common::stripColors($text));
 
-    }//end testStripColors()
+    }
 
 
     /**
@@ -90,7 +90,7 @@ public static function dataStripColors()
             ],
         ];
 
-    }//end dataStripColors()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Common/SuggestTypeTest.php b/tests/Core/Util/Common/SuggestTypeTest.php
index 8061ae2593..a307287ebf 100644
--- a/tests/Core/Util/Common/SuggestTypeTest.php
+++ b/tests/Core/Util/Common/SuggestTypeTest.php
@@ -30,7 +30,7 @@ public function testSuggestTypeEmpty()
     {
         $this->assertSame('', Common::suggestType(''));
 
-    }//end testSuggestTypeEmpty()
+    }
 
 
     /**
@@ -47,7 +47,7 @@ public function testSuggestTypeAllowedType($varType)
         $result = Common::suggestType($varType);
         $this->assertSame($varType, $result);
 
-    }//end testSuggestTypeAllowedType()
+    }
 
 
     /**
@@ -66,7 +66,7 @@ public static function dataSuggestTypeAllowedType()
 
         return $data;
 
-    }//end dataSuggestTypeAllowedType()
+    }
 
 
     /**
@@ -84,7 +84,7 @@ public function testSuggestTypeAllowedTypeWrongCase($varType, $expected)
         $result = Common::suggestType($varType);
         $this->assertSame($expected, $result);
 
-    }//end testSuggestTypeAllowedTypeWrongCase()
+    }
 
 
     /**
@@ -110,7 +110,7 @@ public static function dataSuggestTypeAllowedTypeWrongCase()
 
         return $data;
 
-    }//end dataSuggestTypeAllowedTypeWrongCase()
+    }
 
 
     /**
@@ -128,7 +128,7 @@ public function testSuggestTypeOther($varType, $expected)
         $result = Common::suggestType($varType);
         $this->assertSame($expected, $result);
 
-    }//end testSuggestTypeOther()
+    }
 
 
     /**
@@ -218,7 +218,7 @@ public static function dataSuggestTypeOther()
             ],
         ];
 
-    }//end dataSuggestTypeOther()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/ExitCode/ExitCodeTest.php b/tests/Core/Util/ExitCode/ExitCodeTest.php
index c95a34e30d..fac1cfd270 100644
--- a/tests/Core/Util/ExitCode/ExitCodeTest.php
+++ b/tests/Core/Util/ExitCode/ExitCodeTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
         // Reset static properties on the Config class.
         AbstractRunnerTestCase::setUp();
 
-    }//end setUp()
+    }
 
 
     /**
@@ -69,7 +69,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()
+    }
 
 
     /**
@@ -92,7 +92,7 @@ public static function tearDownAfterClass(): void
 
         AbstractRunnerTestCase::tearDownAfterClass();
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -111,7 +111,7 @@ public function testPhpcsNoParallel($extraArgs, $expected)
 
         $this->runPhpcsAndCheckExitCode($extraArgs, $expected);
 
-    }//end testPhpcsNoParallel()
+    }
 
 
     /**
@@ -137,7 +137,7 @@ public function testPhpcsParallel($extraArgs, $expected)
 
         $this->runPhpcsAndCheckExitCode($extraArgs, $expected);
 
-    }//end testPhpcsParallel()
+    }
 
 
     /**
@@ -172,7 +172,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()
+    }
 
 
     /**
@@ -199,7 +199,7 @@ private function runPhpcsAndCheckExitCode($extraArgs, $expected)
 
         $this->assertSame($expected, $actual);
 
-    }//end runPhpcsAndCheckExitCode()
+    }
 
 
     /**
@@ -369,7 +369,7 @@ public static function dataPhpcs()
             ],
         ];
 
-    }//end dataPhpcs()
+    }
 
 
     /**
@@ -389,7 +389,7 @@ public function testPhpcbfNoParallel($extraArgs, $expected)
 
         $this->runPhpcbfAndCheckExitCode($extraArgs, $expected);
 
-    }//end testPhpcbfNoParallel()
+    }
 
 
     /**
@@ -416,7 +416,7 @@ public function testPhpcbfParallel($extraArgs, $expected)
 
         $this->runPhpcbfAndCheckExitCode($extraArgs, $expected);
 
-    }//end testPhpcbfParallel()
+    }
 
 
     /**
@@ -443,7 +443,7 @@ private function runPhpcbfAndCheckExitCode($extraArgs, $expected)
 
         $this->assertSame($expected, $actual);
 
-    }//end runPhpcbfAndCheckExitCode()
+    }
 
 
     /**
@@ -641,7 +641,7 @@ public static function dataPhpcbf()
             ],
         ];
 
-    }//end dataPhpcbf()
+    }
 
 
     /**
@@ -667,7 +667,7 @@ private function setServerArgs($cmd, $extraArgs)
             $_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..55548ac099 100644
--- a/tests/Core/Util/Help/HelpTest.php
+++ b/tests/Core/Util/Help/HelpTest.php
@@ -66,7 +66,7 @@ public function testQaArgumentNamesAreWithinAcceptableBounds()
             }
         }
 
-    }//end testQaArgumentNamesAreWithinAcceptableBounds()
+    }
 
 
     /**
@@ -130,7 +130,7 @@ public function testQaValidCategoryOptionDefinitions()
             }//end foreach
         }//end foreach
 
-    }//end testQaValidCategoryOptionDefinitions()
+    }
 
 
     /**
@@ -144,7 +144,7 @@ public function testConstructorTypeError()
 
         new Help(new ConfigDouble(), [], []);
 
-    }//end testConstructorTypeError()
+    }
 
 
     /**
@@ -177,7 +177,7 @@ public function testOptionFiltering($longOptions, $shortOptions, $expected)
 
         $this->assertSame($expected, $activeOptions, 'Option count per category does not match');
 
-    }//end testOptionFiltering()
+    }
 
 
     /**
@@ -283,7 +283,7 @@ public static function dataOptionFiltering()
             ],
         ];
 
-    }//end dataOptionFiltering()
+    }
 
 
     /**
@@ -322,7 +322,7 @@ public function testOptionFilteringSpacerHandling($longOptions, $shortOptions)
             }
         }
 
-    }//end testOptionFilteringSpacerHandling()
+    }
 
 
     /**
@@ -359,7 +359,7 @@ public static function dataOptionFilteringSpacerHandling()
             ],
         ];
 
-    }//end dataOptionFilteringSpacerHandling()
+    }
 
 
     /**
@@ -381,7 +381,7 @@ public function testDisplayUsageCS($cliArgs, $expectedRegex)
         $expectedRegex = str_replace('phpc(bf|s)', 'phpcs', $expectedRegex);
         $this->verifyDisplayUsage($cliArgs, $expectedRegex);
 
-    }//end testDisplayUsageCS()
+    }
 
 
     /**
@@ -404,7 +404,7 @@ public function testDisplayUsageCBF($cliArgs, $expectedRegex)
         $expectedRegex = str_replace('phpc(bf|s)', 'phpcbf', $expectedRegex);
         $this->verifyDisplayUsage($cliArgs, $expectedRegex);
 
-    }//end testDisplayUsageCBF()
+    }
 
 
     /**
@@ -424,7 +424,7 @@ private function verifyDisplayUsage($cliArgs, $expectedRegex)
 
         $help->display();
 
-    }//end verifyDisplayUsage()
+    }
 
 
     /**
@@ -445,7 +445,7 @@ public static function dataDisplayUsage()
             ],
         ];
 
-    }//end dataDisplayUsage()
+    }
 
 
     /**
@@ -474,7 +474,7 @@ public function testReportWidthCalculations($reportWidth, $longOptions, $expecte
 
         $this->expectOutputString($expectedOutput);
 
-    }//end testReportWidthCalculations()
+    }
 
 
     /**
@@ -531,7 +531,7 @@ public static function dataReportWidthCalculations()
         ];
         // phpcs:enable
 
-    }//end dataReportWidthCalculations()
+    }
 
 
     /**
@@ -551,7 +551,7 @@ public function testColorizeVariableInput($input, $expected)
 
         $this->assertSame($expected, $result);
 
-    }//end testColorizeVariableInput()
+    }
 
 
     /**
@@ -592,7 +592,7 @@ public static function dataColorizeVariableInput()
             ],
         ];
 
-    }//end dataColorizeVariableInput()
+    }
 
 
     /**
@@ -616,7 +616,7 @@ public function testPrintCategoryOptionsNoColor($input, $expectedRegex)
 
         $this->expectOutputRegex($expectedRegex['no-color']);
 
-    }//end testPrintCategoryOptionsNoColor()
+    }
 
 
     /**
@@ -640,7 +640,7 @@ public function testPrintCategoryOptionsColor($input, $expectedRegex)
 
         $this->expectOutputRegex($expectedRegex['color']);
 
-    }//end testPrintCategoryOptionsColor()
+    }
 
 
     /**
@@ -711,7 +711,7 @@ public static function dataPrintCategoryOptions()
         ];
         // phpcs:enable
 
-    }//end dataPrintCategoryOptions()
+    }
 
 
     /**
@@ -738,7 +738,7 @@ private function invokeReflectionMethod(Help $help, $methodName, $params = null)
 
         return $returnValue;
 
-    }//end invokeReflectionMethod()
+    }
 
 
     /**
@@ -758,7 +758,7 @@ private function getReflectionProperty(Help $help, $properyName)
 
         return $returnValue;
 
-    }//end getReflectionProperty()
+    }
 
 
     /**
@@ -777,7 +777,7 @@ private function setReflectionProperty(Help $help, $properyName, $value)
         $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..226774b426 100644
--- a/tests/Core/Util/IgnoreList/CheckAndSetTest.php
+++ b/tests/Core/Util/IgnoreList/CheckAndSetTest.php
@@ -42,7 +42,7 @@ public function testCheckAndSet($toSet, $toCheck)
             $this->assertSame($expect, $ignoreList->isIgnored($code), "$code is ignored");
         }
 
-    }//end testCheckAndSet()
+    }
 
 
     /**
@@ -139,7 +139,7 @@ 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..c382c03361 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
@@ -31,7 +31,7 @@ public function testGetInstanceIgnoringAllWorks()
         $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..77f8484c72 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
@@ -31,7 +31,7 @@ public function testGetInstanceIgnoringNothingWorks()
         $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..ff975520a6 100644
--- a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
+++ b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
@@ -36,7 +36,7 @@ public function testGetNewInstanceFrom()
 
         $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..970c57a3b3 100644
--- a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
+++ b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
@@ -37,7 +37,7 @@ public function testIgnoresNothingAndEverything($ignoreList, $expectIgnoresNothi
         $this->assertSame($expectIgnoresNothing, $ignoreList->ignoresNothing(), 'Ignores nothing');
         $this->assertSame($expectIgnoresEverything, $ignoreList->ignoresEverything(), 'Ignores everything');
 
-    }//end testIgnoresNothingAndEverything()
+    }
 
 
     /**
@@ -97,7 +97,7 @@ public static function dataIgnoresNothingAndEverything()
             ],
         ];
 
-    }//end dataIgnoresNothingAndEverything()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/MessageCollector/MessageCollectorTest.php b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
index 69a16767e8..d106e5a8fc 100644
--- a/tests/Core/Util/MessageCollector/MessageCollectorTest.php
+++ b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
@@ -41,7 +41,7 @@ public function testAddingNonStringMessageResultsInException($message)
         $msgCollector = new MessageCollector();
         $msgCollector->add($message);
 
-    }//end testAddingNonStringMessageResultsInException()
+    }
 
 
     /**
@@ -60,7 +60,7 @@ public static function dataAddingNonStringMessageResultsInException()
             'array'   => [['something' => 'incorrect']],
         ];
 
-    }//end dataAddingNonStringMessageResultsInException()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function testAddingMessageWithUnsupportedMessageTypeResultsInException($t
         $msgCollector = new MessageCollector();
         $msgCollector->add('Message', $type);
 
-    }//end testAddingMessageWithUnsupportedMessageTypeResultsInException()
+    }
 
 
     /**
@@ -106,7 +106,7 @@ public static function dataAddingMessageWithUnsupportedMessageTypeResultsInExcep
             'integer which doesn\'t match any of the message type constants: PHP_INT_MAX' => [PHP_INT_MAX],
         ];
 
-    }//end dataAddingMessageWithUnsupportedMessageTypeResultsInException()
+    }
 
 
     /**
@@ -129,7 +129,7 @@ public function testContainsBlockingErrors($messages, $expected)
 
         $this->assertSame($expected, $msgCollector->containsBlockingErrors());
 
-    }//end testContainsBlockingErrors()
+    }
 
 
     /**
@@ -172,7 +172,7 @@ public static function dataContainsBlockingErrors()
             ],
         ];
 
-    }//end dataContainsBlockingErrors()
+    }
 
 
     /**
@@ -202,7 +202,7 @@ public function testDisplayingNonBlockingMessages($messages, $expected)
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testDisplayingNonBlockingMessages()
+    }
 
 
     /**
@@ -279,7 +279,7 @@ public static function dataDisplayingNonBlockingMessages()
         ];
         // phpcs:enable
 
-    }//end dataDisplayingNonBlockingMessages()
+    }
 
 
     /**
@@ -307,7 +307,7 @@ public function testDisplayingBlockingErrors($messages, $expected)
         $this->createErrorCache($msgCollector, $messages);
         $msgCollector->display();
 
-    }//end testDisplayingBlockingErrors()
+    }
 
 
     /**
@@ -356,7 +356,7 @@ public static function dataDisplayingBlockingErrors()
         ];
         // phpcs:enable
 
-    }//end dataDisplayingBlockingErrors()
+    }
 
 
     /**
@@ -383,7 +383,7 @@ public function testNonUniqueMessagesWithDifferentErrorLevelAreAccepted()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testNonUniqueMessagesWithDifferentErrorLevelAreAccepted()
+    }
 
 
     /**
@@ -410,7 +410,7 @@ public function testNonUniqueMessagesWithSameErrorLevelAreAccepted()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testNonUniqueMessagesWithSameErrorLevelAreAccepted()
+    }
 
 
     /**
@@ -442,7 +442,7 @@ public function testCallingDisplayTwiceWillNotShowMessagesTwice()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testCallingDisplayTwiceWillNotShowMessagesTwice()
+    }
 
 
     /**
@@ -473,7 +473,7 @@ public function testDisplayOrderHandling($order, $expected)
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testDisplayOrderHandling()
+    }
 
 
     /**
@@ -510,7 +510,7 @@ public static function dataDisplayOrderHandling()
             ],
         ];
 
-    }//end dataDisplayOrderHandling()
+    }
 
 
     /**
@@ -528,7 +528,7 @@ private function createErrorCache(MessageCollector $collector, $messages)
             $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..cbe4053a3f 100644
--- a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
+++ b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
@@ -35,7 +35,7 @@ public function testGetHumanReadableDuration($duration, $expected)
     {
         $this->assertSame($expected, Timing::getHumanReadableDuration($duration));
 
-    }//end testGetHumanReadableDuration()
+    }
 
 
     /**
@@ -108,7 +108,7 @@ public static function dataGetHumanReadableDuration()
             ],
         ];
 
-    }//end dataGetHumanReadableDuration()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Timing/TimingTest.php b/tests/Core/Util/Timing/TimingTest.php
index 29d9f31d97..736a8da27b 100644
--- a/tests/Core/Util/Timing/TimingTest.php
+++ b/tests/Core/Util/Timing/TimingTest.php
@@ -39,7 +39,7 @@ public function testGetDurationWithoutStartReturnsZero()
     {
         $this->assertSame(0, Timing::getDuration());
 
-    }//end testGetDurationWithoutStartReturnsZero()
+    }
 
 
     /**
@@ -55,7 +55,7 @@ public function testGetDurationWithStartReturnsMilliseconds()
 
         $this->assertIsFloat($duration);
 
-    }//end testGetDurationWithStartReturnsMilliseconds()
+    }
 
 
     /**
@@ -71,7 +71,7 @@ public function testGetDurationSinceReturnsMilliseconds()
 
         $this->assertIsFloat($duration);
 
-    }//end testGetDurationSinceReturnsMilliseconds()
+    }
 
 
     /**
@@ -87,7 +87,7 @@ public function testTimeIsNotPrintedIfTimerWasNeverStarted()
 
         $this->assertStderrOutputSameString('');
 
-    }//end testTimeIsNotPrintedIfTimerWasNeverStarted()
+    }
 
 
     /**
@@ -103,7 +103,7 @@ public function testTimeIsNotPrintedIfTimerWasNeverStartedEvenWhenForced()
 
         $this->assertStderrOutputSameString('');
 
-    }//end testTimeIsNotPrintedIfTimerWasNeverStartedEvenWhenForced()
+    }
 
 
     /**
@@ -124,7 +124,7 @@ public function testTimeIsPrintedOnlyOnce()
         $regex = '`^Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '$`';
         $this->assertStderrOutputMatchesRegex($regex);
 
-    }//end testTimeIsPrintedOnlyOnce()
+    }
 
 
     /**
@@ -145,7 +145,7 @@ 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..a5d269d130 100644
--- a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
+++ b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
@@ -35,7 +35,7 @@ public function testGetHighestWeightedToken($tokens, $expected)
     {
         $this->assertSame($expected, Tokens::getHighestWeightedToken($tokens));
 
-    }//end testGetHighestWeightedToken()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ 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..bf97b51dae 100644
--- a/tests/Core/Util/Tokens/TokenNameTest.php
+++ b/tests/Core/Util/Tokens/TokenNameTest.php
@@ -36,7 +36,7 @@ public function testTokenName($tokenCode, $expected)
     {
         $this->assertSame($expected, Tokens::tokenName($tokenCode));
 
-    }//end testTokenName()
+    }
 
 
     /**
@@ -76,7 +76,7 @@ public static function dataTokenName()
             ],
         ];
 
-    }//end dataTokenName()
+    }
 
 
     /**
@@ -156,7 +156,7 @@ public static function dataPolyfilledPHPNativeTokens()
             ],
         ];
 
-    }//end dataPolyfilledPHPNativeTokens()
+    }
 
 
-}//end class
+}
diff --git a/tests/Core/Util/Writers/StatusWriterTest.php b/tests/Core/Util/Writers/StatusWriterTest.php
index c4cda9921a..b8a0bf2e64 100644
--- a/tests/Core/Util/Writers/StatusWriterTest.php
+++ b/tests/Core/Util/Writers/StatusWriterTest.php
@@ -38,7 +38,7 @@ public function testStatusSentToStdErr($message, $expected)
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testStatusSentToStdErr()
+    }
 
 
     /**
@@ -59,7 +59,7 @@ public static function dataStatusSentToStdErr()
             ],
         ];
 
-    }//end dataStatusSentToStdErr()
+    }
 
 
     /**
@@ -82,7 +82,7 @@ public function testStatusSentToStdErrIndentNewlines($message, $indent, $newline
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testStatusSentToStdErrIndentNewlines()
+    }
 
 
     /**
@@ -131,7 +131,7 @@ public static function dataStatusSentToStdErrIndentNewlines()
             ],
         ];
 
-    }//end dataStatusSentToStdErrIndentNewlines()
+    }
 
 
     /**
@@ -154,7 +154,7 @@ public function testStatusDoesNotGetPrintedWhenPaused()
 
         $this->assertStderrOutputSameString('');
 
-    }//end testStatusDoesNotGetPrintedWhenPaused()
+    }
 
 
     /**
@@ -185,7 +185,7 @@ public function testStatusDoesGetPrintedWhenPausedAndResumed()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testStatusDoesGetPrintedWhenPausedAndResumed()
+    }
 
 
     /**
@@ -209,7 +209,7 @@ public function testStatusDoesGetForcePrintedWhenPaused()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testStatusDoesGetForcePrintedWhenPaused()
+    }
 
 
     /**
@@ -245,7 +245,7 @@ public function testStatusDoesGetForcePrintedWhenPausedAndResumed()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testStatusDoesGetForcePrintedWhenPausedAndResumed()
+    }
 
 
     /**
@@ -271,7 +271,7 @@ public function testWriteNewline()
 
         $this->assertStderrOutputSameString(PHP_EOL . PHP_EOL);
 
-    }//end testWriteNewline()
+    }
 
 
     /**
@@ -327,7 +327,7 @@ public function testNestedPausing()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testNestedPausing()
+    }
 
 
     /**
@@ -383,7 +383,7 @@ public function testResumingMoreOftenThanPaused()
 
         $this->assertStderrOutputSameString($expected);
 
-    }//end testResumingMoreOftenThanPaused()
+    }
 
 
-}//end class
+}
diff --git a/tests/Standards/AbstractSniffTestCase.php b/tests/Standards/AbstractSniffTestCase.php
index d2fefabfd9..697fb57da9 100644
--- a/tests/Standards/AbstractSniffTestCase.php
+++ b/tests/Standards/AbstractSniffTestCase.php
@@ -87,7 +87,7 @@ public static function tearDownAfterClass(): void
     {
         @unlink(self::RULESET_FILENAME);
 
-    }//end tearDownAfterClass()
+    }
 
 
     /**
@@ -122,7 +122,7 @@ protected function getTestFiles(string $testFileBase)
 
         return $testFiles;
 
-    }//end getTestFiles()
+    }
 
 
     /**
@@ -134,7 +134,7 @@ protected function shouldSkipTest()
     {
         return false;
 
-    }//end shouldSkipTest()
+    }
 
 
     /**
@@ -245,7 +245,7 @@ final public function testSniff()
             $this->fail(implode(PHP_EOL, $failureMessages));
         }
 
-    }//end testSniff()
+    }
 
 
     /**
@@ -435,7 +435,7 @@ public function generateFailureMessages(LocalFile $file)
 
         return $failureMessages;
 
-    }//end generateFailureMessages()
+    }
 
 
     /**
@@ -449,7 +449,7 @@ public function generateFailureMessages(LocalFile $file)
     public function setCliValues(string $testFile, Config $config)
     {
 
-    }//end setCliValues()
+    }
 
 
     /**
@@ -474,4 +474,4 @@ abstract protected function getErrorList();
     abstract protected function getWarningList();
 
 
-}//end class
+}

From 675cf2414aca2fe0b93b4574a646eb50cc06126c Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 9 Sep 2025 05:52:57 +0200
Subject: [PATCH 2/3] CS: remove blank line at end of functions

These made sense for readability with the noisy `//end ...` comments, but not without those... they really are not needed.

Includes removing the rule from the PHPCS native ruleset and adding another one to enforce the opposite, i.e. no blank line between function body and close curly.

Includes updating the comment format used for "required method which we don't use" comments in four sniffs to not run into "Empty line required after block comment" issues.
---
 autoload.php                                  |  9 ---
 phpcs.xml.dist                                |  5 +-
 requirements.php                              |  1 -
 scripts/BuildRequirementsCheckMatrix.php      |  4 -
 scripts/build-phar.php                        |  1 -
 src/Config.php                                | 24 ------
 src/Files/DummyFile.php                       |  2 -
 src/Files/File.php                            | 47 ------------
 src/Files/FileList.php                        |  9 ---
 src/Files/LocalFile.php                       |  4 -
 src/Filters/ExactMatch.php                    |  2 -
 src/Filters/Filter.php                        |  5 --
 src/Filters/GitModified.php                   |  3 -
 src/Filters/GitStaged.php                     |  3 -
 src/Fixer.php                                 | 18 -----
 src/Generators/Generator.php                  |  3 -
 src/Generators/HTML.php                       | 10 ---
 src/Generators/Markdown.php                   |  8 --
 src/Generators/Text.php                       |  7 --
 src/Reporter.php                              |  9 ---
 src/Reports/Cbf.php                           |  3 -
 src/Reports/Checkstyle.php                    |  2 -
 src/Reports/Code.php                          |  2 -
 src/Reports/Csv.php                           |  2 -
 src/Reports/Diff.php                          |  2 -
 src/Reports/Emacs.php                         |  2 -
 src/Reports/Full.php                          |  2 -
 src/Reports/Gitblame.php                      |  2 -
 src/Reports/Hgblame.php                       |  2 -
 src/Reports/Info.php                          |  2 -
 src/Reports/Json.php                          |  2 -
 src/Reports/Junit.php                         |  2 -
 src/Reports/Notifysend.php                    |  7 --
 src/Reports/Performance.php                   |  2 -
 src/Reports/Source.php                        |  3 -
 src/Reports/Summary.php                       |  2 -
 src/Reports/Svnblame.php                      |  2 -
 src/Reports/VersionControl.php                |  2 -
 src/Reports/Xml.php                           |  2 -
 src/Ruleset.php                               | 16 ----
 src/Runner.php                                |  9 ---
 src/Sniffs/AbstractArraySniff.php             |  3 -
 src/Sniffs/AbstractPatternSniff.php           | 12 ---
 src/Sniffs/AbstractScopeSniff.php             |  3 -
 src/Sniffs/AbstractVariableSniff.php          |  3 -
 .../Sniffs/Arrays/ArrayIndentSniff.php        |  2 -
 .../Arrays/DisallowLongArraySyntaxSniff.php   |  2 -
 .../Arrays/DisallowShortArraySyntaxSniff.php  |  2 -
 .../Classes/DuplicateClassNameSniff.php       |  2 -
 .../Classes/OpeningBraceSameLineSniff.php     |  2 -
 .../AssignmentInConditionSniff.php            |  2 -
 .../CodeAnalysis/EmptyPHPStatementSniff.php   |  4 -
 .../CodeAnalysis/EmptyStatementSniff.php      |  2 -
 .../ForLoopShouldBeWhileLoopSniff.php         |  2 -
 .../ForLoopWithTestFunctionCallSniff.php      |  2 -
 .../CodeAnalysis/JumbledIncrementerSniff.php  |  3 -
 ...ExplicitBooleanOperatorPrecedenceSniff.php |  2 -
 .../UnconditionalIfStatementSniff.php         |  2 -
 .../UnnecessaryFinalModifierSniff.php         |  2 -
 .../UnusedFunctionParameterSniff.php          |  2 -
 .../UselessOverridingMethodSniff.php          |  2 -
 .../Sniffs/Commenting/DocCommentSniff.php     |  2 -
 .../Generic/Sniffs/Commenting/FixmeSniff.php  |  2 -
 .../Generic/Sniffs/Commenting/TodoSniff.php   |  2 -
 .../DisallowYodaConditionsSniff.php           |  3 -
 .../InlineControlStructureSniff.php           |  2 -
 .../Sniffs/Files/ByteOrderMarkSniff.php       |  2 -
 .../Sniffs/Files/EndFileNewlineSniff.php      |  2 -
 .../Sniffs/Files/EndFileNoNewlineSniff.php    |  2 -
 .../Sniffs/Files/ExecutableFileSniff.php      |  2 -
 .../Generic/Sniffs/Files/InlineHTMLSniff.php  |  2 -
 .../Generic/Sniffs/Files/LineEndingsSniff.php |  2 -
 .../Generic/Sniffs/Files/LineLengthSniff.php  |  3 -
 .../Sniffs/Files/LowercasedFilenameSniff.php  |  2 -
 .../Sniffs/Files/OneClassPerFileSniff.php     |  2 -
 .../Sniffs/Files/OneInterfacePerFileSniff.php |  2 -
 .../Files/OneObjectStructurePerFileSniff.php  |  2 -
 .../Sniffs/Files/OneTraitPerFileSniff.php     |  2 -
 .../DisallowMultipleStatementsSniff.php       |  2 -
 .../MultipleStatementAlignmentSniff.php       |  3 -
 .../Sniffs/Formatting/SpaceAfterCastSniff.php |  2 -
 .../Sniffs/Formatting/SpaceAfterNotSniff.php  |  2 -
 .../Formatting/SpaceBeforeCastSniff.php       |  2 -
 .../FunctionCallArgumentSpacingSniff.php      |  3 -
 .../OpeningFunctionBraceBsdAllmanSniff.php    |  2 -
 ...ningFunctionBraceKernighanRitchieSniff.php |  2 -
 .../Metrics/CyclomaticComplexitySniff.php     |  2 -
 .../Sniffs/Metrics/NestingLevelSniff.php      |  2 -
 .../AbstractClassNamePrefixSniff.php          |  2 -
 .../CamelCapsFunctionNameSniff.php            |  3 -
 .../ConstructorNameSniff.php                  |  4 -
 .../InterfaceNameSuffixSniff.php              |  2 -
 .../TraitNameSuffixSniff.php                  |  2 -
 .../UpperCaseConstantNameSniff.php            |  2 -
 .../Sniffs/PHP/BacktickOperatorSniff.php      |  2 -
 .../PHP/CharacterBeforePHPOpeningTagSniff.php |  2 -
 .../Generic/Sniffs/PHP/ClosingPHPTagSniff.php |  2 -
 .../Sniffs/PHP/DeprecatedFunctionsSniff.php   |  2 -
 .../PHP/DisallowAlternativePHPTagsSniff.php   |  3 -
 .../PHP/DisallowRequestSuperglobalSniff.php   |  2 -
 .../Sniffs/PHP/DisallowShortOpenTagSniff.php  |  3 -
 .../Sniffs/PHP/DiscourageGotoSniff.php        |  2 -
 .../Sniffs/PHP/ForbiddenFunctionsSniff.php    |  3 -
 .../Sniffs/PHP/LowerCaseConstantSniff.php     |  3 -
 .../Sniffs/PHP/LowerCaseKeywordSniff.php      |  2 -
 .../Generic/Sniffs/PHP/LowerCaseTypeSniff.php |  4 -
 .../Sniffs/PHP/NoSilencedErrorsSniff.php      |  2 -
 .../Sniffs/PHP/RequireStrictTypesSniff.php    |  2 -
 .../Generic/Sniffs/PHP/SAPIUsageSniff.php     |  2 -
 .../Generic/Sniffs/PHP/SyntaxSniff.php        |  3 -
 .../Sniffs/PHP/UpperCaseConstantSniff.php     |  1 -
 .../Strings/UnnecessaryHeredocSniff.php       |  2 -
 .../Strings/UnnecessaryStringConcatSniff.php  |  2 -
 .../VersionControl/GitMergeConflictSniff.php  |  2 -
 .../SubversionPropertiesSniff.php             |  3 -
 .../ArbitraryParenthesesSpacingSniff.php      |  2 -
 .../WhiteSpace/DisallowSpaceIndentSniff.php   |  2 -
 .../WhiteSpace/DisallowTabIndentSniff.php     |  2 -
 .../WhiteSpace/GotoTargetSpacingSniff.php     |  2 -
 .../HereNowdocIdentifierSpacingSniff.php      |  2 -
 .../IncrementDecrementSpacingSniff.php        |  2 -
 .../LanguageConstructSpacingSniff.php         |  2 -
 .../Sniffs/WhiteSpace/ScopeIndentSniff.php    |  3 -
 .../SpreadOperatorSpacingAfterSniff.php       |  2 -
 .../Tests/Arrays/ArrayIndentUnitTest.php      |  2 -
 .../DisallowLongArraySyntaxUnitTest.php       |  2 -
 .../DisallowShortArraySyntaxUnitTest.php      |  2 -
 .../Classes/DuplicateClassNameUnitTest.php    |  2 -
 .../Classes/OpeningBraceSameLineUnitTest.php  |  2 -
 .../AssignmentInConditionUnitTest.php         |  2 -
 .../EmptyPHPStatementUnitTest.php             |  3 -
 .../CodeAnalysis/EmptyStatementUnitTest.php   |  2 -
 .../ForLoopShouldBeWhileLoopUnitTest.php      |  2 -
 .../ForLoopWithTestFunctionCallUnitTest.php   |  2 -
 .../JumbledIncrementerUnitTest.php            |  2 -
 ...licitBooleanOperatorPrecedenceUnitTest.php |  2 -
 .../UnconditionalIfStatementUnitTest.php      |  2 -
 .../UnnecessaryFinalModifierUnitTest.php      |  2 -
 .../UnusedFunctionParameterUnitTest.php       |  2 -
 .../UselessOverridingMethodUnitTest.php       |  2 -
 .../Tests/Commenting/DocCommentUnitTest.php   |  3 -
 .../Tests/Commenting/FixmeUnitTest.php        |  2 -
 .../Generic/Tests/Commenting/TodoUnitTest.php |  2 -
 .../DisallowYodaConditionsUnitTest.php        |  2 -
 .../InlineControlStructureUnitTest.php        |  2 -
 .../Tests/Files/ByteOrderMarkUnitTest.php     |  2 -
 .../Tests/Files/EndFileNewlineUnitTest.php    |  2 -
 .../Tests/Files/EndFileNoNewlineUnitTest.php  |  2 -
 .../Tests/Files/ExecutableFileUnitTest.php    |  3 -
 .../Tests/Files/InlineHTMLUnitTest.php        |  2 -
 .../Tests/Files/LineEndingsUnitTest.php       |  3 -
 .../Tests/Files/LineLengthUnitTest.php        |  3 -
 .../Files/LowercasedFilenameUnitTest.php      |  4 -
 .../Tests/Files/OneClassPerFileUnitTest.php   |  2 -
 .../Files/OneInterfacePerFileUnitTest.php     |  2 -
 .../OneObjectStructurePerFileUnitTest.php     |  2 -
 .../Tests/Files/OneTraitPerFileUnitTest.php   |  2 -
 .../DisallowMultipleStatementsUnitTest.php    |  2 -
 .../MultipleStatementAlignmentUnitTest.php    |  2 -
 .../Formatting/SpaceAfterCastUnitTest.php     |  2 -
 .../Formatting/SpaceAfterNotUnitTest.php      |  2 -
 .../Formatting/SpaceBeforeCastUnitTest.php    |  2 -
 .../FunctionCallArgumentSpacingUnitTest.php   |  2 -
 .../OpeningFunctionBraceBsdAllmanUnitTest.php |  2 -
 ...gFunctionBraceKernighanRitchieUnitTest.php |  3 -
 .../Metrics/CyclomaticComplexityUnitTest.php  |  2 -
 .../Tests/Metrics/NestingLevelUnitTest.php    |  2 -
 .../AbstractClassNamePrefixUnitTest.php       |  2 -
 .../CamelCapsFunctionNameUnitTest.php         |  2 -
 .../ConstructorNameUnitTest.php               |  2 -
 .../InterfaceNameSuffixUnitTest.php           |  2 -
 .../TraitNameSuffixUnitTest.php               |  2 -
 .../UpperCaseConstantNameUnitTest.php         |  2 -
 .../Tests/PHP/BacktickOperatorUnitTest.php    |  2 -
 .../CharacterBeforePHPOpeningTagUnitTest.php  |  2 -
 .../Tests/PHP/ClosingPHPTagUnitTest.php       |  2 -
 .../Tests/PHP/DeprecatedFunctionsUnitTest.php |  2 -
 .../DisallowAlternativePHPTagsUnitTest.php    |  2 -
 .../DisallowRequestSuperglobalUnitTest.php    |  2 -
 .../PHP/DisallowShortOpenTagUnitTest.php      |  3 -
 .../Tests/PHP/DiscourageGotoUnitTest.php      |  2 -
 .../Tests/PHP/ForbiddenFunctionsUnitTest.php  |  2 -
 .../Tests/PHP/LowerCaseConstantUnitTest.php   |  2 -
 .../Tests/PHP/LowerCaseKeywordUnitTest.php    |  2 -
 .../Tests/PHP/LowerCaseTypeUnitTest.php       |  2 -
 .../Tests/PHP/NoSilencedErrorsUnitTest.php    |  2 -
 .../Tests/PHP/RequireStrictTypesUnitTest.php  |  2 -
 .../Generic/Tests/PHP/SAPIUsageUnitTest.php   |  2 -
 .../Generic/Tests/PHP/SyntaxUnitTest.php      |  4 -
 .../Tests/PHP/UpperCaseConstantUnitTest.php   |  2 -
 .../Strings/UnnecessaryHeredocUnitTest.php    |  2 -
 .../UnnecessaryStringConcatUnitTest.php       |  2 -
 .../GitMergeConflictUnitTest.php              |  2 -
 .../SubversionPropertiesUnitTest.php          |  3 -
 .../ArbitraryParenthesesSpacingUnitTest.php   |  2 -
 .../DisallowSpaceIndentUnitTest.php           |  3 -
 .../WhiteSpace/DisallowTabIndentUnitTest.php  |  3 -
 .../WhiteSpace/GotoTargetSpacingUnitTest.php  |  2 -
 .../HereNowdocIdentifierSpacingUnitTest.php   |  2 -
 .../IncrementDecrementSpacingUnitTest.php     |  2 -
 .../LanguageConstructSpacingUnitTest.php      |  2 -
 .../Tests/WhiteSpace/ScopeIndentUnitTest.php  |  3 -
 .../SpreadOperatorSpacingAfterUnitTest.php    |  2 -
 .../Sniffs/Classes/ClassDeclarationSniff.php  |  2 -
 .../Sniffs/Commenting/ClassCommentSniff.php   |  3 -
 .../Sniffs/Commenting/FileCommentSniff.php    | 10 ---
 .../Commenting/FunctionCommentSniff.php       |  5 --
 .../Sniffs/Commenting/InlineCommentSniff.php  |  2 -
 .../ControlSignatureSniff.php                 |  1 -
 .../MultiLineConditionSniff.php               |  2 -
 .../PEAR/Sniffs/Files/IncludingFileSniff.php  |  2 -
 .../Formatting/MultiLineAssignmentSniff.php   |  2 -
 .../Functions/FunctionCallSignatureSniff.php  |  5 --
 .../Functions/FunctionDeclarationSniff.php    |  6 --
 .../Functions/ValidDefaultValueSniff.php      |  2 -
 .../NamingConventions/ValidClassNameSniff.php |  2 -
 .../ValidFunctionNameSniff.php                |  3 -
 .../ValidVariableNameSniff.php                | 12 +--
 .../WhiteSpace/ObjectOperatorIndentSniff.php  |  2 -
 .../WhiteSpace/ScopeClosingBraceSniff.php     |  2 -
 .../Classes/ClassDeclarationUnitTest.php      |  3 -
 .../Tests/Commenting/ClassCommentUnitTest.php |  2 -
 .../Tests/Commenting/FileCommentUnitTest.php  |  2 -
 .../Commenting/FunctionCommentUnitTest.php    |  2 -
 .../Commenting/InlineCommentUnitTest.php      |  2 -
 .../ControlSignatureUnitTest.php              |  2 -
 .../MultiLineConditionUnitTest.php            |  2 -
 .../Tests/Files/IncludingFileUnitTest.php     |  2 -
 .../MultiLineAssignmentUnitTest.php           |  2 -
 .../FunctionCallSignatureUnitTest.php         |  2 -
 .../Functions/FunctionDeclarationUnitTest.php |  2 -
 .../Functions/ValidDefaultValueUnitTest.php   |  2 -
 .../ValidClassNameUnitTest.php                |  2 -
 .../ValidFunctionNameUnitTest.php             |  2 -
 .../ValidVariableNameUnitTest.php             |  2 -
 .../ObjectOperatorIndentUnitTest.php          |  2 -
 .../WhiteSpace/ScopeClosingBraceUnitTest.php  |  2 -
 .../Tests/WhiteSpace/ScopeIndentUnitTest.php  |  3 -
 .../Sniffs/Classes/ClassDeclarationSniff.php  |  2 -
 .../PSR1/Sniffs/Files/SideEffectsSniff.php    |  3 -
 .../Methods/CamelCapsMethodNameSniff.php      |  2 -
 .../Classes/ClassDeclarationUnitTest.php      |  2 -
 .../PSR1/Tests/Files/SideEffectsUnitTest.php  |  3 -
 .../Methods/CamelCapsMethodNameUnitTest.php   |  2 -
 .../Classes/AnonClassDeclarationSniff.php     |  4 -
 .../Classes/ClassInstantiationSniff.php       |  2 -
 .../Sniffs/Classes/ClosingBraceSniff.php      |  2 -
 .../Sniffs/Classes/OpeningBraceSpaceSniff.php |  2 -
 .../BooleanOperatorPlacementSniff.php         |  2 -
 .../ControlStructureSpacingSniff.php          |  3 -
 .../Sniffs/Files/DeclareStatementSniff.php    |  2 -
 .../PSR12/Sniffs/Files/FileHeaderSniff.php    |  4 -
 .../Sniffs/Files/ImportStatementSniff.php     |  2 -
 .../PSR12/Sniffs/Files/OpenTagSniff.php       |  2 -
 .../NullableTypeDeclarationSniff.php          |  2 -
 .../Functions/ReturnTypeDeclarationSniff.php  |  2 -
 .../Keywords/ShortFormTypeKeywordsSniff.php   |  2 -
 .../CompoundNamespaceDepthSniff.php           |  2 -
 .../Sniffs/Operators/OperatorSpacingSniff.php |  2 -
 .../Properties/ConstantVisibilitySniff.php    |  2 -
 .../Sniffs/Traits/UseDeclarationSniff.php     |  4 -
 .../Classes/AnonClassDeclarationUnitTest.php  |  2 -
 .../Classes/ClassInstantiationUnitTest.php    |  2 -
 .../Tests/Classes/ClosingBraceUnitTest.php    |  2 -
 .../Classes/OpeningBraceSpaceUnitTest.php     |  2 -
 .../BooleanOperatorPlacementUnitTest.php      |  2 -
 .../ControlStructureSpacingUnitTest.php       |  2 -
 .../Tests/Files/DeclareStatementUnitTest.php  |  2 -
 .../PSR12/Tests/Files/FileHeaderUnitTest.php  |  2 -
 .../Tests/Files/ImportStatementUnitTest.php   |  2 -
 .../PSR12/Tests/Files/OpenTagUnitTest.php     |  2 -
 .../NullableTypeDeclarationUnitTest.php       |  2 -
 .../ReturnTypeDeclarationUnitTest.php         |  2 -
 .../ShortFormTypeKeywordsUnitTest.php         |  2 -
 .../CompoundNamespaceDepthUnitTest.php        |  2 -
 .../Operators/OperatorSpacingUnitTest.php     |  2 -
 .../Properties/ConstantVisibilityUnitTest.php |  2 -
 .../Tests/Traits/UseDeclarationUnitTest.php   |  2 -
 .../Sniffs/Classes/ClassDeclarationSniff.php  |  3 -
 .../Classes/PropertyDeclarationSniff.php      | 12 +--
 .../ControlStructureSpacingSniff.php          |  2 -
 .../ElseIfDeclarationSniff.php                |  2 -
 .../SwitchDeclarationSniff.php                |  4 -
 .../PSR2/Sniffs/Files/ClosingTagSniff.php     |  2 -
 .../PSR2/Sniffs/Files/EndFileNewlineSniff.php |  2 -
 .../Methods/FunctionCallSignatureSniff.php    |  1 -
 .../Methods/FunctionClosingBraceSniff.php     |  2 -
 .../Sniffs/Methods/MethodDeclarationSniff.php |  3 -
 .../Namespaces/NamespaceDeclarationSniff.php  |  2 -
 .../Sniffs/Namespaces/UseDeclarationSniff.php |  3 -
 .../Classes/ClassDeclarationUnitTest.php      |  2 -
 .../Classes/PropertyDeclarationUnitTest.php   |  2 -
 .../ControlStructureSpacingUnitTest.php       |  2 -
 .../ElseIfDeclarationUnitTest.php             |  2 -
 .../SwitchDeclarationUnitTest.php             |  2 -
 .../PSR2/Tests/Files/ClosingTagUnitTest.php   |  2 -
 .../Tests/Files/EndFileNewlineUnitTest.php    |  2 -
 .../Methods/FunctionCallSignatureUnitTest.php |  2 -
 .../Methods/FunctionClosingBraceUnitTest.php  |  2 -
 .../Methods/MethodDeclarationUnitTest.php     |  2 -
 .../NamespaceDeclarationUnitTest.php          |  2 -
 .../Namespaces/UseDeclarationUnitTest.php     |  2 -
 .../Arrays/ArrayBracketSpacingSniff.php       |  2 -
 .../Sniffs/Arrays/ArrayDeclarationSniff.php   |  4 -
 .../Sniffs/Classes/ClassDeclarationSniff.php  |  3 -
 .../Sniffs/Classes/ClassFileNameSniff.php     |  2 -
 .../Classes/LowercaseClassKeywordsSniff.php   |  2 -
 .../Classes/SelfMemberReferenceSniff.php      |  4 -
 .../Sniffs/Classes/ValidClassNameSniff.php    |  2 -
 .../Sniffs/Commenting/BlockCommentSniff.php   |  2 -
 .../Sniffs/Commenting/ClassCommentSniff.php   |  2 -
 .../ClosingDeclarationCommentSniff.php        |  2 -
 .../Commenting/DocCommentAlignmentSniff.php   |  2 -
 .../Commenting/EmptyCatchCommentSniff.php     |  2 -
 .../Sniffs/Commenting/FileCommentSniff.php    |  2 -
 .../Commenting/FunctionCommentSniff.php       |  6 --
 .../FunctionCommentThrowTagSniff.php          |  2 -
 .../Sniffs/Commenting/InlineCommentSniff.php  |  2 -
 .../LongConditionClosingCommentSniff.php      |  2 -
 .../Commenting/PostStatementCommentSniff.php  |  2 -
 .../Commenting/VariableCommentSniff.php       |  4 -
 .../ControlSignatureSniff.php                 |  2 -
 .../ElseIfDeclarationSniff.php                |  2 -
 .../ForEachLoopDeclarationSniff.php           |  2 -
 .../ForLoopDeclarationSniff.php               |  2 -
 .../InlineIfDeclarationSniff.php              |  2 -
 .../LowercaseDeclarationSniff.php             |  2 -
 .../SwitchDeclarationSniff.php                |  2 -
 .../Squiz/Sniffs/Files/FileExtensionSniff.php |  2 -
 .../Formatting/OperatorBracketSniff.php       |  3 -
 ...unctionDeclarationArgumentSpacingSniff.php |  3 -
 .../Functions/FunctionDeclarationSniff.php    |  1 -
 .../FunctionDuplicateArgumentSniff.php        |  2 -
 .../Sniffs/Functions/GlobalFunctionSniff.php  |  2 -
 .../LowercaseFunctionKeywordsSniff.php        |  2 -
 .../MultiLineFunctionDeclarationSniff.php     |  4 -
 .../ValidFunctionNameSniff.php                |  1 -
 .../ValidVariableNameSniff.php                |  3 -
 .../Objects/ObjectInstantiationSniff.php      |  2 -
 .../ComparisonOperatorUsageSniff.php          |  2 -
 .../IncrementDecrementUsageSniff.php          |  4 -
 .../Operators/ValidLogicalOperatorsSniff.php  |  2 -
 .../Sniffs/PHP/CommentedOutCodeSniff.php      |  2 -
 .../PHP/DisallowBooleanStatementSniff.php     |  2 -
 .../PHP/DisallowComparisonAssignmentSniff.php |  2 -
 .../Sniffs/PHP/DisallowInlineIfSniff.php      |  2 -
 .../PHP/DisallowMultipleAssignmentsSniff.php  |  2 -
 .../PHP/DisallowSizeFunctionsInLoopsSniff.php |  2 -
 .../Squiz/Sniffs/PHP/EmbeddedPhpSniff.php     |  6 --
 src/Standards/Squiz/Sniffs/PHP/EvalSniff.php  |  2 -
 .../Squiz/Sniffs/PHP/GlobalKeywordSniff.php   |  2 -
 .../Squiz/Sniffs/PHP/HeredocSniff.php         |  2 -
 .../Squiz/Sniffs/PHP/InnerFunctionsSniff.php  |  2 -
 .../Sniffs/PHP/LowercasePHPFunctionsSniff.php |  3 -
 .../Sniffs/PHP/NonExecutableCodeSniff.php     |  2 -
 .../Sniffs/Scope/MemberVarScopeSniff.php      | 12 +--
 .../Squiz/Sniffs/Scope/MethodScopeSniff.php   |  3 -
 .../Sniffs/Scope/StaticThisUsageSniff.php     |  4 -
 .../Strings/ConcatenationSpacingSniff.php     |  2 -
 .../Sniffs/Strings/DoubleQuoteUsageSniff.php  |  2 -
 .../Sniffs/Strings/EchoedStringsSniff.php     |  2 -
 .../Sniffs/WhiteSpace/CastSpacingSniff.php    |  2 -
 .../ControlStructureSpacingSniff.php          |  2 -
 .../FunctionClosingBraceSpaceSniff.php        |  2 -
 .../FunctionOpeningBraceSpaceSniff.php        |  2 -
 .../WhiteSpace/FunctionSpacingSniff.php       |  2 -
 .../LogicalOperatorSpacingSniff.php           |  2 -
 .../WhiteSpace/MemberVarSpacingSniff.php      | 12 +--
 .../WhiteSpace/ObjectOperatorSpacingSniff.php |  4 -
 .../WhiteSpace/OperatorSpacingSniff.php       |  3 -
 .../WhiteSpace/ScopeClosingBraceSniff.php     |  2 -
 .../WhiteSpace/ScopeKeywordSpacingSniff.php   |  2 -
 .../WhiteSpace/SemicolonSpacingSniff.php      |  2 -
 .../WhiteSpace/SuperfluousWhitespaceSniff.php |  2 -
 .../Arrays/ArrayBracketSpacingUnitTest.php    |  2 -
 .../Tests/Arrays/ArrayDeclarationUnitTest.php |  2 -
 .../Classes/ClassDeclarationUnitTest.php      |  2 -
 .../Tests/Classes/ClassFileNameUnitTest.php   |  3 -
 .../LowercaseClassKeywordsUnitTest.php        |  2 -
 .../Classes/SelfMemberReferenceUnitTest.php   |  2 -
 .../Tests/Classes/ValidClassNameUnitTest.php  |  2 -
 .../Tests/Commenting/BlockCommentUnitTest.php |  3 -
 .../Tests/Commenting/ClassCommentUnitTest.php |  2 -
 .../ClosingDeclarationCommentUnitTest.php     |  2 -
 .../DocCommentAlignmentUnitTest.php           |  2 -
 .../Commenting/EmptyCatchCommentUnitTest.php  |  2 -
 .../Tests/Commenting/FileCommentUnitTest.php  |  2 -
 .../FunctionCommentThrowTagUnitTest.php       |  2 -
 .../Commenting/FunctionCommentUnitTest.php    |  2 -
 .../Commenting/InlineCommentUnitTest.php      |  2 -
 .../LongConditionClosingCommentUnitTest.php   |  2 -
 .../PostStatementCommentUnitTest.php          |  2 -
 .../Commenting/VariableCommentUnitTest.php    |  2 -
 .../ControlSignatureUnitTest.php              |  2 -
 .../ElseIfDeclarationUnitTest.php             |  2 -
 .../ForEachLoopDeclarationUnitTest.php        |  2 -
 .../ForLoopDeclarationUnitTest.php            |  2 -
 .../InlineIfDeclarationUnitTest.php           |  3 -
 .../LowercaseDeclarationUnitTest.php          |  2 -
 .../SwitchDeclarationUnitTest.php             |  2 -
 .../Tests/Files/FileExtensionUnitTest.php     |  2 -
 .../Formatting/OperatorBracketUnitTest.php    |  2 -
 ...tionDeclarationArgumentSpacingUnitTest.php |  2 -
 .../Functions/FunctionDeclarationUnitTest.php |  2 -
 .../FunctionDuplicateArgumentUnitTest.php     |  2 -
 .../Functions/GlobalFunctionUnitTest.php      |  2 -
 .../LowercaseFunctionKeywordsUnitTest.php     |  2 -
 .../MultiLineFunctionDeclarationUnitTest.php  |  2 -
 .../ValidFunctionNameUnitTest.php             |  2 -
 .../ValidVariableNameUnitTest.php             |  2 -
 .../Objects/ObjectInstantiationUnitTest.php   |  2 -
 .../ComparisonOperatorUsageUnitTest.php       |  2 -
 .../IncrementDecrementUsageUnitTest.php       |  2 -
 .../ValidLogicalOperatorsUnitTest.php         |  2 -
 .../Tests/PHP/CommentedOutCodeUnitTest.php    |  2 -
 .../PHP/DisallowBooleanStatementUnitTest.php  |  2 -
 .../DisallowComparisonAssignmentUnitTest.php  |  2 -
 .../Tests/PHP/DisallowInlineIfUnitTest.php    |  2 -
 .../DisallowMultipleAssignmentsUnitTest.php   |  2 -
 .../DisallowSizeFunctionsInLoopsUnitTest.php  |  2 -
 .../PHP/DiscouragedFunctionsUnitTest.php      |  2 -
 .../Squiz/Tests/PHP/EmbeddedPhpUnitTest.php   |  2 -
 .../Squiz/Tests/PHP/EvalUnitTest.php          |  2 -
 .../Squiz/Tests/PHP/GlobalKeywordUnitTest.php |  2 -
 .../Squiz/Tests/PHP/HeredocUnitTest.php       |  2 -
 .../Tests/PHP/InnerFunctionsUnitTest.php      |  2 -
 .../PHP/LowercasePHPFunctionsUnitTest.php     |  2 -
 .../Tests/PHP/NonExecutableCodeUnitTest.php   |  2 -
 .../Tests/Scope/MemberVarScopeUnitTest.php    |  2 -
 .../Squiz/Tests/Scope/MethodScopeUnitTest.php |  2 -
 .../Tests/Scope/StaticThisUsageUnitTest.php   |  2 -
 .../Strings/ConcatenationSpacingUnitTest.php  |  2 -
 .../Strings/DoubleQuoteUsageUnitTest.php      |  2 -
 .../Tests/Strings/EchoedStringsUnitTest.php   |  2 -
 .../Tests/WhiteSpace/CastSpacingUnitTest.php  |  2 -
 .../ControlStructureSpacingUnitTest.php       |  2 -
 .../FunctionClosingBraceSpaceUnitTest.php     |  2 -
 .../FunctionOpeningBraceSpaceUnitTest.php     |  2 -
 .../WhiteSpace/FunctionSpacingUnitTest.php    |  2 -
 .../LogicalOperatorSpacingUnitTest.php        |  2 -
 .../WhiteSpace/MemberVarSpacingUnitTest.php   |  2 -
 .../ObjectOperatorSpacingUnitTest.php         |  2 -
 .../WhiteSpace/OperatorSpacingUnitTest.php    |  2 -
 .../WhiteSpace/ScopeClosingBraceUnitTest.php  |  2 -
 .../ScopeKeywordSpacingUnitTest.php           |  2 -
 .../WhiteSpace/SemicolonSpacingUnitTest.php   |  2 -
 .../SuperfluousWhitespaceUnitTest.php         |  2 -
 .../Zend/Sniffs/Files/ClosingTagSniff.php     |  2 -
 .../ValidVariableNameSniff.php                |  3 -
 .../Zend/Tests/Files/ClosingTagUnitTest.php   |  2 -
 .../ValidVariableNameUnitTest.php             |  2 -
 src/Tokenizers/Comment.php                    |  3 -
 src/Tokenizers/PHP.php                        |  7 --
 src/Tokenizers/Tokenizer.php                  | 10 ---
 src/Util/Cache.php                            |  5 --
 src/Util/Common.php                           | 14 ----
 src/Util/ExitCode.php                         |  1 -
 src/Util/Help.php                             | 13 ----
 src/Util/IgnoreList.php                       |  8 --
 src/Util/MessageCollector.php                 |  7 --
 src/Util/Standards.php                        |  7 --
 src/Util/Timing.php                           |  5 --
 src/Util/Tokens.php                           |  2 -
 src/Util/Writers/StatusWriter.php             |  7 --
 tests/ConfigDouble.php                        |  9 ---
 tests/Core/AbstractMethodTestCase.php         |  7 --
 .../Autoloader/DetermineLoadedClassTest.php   |  3 -
 .../Config/AbstractRealConfigTestCase.php     |  4 -
 tests/Core/Config/ExtensionsArgTest.php       |  5 --
 tests/Core/Config/GeneratorArgTest.php        |  6 --
 tests/Core/Config/IniSetTest.php              | 11 ---
 tests/Core/Config/IssueSquiz2675Test.php      |  1 -
 .../PrepareConfigDataForDisplayTest.php       |  3 -
 tests/Core/Config/ReportArgsTest.php          |  2 -
 tests/Core/Config/ReportWidthTest.php         |  9 ---
 tests/Core/Config/SniffsExcludeArgsTest.php   |  6 --
 tests/Core/ErrorSuppressionTest.php           | 24 ------
 ...ddMessageSelectiveInternalHandlingTest.php |  4 -
 .../Files/File/FindEndOfStatementTest.php     | 22 ------
 .../Files/File/FindExtendedClassNameTest.php  |  4 -
 .../FindImplementedInterfaceNamesTest.php     |  4 -
 .../Files/File/FindStartOfStatementTest.php   | 37 ----------
 .../Files/File/GetClassPropertiesTest.php     |  4 -
 tests/Core/Files/File/GetConditionTest.php    | 10 ---
 .../GetDeclarationNameParseError1Test.php     |  1 -
 .../GetDeclarationNameParseError2Test.php     |  1 -
 .../Files/File/GetDeclarationNameTest.php     |  4 -
 .../Files/File/GetMemberPropertiesTest.php    |  5 --
 .../GetMethodParametersParseError1Test.php    |  1 -
 .../GetMethodParametersParseError2Test.php    |  1 -
 .../GetMethodParametersParseError3Test.php    |  1 -
 .../GetMethodParametersParseError4Test.php    |  1 -
 .../Files/File/GetMethodParametersTest.php    | 74 -------------------
 .../Files/File/GetMethodPropertiesTest.php    | 59 ---------------
 .../Core/Files/File/GetTokensAsStringTest.php |  9 ---
 tests/Core/Files/File/IsReferenceTest.php     |  4 -
 .../FileList/AbstractFileListTestCase.php     |  1 -
 tests/Core/Files/FileList/AddFileTest.php     |  4 -
 tests/Core/Files/FileList/ConstructTest.php   |  2 -
 tests/Core/Files/FileList/FilterDouble.php    |  1 -
 tests/Core/Filters/AbstractFilterTestCase.php |  7 --
 tests/Core/Filters/Filter/AcceptTest.php      |  3 -
 .../ShouldProcessFileWithoutExtensionTest.php |  2 -
 tests/Core/Filters/GitModifiedTest.php        |  5 --
 tests/Core/Filters/GitStagedTest.php          |  5 --
 tests/Core/Fixer/FixFileReturnValueTest.php   |  3 -
 tests/Core/Fixer/GenerateDiffTest.php         |  6 --
 tests/Core/Generators/GeneratorTest.php       |  6 --
 tests/Core/Generators/HTMLTest.php            |  9 ---
 tests/Core/Generators/MarkdownTest.php        |  8 --
 tests/Core/Generators/TextTest.php            |  4 -
 tests/Core/Reporter/MagicMethodsTest.php      |  6 --
 .../Core/Ruleset/AbstractRulesetTestCase.php  |  4 -
 tests/Core/Ruleset/ConstructorTest.php        |  7 --
 .../Ruleset/DisplayCachedMessagesTest.php     | 11 ---
 .../ExpandRulesetReferenceHomePathTest.php    |  5 --
 .../ExpandRulesetReferenceInternalTest.php    |  2 -
 .../Ruleset/ExpandRulesetReferenceTest.php    |  3 -
 .../Core/Ruleset/ExpandSniffDirectoryTest.php |  1 -
 tests/Core/Ruleset/ExplainTest.php            |  5 --
 tests/Core/Ruleset/GetIgnorePatternsTest.php  |  3 -
 tests/Core/Ruleset/GetIncludePatternsTest.php |  3 -
 ...ateTokenListenersNamingConventionsTest.php |  1 -
 .../Ruleset/PopulateTokenListenersTest.php    | 14 ----
 .../Ruleset/ProcessRuleInvalidTypeTest.php    |  1 -
 .../ProcessRuleShouldProcessElementTest.php   | 21 ------
 .../Ruleset/ProcessRulesetAutoloadTest.php    |  3 -
 .../ProcessRulesetBrokenRulesetTest.php       |  3 -
 .../Ruleset/ProcessRulesetCliArgsTest.php     |  7 --
 .../ProcessRulesetConfigDirectivesTest.php    |  4 -
 .../ProcessRulesetIniDirectivesTest.php       |  5 --
 .../Core/Ruleset/ProcessRulesetIniSetTest.php |  4 -
 ...ProcessRulesetShouldProcessElementTest.php | 15 ----
 tests/Core/Ruleset/ProcessRulesetTest.php     |  9 ---
 ...PropertyTypeHandlingOldArrayFormatTest.php |  1 -
 .../Core/Ruleset/PropertyTypeHandlingTest.php |  6 --
 .../RegisterSniffsMissingInterfaceTest.php    |  2 -
 .../RegisterSniffsRemovedTokenizersTest.php   |  3 -
 tests/Core/Ruleset/RegisterSniffsTest.php     |  9 ---
 .../RuleInclusionAbsoluteLinuxTest.php        |  3 -
 .../RuleInclusionAbsoluteWindowsTest.php      |  3 -
 tests/Core/Ruleset/RuleInclusionTest.php      |  9 ---
 tests/Core/Ruleset/SetSniffPropertyTest.php   |  9 ---
 .../Ruleset/ShowSniffDeprecationsTest.php     | 14 ----
 tests/Core/Runner/PrintProgressDotsTest.php   |  5 --
 tests/Core/Runner/PrintProgressTest.php       |  7 --
 .../Runner/RunAllFilesExcludedErrorTest.php   |  5 --
 tests/Core/Runner/RunPHPCSExplainTest.php     |  1 -
 tests/Core/Runner/RunPHPCSGeneratorTest.php   |  1 -
 tests/Core/Sniffs/AbstractArraySniffTest.php  |  9 ---
 .../Sniffs/AbstractArraySniffTestable.php     |  2 -
 .../Core/Standards/StandardRulesetsQATest.php |  2 -
 tests/Core/StatusWriterTestHelper.php         |  8 --
 .../Tokenizers/AbstractTokenizerTestCase.php  |  4 -
 .../Tokenizers/Comment/CommentTestCase.php    |  2 -
 .../Tokenizers/Comment/LiveCoding1Test.php    |  2 -
 .../Tokenizers/Comment/LiveCoding2Test.php    |  2 -
 .../Tokenizers/Comment/LiveCoding3Test.php    |  2 -
 .../Tokenizers/Comment/LiveCoding4Test.php    |  2 -
 .../Comment/MultiLineDocBlockTest.php         |  8 --
 .../PhpcsAnnotationsInDocBlockTest.php        | 17 -----
 .../Comment/SingleLineDocBlockTest.php        |  8 --
 .../PHP/AnonClassParenthesisOwnerTest.php     |  5 --
 .../Core/Tokenizers/PHP/ArrayKeywordTest.php  |  6 --
 tests/Core/Tokenizers/PHP/AttributesTest.php  | 10 ---
 .../PHP/BackfillAsymmetricVisibilityTest.php  |  4 -
 .../Core/Tokenizers/PHP/BackfillEnumTest.php  |  4 -
 .../PHP/BackfillExplicitOctalNotationTest.php |  2 -
 .../PHP/BackfillFnTokenParseErrorTest.php     |  1 -
 .../Tokenizers/PHP/BackfillFnTokenTest.php    | 45 -----------
 .../Tokenizers/PHP/BackfillMatchTokenTest.php | 10 ---
 .../PHP/BackfillNumericSeparatorTest.php      |  4 -
 .../Tokenizers/PHP/BackfillReadonlyTest.php   |  4 -
 tests/Core/Tokenizers/PHP/BitwiseOrTest.php   |  4 -
 .../PHP/ContextSensitiveKeywordsGotoTest.php  |  2 -
 .../PHP/ContextSensitiveKeywordsTest.php      |  4 -
 .../PHP/DNFTypesParseError1Test.php           |  2 -
 .../PHP/DNFTypesParseError2Test.php           |  6 --
 tests/Core/Tokenizers/PHP/DNFTypesTest.php    |  4 -
 .../Tokenizers/PHP/DefaultKeywordTest.php     |  6 --
 tests/Core/Tokenizers/PHP/DoubleArrowTest.php |  6 --
 .../Tokenizers/PHP/DoubleQuotedStringTest.php |  2 -
 tests/Core/Tokenizers/PHP/EnumCaseTest.php    |  6 --
 tests/Core/Tokenizers/PHP/ExitKeywordTest.php |  4 -
 tests/Core/Tokenizers/PHP/FinallyTest.php     |  2 -
 tests/Core/Tokenizers/PHP/GotoLabelTest.php   |  6 --
 .../Core/Tokenizers/PHP/HeredocNowdocTest.php |  7 --
 .../Tokenizers/PHP/HeredocParseErrorTest.php  |  1 -
 .../Core/Tokenizers/PHP/HeredocStringTest.php |  3 -
 .../PHP/NamedFunctionCallArgumentsTest.php    | 14 ----
 .../PHP/NamespacedNameSingleTokenTest.php     |  2 -
 .../PHP/NullableVsInlineThenTest.php          |  4 -
 .../PHP/NullsafeObjectOperatorTest.php        |  5 --
 .../PHP/OtherContextSensitiveKeywordsTest.php |  5 --
 .../Tokenizers/PHP/PHPOpenTagEOF1Test.php     |  1 -
 .../Tokenizers/PHP/PHPOpenTagEOF2Test.php     |  1 -
 .../Tokenizers/PHP/PHPOpenTagEOF3Test.php     |  1 -
 tests/Core/Tokenizers/PHP/PHPOpenTagTest.php  | 10 ---
 .../Tokenizers/PHP/ResolveSimpleTokenTest.php | 17 -----
 tests/Core/Tokenizers/PHP/ShortArrayTest.php  |  4 -
 .../PHP/StableCommentWhitespaceTest.php       |  2 -
 .../PHP/StableCommentWhitespaceWinTest.php    |  2 -
 .../Tokenizers/PHP/TypeIntersectionTest.php   |  4 -
 .../Tokenizers/PHP/TypedConstantsTest.php     |  9 ---
 tests/Core/Tokenizers/PHP/YieldTest.php       |  8 --
 ...reateParenthesisNestingMapDNFTypesTest.php |  4 -
 ...eatePositionMapHeredocNowdocCloserTest.php |  2 -
 ...eatePositionMapHeredocNowdocOpenerTest.php |  2 -
 .../CreatePositionMapTabWidth0Test.php        |  1 -
 .../CreatePositionMapYieldFromTest.php        |  2 -
 .../CreateTokenMapArrayParenthesesTest.php    |  6 --
 ...MapClosureUseParenthesesParseErrorTest.php |  1 -
 ...reateTokenMapClosureUseParenthesesTest.php |  6 --
 .../CreateTokenMapParenthesesTest.php         |  6 --
 ...curseScopeMapCaseKeywordConditionsTest.php |  6 --
 ...seScopeMapDefaultKeywordConditionsTest.php |  7 --
 ...RecurseScopeMapIfKeywordConditionsTest.php |  1 -
 .../RecurseScopeMapSwitchTokenScopeTest.php   |  2 -
 ...curseScopeMapWithNamespaceOperatorTest.php |  2 -
 .../Tokenizer/ReplaceTabsInTokenMiscTest.php  |  3 -
 .../ReplaceTabsInTokenTabWidth1Test.php       |  1 -
 .../ReplaceTabsInTokenTabWidth2Test.php       |  1 -
 .../ReplaceTabsInTokenTabWidth4Test.php       |  1 -
 .../ReplaceTabsInTokenTabWidth5Test.php       |  1 -
 .../Tokenizer/ReplaceTabsInTokenTestCase.php  |  6 --
 tests/Core/Util/Common/EscapeshellcmdTest.php |  2 -
 tests/Core/Util/Common/GetSniffCodeTest.php   |  6 --
 tests/Core/Util/Common/IsCamelCapsTest.php    | 18 -----
 .../Core/Util/Common/PrepareForOutputTest.php |  3 -
 tests/Core/Util/Common/StripColorsTest.php    |  2 -
 tests/Core/Util/Common/SuggestTypeTest.php    |  7 --
 tests/Core/Util/ExitCode/ExitCodeTest.php     | 13 ----
 tests/Core/Util/Help/HelpTest.php             | 21 ------
 .../Core/Util/IgnoreList/CheckAndSetTest.php  |  2 -
 .../IgnoreList/GetInstanceIgnoringAllTest.php |  1 -
 .../GetInstanceIgnoringNothingTest.php        |  1 -
 .../IgnoreList/GetNewInstanceFromTest.php     |  1 -
 .../IgnoresNothingAndEverythingTest.php       |  2 -
 .../MessageCollector/MessageCollectorTest.php | 16 ----
 .../Timing/GetHumanReadableDurationTest.php   |  2 -
 tests/Core/Util/Timing/TimingTest.php         |  7 --
 .../Tokens/GetHighestWeightedTokenTest.php    |  2 -
 tests/Core/Util/Tokens/TokenNameTest.php      |  3 -
 tests/Core/Util/Writers/StatusWriterTest.php  | 11 ---
 tests/Standards/AbstractSniffTestCase.php     |  6 --
 645 files changed, 12 insertions(+), 2413 deletions(-)

diff --git a/autoload.php b/autoload.php
index aaa1507d1c..4bf0a10e89 100644
--- a/autoload.php
+++ b/autoload.php
@@ -140,7 +140,6 @@ public static function load(string $className)
             }
 
             return false;
-
         }
 
 
@@ -183,7 +182,6 @@ public static function loadFile(string $path)
             self::$loadedClasses[$path]    = $className;
             self::$loadedFiles[$className] = $path;
             return self::$loadedClasses[$path];
-
         }
 
 
@@ -244,7 +242,6 @@ static function ($remaining, $current) {
             }
 
             return $className;
-
         }
 
 
@@ -259,7 +256,6 @@ static function ($remaining, $current) {
         public static function addSearchPath(string $path, string $nsPrefix = '')
         {
             self::$searchPaths[$path] = rtrim(trim((string) $nsPrefix), '\\');
-
         }
 
 
@@ -271,7 +267,6 @@ public static function addSearchPath(string $path, string $nsPrefix = '')
         public static function getSearchPaths()
         {
             return self::$searchPaths;
-
         }
 
 
@@ -290,7 +285,6 @@ public static function getLoadedClassName(string $path)
             }
 
             return self::$loadedClasses[$path];
-
         }
 
 
@@ -309,7 +303,6 @@ public static function getLoadedFileName(string $className)
             }
 
             return self::$loadedFiles[$className];
-
         }
 
 
@@ -321,7 +314,6 @@ public static function getLoadedFileName(string $className)
         public static function getLoadedClasses()
         {
             return self::$loadedClasses;
-
         }
 
 
@@ -333,7 +325,6 @@ public static function getLoadedClasses()
         public static function getLoadedFiles()
         {
             return self::$loadedFiles;
-
         }
 
 
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 930b77380a..b98627ea6a 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -64,7 +64,10 @@
     <rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
     <rule ref="Generic.Strings.UnnecessaryHeredoc"/>
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing"/>
-    <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace"/>
+    <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace">
+        <exclude name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose"/>
+    </rule>
+    <rule ref="PSR2.Methods.FunctionClosingBrace"/>
     <rule ref="Squiz.WhiteSpace.FunctionSpacing"/>
     <rule ref="Squiz.WhiteSpace.MemberVarSpacing"/>
     <rule ref="PSR12.Operators.OperatorSpacing"/>
diff --git a/requirements.php b/requirements.php
index c92926a2a6..72db52ea98 100644
--- a/requirements.php
+++ b/requirements.php
@@ -69,5 +69,4 @@ function checkRequirements()
         fwrite(STDERR, sprintf($error, $required, $missing));
         exit($exitCode);
     }
-
 }
diff --git a/scripts/BuildRequirementsCheckMatrix.php b/scripts/BuildRequirementsCheckMatrix.php
index 37936bc1a9..2e2ae48f1d 100644
--- a/scripts/BuildRequirementsCheckMatrix.php
+++ b/scripts/BuildRequirementsCheckMatrix.php
@@ -71,7 +71,6 @@ public function getBuilds()
         );
 
         return $builds;
-
     }
 
 
@@ -105,7 +104,6 @@ private function getValidBuilds()
         }
 
         return $builds;
-
     }
 
 
@@ -137,7 +135,6 @@ private function getInvalidPHPBuilds()
         }
 
         return $builds;
-
     }
 
 
@@ -181,7 +178,6 @@ private function getMissingExtensionsBuilds()
         }//end foreach
 
         return $builds;
-
     }
 
 
diff --git a/scripts/build-phar.php b/scripts/build-phar.php
index bde93ca6ec..c07707df57 100644
--- a/scripts/build-phar.php
+++ b/scripts/build-phar.php
@@ -75,7 +75,6 @@ function stripWhitespaceAndComments(string $fullpath, Config $config)
     }
 
     return $stripped;
-
 }
 
 
diff --git a/src/Config.php b/src/Config.php
index 880af454bd..0a5248c800 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -275,7 +275,6 @@ public function __get(string $name)
         }
 
         return $this->settings[$name];
-
     }
 
 
@@ -348,7 +347,6 @@ public function __set(string $name, $value)
         }//end switch
 
         $this->settings[$name] = $value;
-
     }
 
 
@@ -362,7 +360,6 @@ public function __set(string $name, $value)
     public function __isset(string $name)
     {
         return isset($this->settings[$name]);
-
     }
 
 
@@ -376,7 +373,6 @@ public function __isset(string $name)
     public function __unset(string $name)
     {
         $this->settings[$name] = null;
-
     }
 
 
@@ -388,7 +384,6 @@ public function __unset(string $name)
     public function getSettings()
     {
         return $this->settings;
-
     }
 
 
@@ -402,7 +397,6 @@ public function getSettings()
     public function setSettings(array $settings)
     {
         $this->settings = $settings;
-
     }
 
 
@@ -487,7 +481,6 @@ public function __construct(array $cliArgs = [], bool $dieOnUnknownArg = true)
         }//end if
 
         fclose($handle);
-
     }
 
 
@@ -538,7 +531,6 @@ public function setCommandLineValues(array $args)
                 $this->processUnknownArgument($arg, $i);
             }//end if
         }//end for
-
     }
 
 
@@ -662,7 +654,6 @@ public function restoreDefaults()
         if ($parallel !== null) {
             $this->parallel = max((int) $parallel, 1);
         }
-
     }
 
 
@@ -774,7 +765,6 @@ public function processShortArgument(string $arg, int $pos)
                 $this->processUnknownArgument('-' . $arg, $pos);
             }
         }//end switch
-
     }
 
 
@@ -1306,7 +1296,6 @@ public function processLongArgument(string $arg, int $pos)
             }//end if
             break;
         }//end switch
-
     }
 
 
@@ -1393,7 +1382,6 @@ static function ($carry, $item) {
         }
 
         return $sniffs;
-
     }
 
 
@@ -1422,7 +1410,6 @@ public function processUnknownArgument(string $arg, int $pos)
         }
 
         $this->processFilePath($arg);
-
     }
 
 
@@ -1458,7 +1445,6 @@ public function processFilePath(string $path)
             $this->files = $files;
             $this->overriddenDefaults['files'] = true;
         }
-
     }
 
 
@@ -1478,7 +1464,6 @@ public function printUsage()
         }
 
         echo PHP_EOL;
-
     }
 
 
@@ -1505,7 +1490,6 @@ public function printShortUsage(bool $returnOutput = false)
         }
 
         echo $usage;
-
     }
 
 
@@ -1531,7 +1515,6 @@ public function printPHPCSUsage()
         $shortOptions = Help::DEFAULT_SHORT_OPTIONS . 'aems';
 
         (new Help($this, $longOptions, $shortOptions))->display();
-
     }
 
 
@@ -1547,7 +1530,6 @@ public function printPHPCBFUsage()
         $shortOptions  = Help::DEFAULT_SHORT_OPTIONS;
 
         (new Help($this, $longOptions, $shortOptions))->display();
-
     }
 
 
@@ -1573,7 +1555,6 @@ public static function getConfigData(string $key)
         }
 
         return $phpCodeSnifferConfig[$key];
-
     }
 
 
@@ -1614,7 +1595,6 @@ public static function getExecutablePath(string $name)
 
         self::$executablePaths[$name] = $result;
         return $result;
-
     }
 
 
@@ -1696,7 +1676,6 @@ public function setConfigData(string $key, ?string $value, bool $temp = false)
         }
 
         return true;
-
     }
 
 
@@ -1738,7 +1717,6 @@ public static function getAllConfigData()
         self::$configDataFile = $configFile;
         self::$configData     = $phpCodeSnifferConfig;
         return self::$configData;
-
     }
 
 
@@ -1773,7 +1751,6 @@ public function prepareConfigDataForDisplay(array $data)
         }
 
         return $output;
-
     }
 
 
@@ -1789,7 +1766,6 @@ public function prepareConfigDataForDisplay(array $data)
     public function printConfigData(array $data)
     {
         echo $this->prepareConfigDataForDisplay($data);
-
     }
 
 
diff --git a/src/Files/DummyFile.php b/src/Files/DummyFile.php
index 7583409aff..f5e1e135ab 100644
--- a/src/Files/DummyFile.php
+++ b/src/Files/DummyFile.php
@@ -55,7 +55,6 @@ public function __construct(string $content, Ruleset $ruleset, Config $config)
         }
 
         parent::__construct($path, $ruleset, $config);
-
     }
 
 
@@ -85,7 +84,6 @@ public function setErrorCounts(
         $this->fixableWarningCount = $fixableWarningCount;
         $this->fixedErrorCount     = $fixedErrorCount;
         $this->fixedWarningCount   = $fixedWarningCount;
-
     }
 
 
diff --git a/src/Files/File.php b/src/Files/File.php
index adf5a6a5b9..9a0ffa828c 100644
--- a/src/Files/File.php
+++ b/src/Files/File.php
@@ -283,7 +283,6 @@ 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;
-
     }
 
 
@@ -307,7 +306,6 @@ public function setContent(string $content)
             $this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings');
             return;
         }
-
     }
 
 
@@ -321,7 +319,6 @@ public function setContent(string $content)
      */
     public function reloadContent()
     {
-
     }
 
 
@@ -333,7 +330,6 @@ public function reloadContent()
     public function disableCaching()
     {
         $this->configCache['cache'] = false;
-
     }
 
 
@@ -558,7 +554,6 @@ public function process()
         $this->fixedCount       += $this->fixer->getFixCount();
         $this->fixedErrorCount   = ($this->firstRunCounts['fixableError'] - $this->fixableErrorCount);
         $this->fixedWarningCount = ($this->firstRunCounts['fixableWarning'] - $this->fixableWarningCount);
-
     }
 
 
@@ -622,7 +617,6 @@ public function parse()
 
             StatusWriter::write("[$this->numTokens tokens in $numLines lines]... ", 0, $newlines);
         }
-
     }
 
 
@@ -634,7 +628,6 @@ public function parse()
     public function getTokens()
     {
         return $this->tokens;
-
     }
 
 
@@ -653,7 +646,6 @@ public function cleanUp()
         $this->fixer         = null;
         $this->config        = null;
         $this->ruleset       = null;
-
     }
 
 
@@ -687,7 +679,6 @@ public function addError(
         }
 
         return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable);
-
     }
 
 
@@ -721,7 +712,6 @@ public function addWarning(
         }
 
         return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable);
-
     }
 
 
@@ -745,7 +735,6 @@ public function addErrorOnLine(
         int $severity = 0
     ) {
         return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
-
     }
 
 
@@ -769,7 +758,6 @@ public function addWarningOnLine(
         int $severity = 0
     ) {
         return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
-
     }
 
 
@@ -800,7 +788,6 @@ public function addFixableError(
         }
 
         return false;
-
     }
 
 
@@ -831,7 +818,6 @@ public function addFixableWarning(
         }
 
         return false;
-
     }
 
 
@@ -1092,7 +1078,6 @@ protected function addMessage(
         }
 
         return true;
-
     }
 
 
@@ -1120,7 +1105,6 @@ public function recordMetric(int $stackPtr, string $metric, string $value)
         }
 
         return true;
-
     }
 
 
@@ -1132,7 +1116,6 @@ public function recordMetric(int $stackPtr, string $metric, string $value)
     public function getErrorCount()
     {
         return $this->errorCount;
-
     }
 
 
@@ -1144,7 +1127,6 @@ public function getErrorCount()
     public function getWarningCount()
     {
         return $this->warningCount;
-
     }
 
 
@@ -1156,7 +1138,6 @@ public function getWarningCount()
     public function getFixableCount()
     {
         return ($this->fixableErrorCount + $this->fixableWarningCount);
-
     }
 
 
@@ -1168,7 +1149,6 @@ public function getFixableCount()
     public function getFixableErrorCount()
     {
         return $this->fixableErrorCount;
-
     }
 
 
@@ -1180,7 +1160,6 @@ public function getFixableErrorCount()
     public function getFixableWarningCount()
     {
         return $this->fixableWarningCount;
-
     }
 
 
@@ -1192,7 +1171,6 @@ public function getFixableWarningCount()
     public function getFixedCount()
     {
         return $this->fixedCount;
-
     }
 
 
@@ -1204,7 +1182,6 @@ public function getFixedCount()
     public function getFixedErrorCount()
     {
         return $this->fixedErrorCount;
-
     }
 
 
@@ -1216,7 +1193,6 @@ public function getFixedErrorCount()
     public function getFixedWarningCount()
     {
         return $this->fixedWarningCount;
-
     }
 
 
@@ -1232,7 +1208,6 @@ public function getFixedWarningCount()
     public function getFirstRunCount(string $type): int
     {
         return $this->firstRunCounts[$type];
-
     }
 
 
@@ -1244,7 +1219,6 @@ public function getFirstRunCount(string $type): int
     public function getIgnoredLines()
     {
         return $this->tokenizer->ignoredLines;
-
     }
 
 
@@ -1256,7 +1230,6 @@ public function getIgnoredLines()
     public function getErrors()
     {
         return $this->errors;
-
     }
 
 
@@ -1268,7 +1241,6 @@ public function getErrors()
     public function getWarnings()
     {
         return $this->warnings;
-
     }
 
 
@@ -1280,7 +1252,6 @@ public function getWarnings()
     public function getMetrics()
     {
         return $this->metrics;
-
     }
 
 
@@ -1292,7 +1263,6 @@ public function getMetrics()
     public function getListenerTimes()
     {
         return $this->listenerTimes;
-
     }
 
 
@@ -1304,7 +1274,6 @@ public function getListenerTimes()
     public function getFilename()
     {
         return $this->path;
-
     }
 
 
@@ -1350,7 +1319,6 @@ public function getDeclarationName(int $stackPtr)
         }
 
         return $content;
-
     }
 
 
@@ -1688,7 +1656,6 @@ public function getMethodParameters(int $stackPtr)
         }//end for
 
         return $vars;
-
     }
 
 
@@ -1871,7 +1838,6 @@ public function getMethodProperties(int $stackPtr)
             'is_static'             => $isStatic,
             'has_body'              => $hasBody,
         ];
-
     }
 
 
@@ -2071,7 +2037,6 @@ public function getMemberProperties(int $stackPtr)
             'type_end_token'  => $typeEndToken,
             'nullable_type'   => $nullableType,
         ];
-
     }
 
 
@@ -2137,7 +2102,6 @@ public function getClassProperties(int $stackPtr)
             'is_final'    => $isFinal,
             'is_readonly' => $isReadonly,
         ];
-
     }
 
 
@@ -2248,7 +2212,6 @@ public function isReference(int $stackPtr)
         }//end if
 
         return false;
-
     }
 
 
@@ -2291,7 +2254,6 @@ public function getTokensAsString($start, $length, bool $origContent = false)
         }
 
         return $str;
-
     }
 
 
@@ -2372,7 +2334,6 @@ public function findPrevious(
         }//end for
 
         return false;
-
     }
 
 
@@ -2439,7 +2400,6 @@ public function findNext(
         }//end for
 
         return false;
-
     }
 
 
@@ -2630,7 +2590,6 @@ public function findStartOfStatement(int $start, $ignore = null)
         }//end for
 
         return 0;
-
     }
 
 
@@ -2745,7 +2704,6 @@ public function findEndOfStatement(int $start, $ignore = null)
         }//end for
 
         return ($this->numTokens - 1);
-
     }
 
 
@@ -2807,7 +2765,6 @@ public function findFirstOnLine($types, int $start, bool $exclude = false, ?stri
         }//end for
 
         return $foundToken;
-
     }
 
 
@@ -2842,7 +2799,6 @@ public function hasCondition(int $stackPtr, $types)
         }
 
         return false;
-
     }
 
 
@@ -2884,7 +2840,6 @@ public function getCondition(int $stackPtr, $type, bool $first = true)
         }
 
         return false;
-
     }
 
 
@@ -2934,7 +2889,6 @@ public function findExtendedClassName(int $stackPtr)
         }
 
         return $name;
-
     }
 
 
@@ -2986,7 +2940,6 @@ public function findImplementedInterfaceNames(int $stackPtr)
             $names = array_map('trim', $names);
             return $names;
         }
-
     }
 
 
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
index bf8891fc3f..4468b4400b 100644
--- a/src/Files/FileList.php
+++ b/src/Files/FileList.php
@@ -102,7 +102,6 @@ public function __construct(Config $config, Ruleset $ruleset)
 
         reset($this->files);
         $this->numFiles = count($this->files);
-
     }
 
 
@@ -142,7 +141,6 @@ public function addFile(string $path, ?File $file = null)
             $this->files[$path] = $file;
             $this->numFiles++;
         }
-
     }
 
 
@@ -174,7 +172,6 @@ private function getFilterClass()
         }
 
         return $filterClass;
-
     }
 
 
@@ -187,7 +184,6 @@ private function getFilterClass()
     public function rewind()
     {
         reset($this->files);
-
     }
 
 
@@ -205,7 +201,6 @@ public function current()
         }
 
         return $this->files[$path];
-
     }
 
 
@@ -218,7 +213,6 @@ public function current()
     public function key()
     {
         return key($this->files);
-
     }
 
 
@@ -231,7 +225,6 @@ public function key()
     public function next()
     {
         next($this->files);
-
     }
 
 
@@ -248,7 +241,6 @@ public function valid()
         }
 
         return true;
-
     }
 
 
@@ -261,7 +253,6 @@ public function valid()
     public function count()
     {
         return $this->numFiles;
-
     }
 
 
diff --git a/src/Files/LocalFile.php b/src/Files/LocalFile.php
index 6a47c3ce2b..73412acc93 100644
--- a/src/Files/LocalFile.php
+++ b/src/Files/LocalFile.php
@@ -60,7 +60,6 @@ public function __construct(string $path, Ruleset $ruleset, Config $config)
         $this->reloadContent();
 
         parent::__construct($this->path, $ruleset, $config);
-
     }
 
 
@@ -72,7 +71,6 @@ public function __construct(string $path, Ruleset $ruleset, Config $config)
     public function reloadContent()
     {
         $this->setContent(file_get_contents($this->path));
-
     }
 
 
@@ -150,7 +148,6 @@ public function process()
             $this->replayErrors($this->errors, $this->warnings);
             $this->configCache['cache'] = true;
         }
-
     }
 
 
@@ -214,7 +211,6 @@ private function replayErrors(array $errors, array $warnings)
         }
 
         $this->replayingErrors = false;
-
     }
 
 
diff --git a/src/Filters/ExactMatch.php b/src/Filters/ExactMatch.php
index f004b9e0a7..628df6ab14 100644
--- a/src/Filters/ExactMatch.php
+++ b/src/Filters/ExactMatch.php
@@ -67,7 +67,6 @@ public function accept()
         }
 
         return isset($this->allowedFiles[$filePath]);
-
     }
 
 
@@ -85,7 +84,6 @@ public function getChildren()
         $children->disallowedFiles = $this->disallowedFiles;
         $children->allowedFiles    = $this->allowedFiles;
         return $children;
-
     }
 
 
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
index 75c81e202f..bb6b38cb04 100644
--- a/src/Filters/Filter.php
+++ b/src/Filters/Filter.php
@@ -95,7 +95,6 @@ public function __construct(RecursiveIterator $iterator, string $basedir, Config
         if (is_dir($basedir) === true || Common::isPharFile($basedir) === true) {
             $this->isBasedirDir = true;
         }
-
     }
 
 
@@ -137,7 +136,6 @@ public function accept()
 
         $this->acceptedPaths[$realPath] = true;
         return true;
-
     }
 
 
@@ -165,7 +163,6 @@ public function getChildren()
         $children->ignoreFilePatterns = $this->ignoreFilePatterns;
         $children->acceptedPaths      = $this->acceptedPaths;
         return $children;
-
     }
 
 
@@ -214,7 +211,6 @@ protected function shouldProcessFile(string $path)
         }
 
         return true;
-
     }
 
 
@@ -298,7 +294,6 @@ protected function shouldIgnorePath(string $path)
         }//end foreach
 
         return false;
-
     }
 
 
diff --git a/src/Filters/GitModified.php b/src/Filters/GitModified.php
index 87d9018fd4..648786b484 100644
--- a/src/Filters/GitModified.php
+++ b/src/Filters/GitModified.php
@@ -25,7 +25,6 @@ class GitModified extends ExactMatch
     protected function getDisallowedFiles()
     {
         return [];
-
     }
 
 
@@ -62,7 +61,6 @@ protected function getAllowedFiles()
         }
 
         return $modified;
-
     }
 
 
@@ -85,7 +83,6 @@ protected function exec(string $cmd)
         }
 
         return $output;
-
     }
 
 
diff --git a/src/Filters/GitStaged.php b/src/Filters/GitStaged.php
index 150436cc99..b1ce9f6afb 100644
--- a/src/Filters/GitStaged.php
+++ b/src/Filters/GitStaged.php
@@ -27,7 +27,6 @@ class GitStaged extends ExactMatch
     protected function getDisallowedFiles()
     {
         return [];
-
     }
 
 
@@ -64,7 +63,6 @@ protected function getAllowedFiles()
         }
 
         return $modified;
-
     }
 
 
@@ -87,7 +85,6 @@ protected function exec(string $cmd)
         }
 
         return $output;
-
     }
 
 
diff --git a/src/Fixer.php b/src/Fixer.php
index c13af49dd5..52241dc512 100644
--- a/src/Fixer.php
+++ b/src/Fixer.php
@@ -136,7 +136,6 @@ public function startFile(File $phpcsFile)
                 $this->tokens[$index] = $token['content'];
             }
         }
-
     }
 
 
@@ -219,7 +218,6 @@ public function fixFile()
         }
 
         return true;
-
     }
 
 
@@ -336,7 +334,6 @@ public function generateDiff(?string $filePath = null, bool $colors = true)
         $diff = implode(PHP_EOL, $diff);
 
         return $diff;
-
     }
 
 
@@ -351,7 +348,6 @@ public function generateDiff(?string $filePath = null, bool $colors = true)
     public function getFixCount()
     {
         return $this->numFixes;
-
     }
 
 
@@ -364,7 +360,6 @@ public function getContents()
     {
         $contents = implode($this->tokens);
         return $contents;
-
     }
 
 
@@ -387,7 +382,6 @@ public function getTokenContent(int $stackPtr)
         } else {
             return $this->tokens[$stackPtr];
         }
-
     }
 
 
@@ -417,7 +411,6 @@ public function beginChangeset()
 
         $this->changeset   = [];
         $this->inChangeset = true;
-
     }
 
 
@@ -461,7 +454,6 @@ public function endChangeset()
 
         $this->changeset = [];
         return true;
-
     }
 
 
@@ -496,7 +488,6 @@ public function rollbackChangeset()
 
             $this->changeset = [];
         }//end if
-
     }
 
 
@@ -617,7 +608,6 @@ public function replaceToken(int $stackPtr, string $content)
         }
 
         return true;
-
     }
 
 
@@ -675,7 +665,6 @@ public function revertToken(int $stackPtr)
         }
 
         return true;
-
     }
 
 
@@ -700,7 +689,6 @@ public function substrToken(int $stackPtr, int $start, ?int $length = null)
         }
 
         return $this->replaceToken($stackPtr, $newContent);
-
     }
 
 
@@ -715,7 +703,6 @@ public function addNewline(int $stackPtr)
     {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current . $this->currentFile->eolChar);
-
     }
 
 
@@ -730,7 +717,6 @@ public function addNewlineBefore(int $stackPtr)
     {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $this->currentFile->eolChar . $current);
-
     }
 
 
@@ -746,7 +732,6 @@ public function addContent(int $stackPtr, string $content)
     {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current . $content);
-
     }
 
 
@@ -762,7 +747,6 @@ public function addContentBefore(int $stackPtr, string $content)
     {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $content . $current);
-
     }
 
 
@@ -824,7 +808,6 @@ public function changeCodeBlockIndent(int $start, int $end, int $change)
         if ($useChangeset === true) {
             $this->endChangeset();
         }
-
     }
 
 
@@ -844,7 +827,6 @@ private function getSniffCodeForDebug(string $className)
             // Sniff code could not be determined. This may be an abstract sniff class or a helper class.
             return $className;
         }
-
     }
 
 
diff --git a/src/Generators/Generator.php b/src/Generators/Generator.php
index b9cd8eeb11..39badf3feb 100644
--- a/src/Generators/Generator.php
+++ b/src/Generators/Generator.php
@@ -70,7 +70,6 @@ public function __construct(Ruleset $ruleset)
 
         // Always present the docs in a consistent alphabetical order.
         sort($this->docFiles, (SORT_NATURAL | SORT_FLAG_CASE));
-
     }
 
 
@@ -101,7 +100,6 @@ protected function getTitle(DOMElement $doc)
         }
 
         return $title;
-
     }
 
 
@@ -132,7 +130,6 @@ public function generate()
 
             $this->processSniff($documentation);
         }
-
     }
 
 
diff --git a/src/Generators/HTML.php b/src/Generators/HTML.php
index e746730af4..61ecc55297 100644
--- a/src/Generators/HTML.php
+++ b/src/Generators/HTML.php
@@ -161,7 +161,6 @@ public function generate()
             echo $content;
             echo $this->getFormattedFooter();
         }
-
     }
 
 
@@ -190,7 +189,6 @@ protected function getFormattedHeader()
 
         // Use the correct line endings based on the OS.
         return str_replace("\n", PHP_EOL, $output) . PHP_EOL;
-
     }
 
 
@@ -227,7 +225,6 @@ protected function getFormattedToc()
         $output .= '  </ul>' . PHP_EOL;
 
         return $output;
-
     }
 
 
@@ -255,7 +252,6 @@ protected function getFormattedFooter()
 
         // Use the correct line endings based on the OS.
         return str_replace("\n", PHP_EOL, $output) . PHP_EOL;
-
     }
 
 
@@ -288,7 +284,6 @@ public function processSniff(DOMElement $doc)
             );
             echo $content;
         }
-
     }
 
 
@@ -317,7 +312,6 @@ private function titleToAnchor(string $title)
         $this->seenAnchors[$title] = true;
 
         return $title;
-
     }
 
 
@@ -370,7 +364,6 @@ protected function getFormattedTextBlock(DOMNode $node)
         }
 
         return '  <p class="text">' . implode('', $lines) . '</p>' . PHP_EOL;
-
     }
 
 
@@ -426,7 +419,6 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
         }
 
         return $output;
-
     }
 
 
@@ -443,7 +435,6 @@ private function formatCodeTitle(DOMElement $codeElm)
     {
         $title = trim($codeElm->getAttribute('title'));
         return str_replace('  ', '&nbsp;&nbsp;', $title);
-
     }
 
 
@@ -465,7 +456,6 @@ private function formatCodeSample(DOMElement $codeElm)
         $code = str_replace(['<em>', '</em>'], ['<span class="code-comparison-highlight">', '</span>'], $code);
 
         return $code;
-
     }
 
 
diff --git a/src/Generators/Markdown.php b/src/Generators/Markdown.php
index 121600674c..a1690d8e98 100644
--- a/src/Generators/Markdown.php
+++ b/src/Generators/Markdown.php
@@ -54,7 +54,6 @@ public function generate()
             echo $content;
             echo $this->getFormattedFooter();
         }
-
     }
 
 
@@ -71,7 +70,6 @@ protected function getFormattedHeader()
         $standard = $this->ruleset->name;
 
         return "# $standard Coding Standard" . PHP_EOL;
-
     }
 
 
@@ -93,7 +91,6 @@ protected function getFormattedFooter()
         error_reporting($errorLevel);
 
         return $output;
-
     }
 
 
@@ -122,7 +119,6 @@ protected function processSniff(DOMElement $doc)
             echo PHP_EOL . "## $title" . PHP_EOL . PHP_EOL;
             echo $content;
         }
-
     }
 
 
@@ -173,7 +169,6 @@ protected function getFormattedTextBlock(DOMNode $node)
         }
 
         return implode(PHP_EOL, $lines) . PHP_EOL;
-
     }
 
 
@@ -233,7 +228,6 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
         }
 
         return $output;
-
     }
 
 
@@ -250,7 +244,6 @@ private function formatCodeTitle(DOMElement $codeElm)
     {
         $title = trim($codeElm->getAttribute('title'));
         return str_replace('  ', '&nbsp;&nbsp;', $title);
-
     }
 
 
@@ -271,7 +264,6 @@ private function formatCodeSample(DOMElement $codeElm)
         $code = str_replace(['<em>', '</em>'], '', $code);
 
         return $code;
-
     }
 
 
diff --git a/src/Generators/Text.php b/src/Generators/Text.php
index 33fe3b97f1..a6f371a8aa 100644
--- a/src/Generators/Text.php
+++ b/src/Generators/Text.php
@@ -43,7 +43,6 @@ public function processSniff(DOMElement $doc)
         if (trim($content) !== '') {
             echo $this->getFormattedTitle($doc), $content;
         }
-
     }
 
 
@@ -73,7 +72,6 @@ protected function getFormattedTitle(DOMElement $doc)
         $output .= PHP_EOL . PHP_EOL;
 
         return $output;
-
     }
 
 
@@ -102,7 +100,6 @@ protected function getFormattedTextBlock(DOMNode $node)
         $text      = implode(PHP_EOL, $nodeLines);
 
         return wordwrap($text, 100, PHP_EOL) . PHP_EOL . PHP_EOL;
-
     }
 
 
@@ -155,7 +152,6 @@ protected function getFormattedCodeComparisonBlock(DOMNode $node)
         }
 
         return $output;
-
     }
 
 
@@ -178,7 +174,6 @@ private function codeTitleToLines(DOMElement $codeElm)
         $title = wordwrap($title, 46, "\n");
 
         return explode("\n", $title);
-
     }
 
 
@@ -200,7 +195,6 @@ private function codeToLines(DOMElement $codeElm)
 
         $code = str_replace(['<em>', '</em>'], '', $code);
         return explode("\n", $code);
-
     }
 
 
@@ -231,7 +225,6 @@ private function linesToTableRows(array $column1Lines, array $column2Lines)
         }//end for
 
         return $rows;
-
     }
 
 
diff --git a/src/Reporter.php b/src/Reporter.php
index a678bb8e2e..eb81515abe 100644
--- a/src/Reporter.php
+++ b/src/Reporter.php
@@ -176,7 +176,6 @@ public function __construct(Config $config)
                 file_put_contents($output, '');
             }
         }//end foreach
-
     }
 
 
@@ -190,7 +189,6 @@ public function __construct(Config $config)
     public function __isset(string $name)
     {
         return ($name === 'totalFixable' || $name === 'totalFixed');
-
     }
 
 
@@ -218,7 +216,6 @@ public function __get(string $name)
         }
 
         throw new RuntimeException("ERROR: access requested to unknown property \"Reporter::\${$name}\"");
-
     }
 
 
@@ -235,7 +232,6 @@ public function __get(string $name)
     public function __set(string $name, $value)
     {
         throw new RuntimeException("ERROR: setting property \"Reporter::\${$name}\" is not allowed");
-
     }
 
 
@@ -251,7 +247,6 @@ public function __set(string $name, $value)
     public function __unset(string $name)
     {
         throw new RuntimeException("ERROR: unsetting property \"Reporter::\${$name}\" is not allowed");
-
     }
 
 
@@ -275,7 +270,6 @@ public function printReports()
         }
 
         return $toScreen;
-
     }
 
 
@@ -341,7 +335,6 @@ public function printReport(string $report)
                 unset($this->tmpFiles[$report]);
             }
         }
-
     }
 
 
@@ -407,7 +400,6 @@ public function cacheFileReport(File $phpcsFile)
             $this->totalFixedErrors     += $phpcsFile->getFixedErrorCount();
             $this->totalFixedWarnings   += $phpcsFile->getFixedWarningCount();
         }
-
     }
 
 
@@ -525,7 +517,6 @@ public function prepareFileReport(File $phpcsFile)
         ksort($errors);
         $report['messages'] = $errors;
         return $report;
-
     }
 
 
diff --git a/src/Reports/Cbf.php b/src/Reports/Cbf.php
index 33edd813c5..dd423c0b92 100644
--- a/src/Reports/Cbf.php
+++ b/src/Reports/Cbf.php
@@ -113,7 +113,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $report['filename'] . ">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount" . PHP_EOL;
 
         return $fixed;
-
     }
 
 
@@ -249,7 +248,6 @@ public function generate(
         }
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
-
     }
 
 
@@ -284,7 +282,6 @@ public function __construct()
         $reporter->totalFixedWarnings   = $phpcsFile->getFixedWarningCount();
 
         return $reporter;
-
     }
 
 
diff --git a/src/Reports/Checkstyle.php b/src/Reports/Checkstyle.php
index 79c6900374..fd82d053a0 100644
--- a/src/Reports/Checkstyle.php
+++ b/src/Reports/Checkstyle.php
@@ -69,7 +69,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $out->flush();
 
         return true;
-
     }
 
 
@@ -104,7 +103,6 @@ public function generate(
         echo '<checkstyle version="' . Config::VERSION . '">' . PHP_EOL;
         echo $cachedData;
         echo '</checkstyle>' . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Code.php b/src/Reports/Code.php
index 739092af25..d1f4ad384b 100644
--- a/src/Reports/Code.php
+++ b/src/Reports/Code.php
@@ -314,7 +314,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -350,7 +349,6 @@ public function generate(
         }
 
         echo $cachedData;
-
     }
 
 
diff --git a/src/Reports/Csv.php b/src/Reports/Csv.php
index 50c48c2e54..11eeb23314 100644
--- a/src/Reports/Csv.php
+++ b/src/Reports/Csv.php
@@ -52,7 +52,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -85,7 +84,6 @@ public function generate(
     ) {
         echo 'File,Line,Column,Type,Message,Source,Severity,Fixable' . PHP_EOL;
         echo $cachedData;
-
     }
 
 
diff --git a/src/Reports/Diff.php b/src/Reports/Diff.php
index c21d4192ce..56b476a9ea 100644
--- a/src/Reports/Diff.php
+++ b/src/Reports/Diff.php
@@ -80,7 +80,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         echo $diff . PHP_EOL;
         return true;
-
     }
 
 
@@ -115,7 +114,6 @@ public function generate(
         if ($toScreen === true && $cachedData !== '') {
             echo PHP_EOL;
         }
-
     }
 
 
diff --git a/src/Reports/Emacs.php b/src/Reports/Emacs.php
index 04e56fa308..87ac89a99c 100644
--- a/src/Reports/Emacs.php
+++ b/src/Reports/Emacs.php
@@ -52,7 +52,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -84,7 +83,6 @@ public function generate(
         bool $toScreen = true
     ) {
         echo $cachedData;
-
     }
 
 
diff --git a/src/Reports/Full.php b/src/Reports/Full.php
index 0146182195..b03a0df85e 100644
--- a/src/Reports/Full.php
+++ b/src/Reports/Full.php
@@ -212,7 +212,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         echo PHP_EOL;
         return true;
-
     }
 
 
@@ -248,7 +247,6 @@ public function generate(
         }
 
         echo $cachedData;
-
     }
 
 
diff --git a/src/Reports/Gitblame.php b/src/Reports/Gitblame.php
index 00d3d69a36..ae77623f17 100644
--- a/src/Reports/Gitblame.php
+++ b/src/Reports/Gitblame.php
@@ -54,7 +54,6 @@ protected function getAuthor(string $line)
         $parts  = array_slice($parts, 0, (count($parts) - 2));
         $author = preg_replace('|\(|', '', implode(' ', $parts));
         return $author;
-
     }
 
 
@@ -85,7 +84,6 @@ protected function getBlameContent(string $filename)
         chdir($cwd);
 
         return $blames;
-
     }
 
 
diff --git a/src/Reports/Hgblame.php b/src/Reports/Hgblame.php
index 403aa44f70..64b32b76d2 100644
--- a/src/Reports/Hgblame.php
+++ b/src/Reports/Hgblame.php
@@ -55,7 +55,6 @@ protected function getAuthor(string $line)
         $parts = array_slice($parts, 0, (count($parts) - 6));
 
         return trim(preg_replace('|<.+>|', '', implode(' ', $parts)));
-
     }
 
 
@@ -104,7 +103,6 @@ protected function getBlameContent(string $filename)
         chdir($cwd);
 
         return $blames;
-
     }
 
 
diff --git a/src/Reports/Info.php b/src/Reports/Info.php
index 80e6463802..2d4dd73e35 100644
--- a/src/Reports/Info.php
+++ b/src/Reports/Info.php
@@ -40,7 +40,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -161,7 +160,6 @@ public function generate(
         }//end foreach
 
         echo str_repeat('-', 70) . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Json.php b/src/Reports/Json.php
index 64a2eb649b..b9f85b8841 100644
--- a/src/Reports/Json.php
+++ b/src/Reports/Json.php
@@ -66,7 +66,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo ']},';
 
         return true;
-
     }
 
 
@@ -100,7 +99,6 @@ public function generate(
         echo '{"totals":{"errors":' . $totalErrors . ',"warnings":' . $totalWarnings . ',"fixable":' . $totalFixable . '},"files":{';
         echo rtrim($cachedData, ',');
         echo '}}' . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Junit.php b/src/Reports/Junit.php
index e2e0550779..b682dd4ab0 100644
--- a/src/Reports/Junit.php
+++ b/src/Reports/Junit.php
@@ -80,7 +80,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         $out->endElement();
         echo $out->flush();
         return true;
-
     }
 
 
@@ -126,7 +125,6 @@ public function generate(
         echo '<testsuites name="PHP_CodeSniffer ' . Config::VERSION . '" errors="0" tests="' . $tests . '" failures="' . $failures . '">' . PHP_EOL;
         echo $cachedData;
         echo '</testsuites>' . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php
index e08064f035..bd84797860 100644
--- a/src/Reports/Notifysend.php
+++ b/src/Reports/Notifysend.php
@@ -77,7 +77,6 @@ public function __construct()
             '',
             exec($this->path . ' --version')
         );
-
     }
 
 
@@ -103,7 +102,6 @@ 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;
-
     }
 
 
@@ -144,7 +142,6 @@ public function generate(
         } else {
             $this->notifyErrors($msg);
         }
-
     }
 
 
@@ -182,7 +179,6 @@ protected function generateMessage(array $checkedFiles, int $totalErrors, int $t
         }
 
         return $msg;
-
     }
 
 
@@ -198,7 +194,6 @@ protected function notifyAllFine()
         $cmd .= ' "PHP CodeSniffer: Ok"';
         $cmd .= ' "All fine"';
         exec($cmd);
-
     }
 
 
@@ -216,7 +211,6 @@ protected function notifyErrors(string $msg)
         $cmd .= ' "PHP CodeSniffer: Error"';
         $cmd .= ' ' . escapeshellarg(trim($msg));
         exec($cmd);
-
     }
 
 
@@ -236,7 +230,6 @@ protected function getBasicCommand()
         }
 
         return $cmd;
-
     }
 
 
diff --git a/src/Reports/Performance.php b/src/Reports/Performance.php
index 95381dcfad..c5570bff9c 100644
--- a/src/Reports/Performance.php
+++ b/src/Reports/Performance.php
@@ -40,7 +40,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -154,7 +153,6 @@ public function generate(
         echo str_repeat('-', $width) . PHP_EOL;
         printf($formatBold, 'TOTAL RUN TIME', $runTime, 100);
         echo str_repeat('-', $width) . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Source.php b/src/Reports/Source.php
index 00684a9334..40d860314b 100644
--- a/src/Reports/Source.php
+++ b/src/Reports/Source.php
@@ -60,7 +60,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -264,7 +263,6 @@ public function generate(
         }
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
-
     }
 
 
@@ -325,7 +323,6 @@ public function makeFriendlyName(string $name)
         $friendlyName[0] = strtoupper($friendlyName[0]);
 
         return $friendlyName;
-
     }
 
 
diff --git a/src/Reports/Summary.php b/src/Reports/Summary.php
index 3aba96151f..21fceab273 100644
--- a/src/Reports/Summary.php
+++ b/src/Reports/Summary.php
@@ -42,7 +42,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
 
         echo $report['filename'] . '>>' . $report['errors'] . '>>' . $report['warnings'] . PHP_EOL;
         return true;
-
     }
 
 
@@ -172,7 +171,6 @@ static function ($keyA, $keyB) {
         }
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Svnblame.php b/src/Reports/Svnblame.php
index aefd98a458..5be83faed1 100644
--- a/src/Reports/Svnblame.php
+++ b/src/Reports/Svnblame.php
@@ -40,7 +40,6 @@ protected function getAuthor(string $line)
         }
 
         return $blameParts[2];
-
     }
 
 
@@ -67,7 +66,6 @@ protected function getBlameContent(string $filename)
         $blames = explode("\n", $rawContent);
 
         return $blames;
-
     }
 
 
diff --git a/src/Reports/VersionControl.php b/src/Reports/VersionControl.php
index 56b4703155..7deea0a57d 100644
--- a/src/Reports/VersionControl.php
+++ b/src/Reports/VersionControl.php
@@ -127,7 +127,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         }
 
         return true;
-
     }
 
 
@@ -345,7 +344,6 @@ public function generate(
         }
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
-
     }
 
 
diff --git a/src/Reports/Xml.php b/src/Reports/Xml.php
index d243a54d7d..12a02defca 100644
--- a/src/Reports/Xml.php
+++ b/src/Reports/Xml.php
@@ -86,7 +86,6 @@ public function generateFileReport(array $report, File $phpcsFile, bool $showSou
         echo $content;
 
         return true;
-
     }
 
 
@@ -121,7 +120,6 @@ public function generate(
         echo '<phpcs version="' . Config::VERSION . '">' . PHP_EOL;
         echo $cachedData;
         echo '</phpcs>' . PHP_EOL;
-
     }
 
 
diff --git a/src/Ruleset.php b/src/Ruleset.php
index 4694c96aea..082368f1cd 100644
--- a/src/Ruleset.php
+++ b/src/Ruleset.php
@@ -265,7 +265,6 @@ public function __construct(Config $config)
         }
 
         $this->displayCachedMessages();
-
     }
 
 
@@ -340,7 +339,6 @@ public function explain()
         if (count($this->deprecatedSniffs) > 0) {
             echo PHP_EOL . '* Sniffs marked with an asterisk are deprecated.' . PHP_EOL;
         }
-
     }
 
 
@@ -352,7 +350,6 @@ public function explain()
     public function hasSniffDeprecations()
     {
         return (count($this->deprecatedSniffs) > 0);
-
     }
 
 
@@ -482,7 +479,6 @@ 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);
-
     }
 
 
@@ -511,7 +507,6 @@ private function displayCachedMessages()
         }
 
         $this->msgCache->display();
-
     }
 
 
@@ -883,7 +878,6 @@ public function processRuleset(string $rulesetPath, int $depth = 0)
         }
 
         return $files;
-
     }
 
 
@@ -942,7 +936,6 @@ private function expandSniffDirectory(string $directory, int $depth = 0)
         }//end foreach
 
         return $sniffs;
-
     }
 
 
@@ -1125,7 +1118,6 @@ private function expandRulesetReference(string $ref, string $rulesetDir, int $de
                 return $this->processRuleset($ref, ($depth + 2));
             }
         }//end if
-
     }
 
 
@@ -1380,7 +1372,6 @@ private function processRule(SimpleXMLElement $rule, array $newSniffs, int $dept
                 }
             }//end foreach
         }//end foreach
-
     }
 
 
@@ -1415,7 +1406,6 @@ private function shouldProcessElement(SimpleXMLElement $element)
         }
 
         return false;
-
     }
 
 
@@ -1509,7 +1499,6 @@ public function registerSniffs(array $files, array $restrictions, array $exclusi
         }//end foreach
 
         $this->sniffs = $listeners;
-
     }
 
 
@@ -1598,7 +1587,6 @@ public function populateTokenListeners()
                 }
             }
         }//end foreach
-
     }
 
 
@@ -1679,7 +1667,6 @@ public function setSniffProperty(string $sniffClass, string $name, array $settin
         } else {
             $sniffObject->$propertyName = $value;
         }
-
     }
 
 
@@ -1723,7 +1710,6 @@ private function getRealPropertyValue($value)
         }//end if
 
         return $value;
-
     }
 
 
@@ -1749,7 +1735,6 @@ public function getIgnorePatterns(?string $listener = null)
         }
 
         return [];
-
     }
 
 
@@ -1775,7 +1760,6 @@ public function getIncludePatterns(?string $listener = null)
         }
 
         return [];
-
     }
 
 
diff --git a/src/Runner.php b/src/Runner.php
index b268ec4237..6fb1f2c96d 100644
--- a/src/Runner.php
+++ b/src/Runner.php
@@ -141,7 +141,6 @@ public function runPHPCS()
         }//end try
 
         return ExitCode::calculate($this->reporter);
-
     }
 
 
@@ -227,7 +226,6 @@ public function runPHPCBF()
         }//end try
 
         return ExitCode::calculate($this->reporter);
-
     }
 
 
@@ -286,7 +284,6 @@ public function init()
             $error .= $this->config->printShortUsage(true);
             throw new DeepExitException($error, ExitCode::PROCESS_ERROR);
         }
-
     }
 
 
@@ -517,7 +514,6 @@ private function run()
         if ($this->config->cache === true) {
             Cache::save();
         }
-
     }
 
 
@@ -544,7 +540,6 @@ public function handleErrors(int $code, string $message, string $file, int $line
         }
 
         throw new RuntimeException("$message in $file on line $line");
-
     }
 
 
@@ -672,7 +667,6 @@ public function processFile(File $file)
 
         // Clean up the file to save (a lot of) memory.
         $file->cleanUp();
-
     }
 
 
@@ -757,7 +751,6 @@ private function processChildProcs(array $childProcs)
         }//end while
 
         return $success;
-
     }
 
 
@@ -863,7 +856,6 @@ public function printProgress(File $file, int $numFiles, int $numProcessed)
         }
 
         StatusWriter::write(str_repeat(' ', $padding) . " $numProcessed / $numFiles ($percent%)");
-
     }
 
 
@@ -901,7 +893,6 @@ static function () use (
                 }
             }
         );
-
     }
 
 
diff --git a/src/Sniffs/AbstractArraySniff.php b/src/Sniffs/AbstractArraySniff.php
index 3cba14f76e..b12f47c42d 100644
--- a/src/Sniffs/AbstractArraySniff.php
+++ b/src/Sniffs/AbstractArraySniff.php
@@ -27,7 +27,6 @@ final public function register()
             T_ARRAY,
             T_OPEN_SHORT_ARRAY,
         ];
-
     }
 
 
@@ -97,7 +96,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd, $indices);
         }
-
     }
 
 
@@ -133,7 +131,6 @@ private function getNext(File $phpcsFile, int $ptr, int $arrayEnd)
         }
 
         return $ptr;
-
     }
 
 
diff --git a/src/Sniffs/AbstractPatternSniff.php b/src/Sniffs/AbstractPatternSniff.php
index e0b3a9dae4..ec3b545d70 100644
--- a/src/Sniffs/AbstractPatternSniff.php
+++ b/src/Sniffs/AbstractPatternSniff.php
@@ -62,7 +62,6 @@ abstract class AbstractPatternSniff implements Sniff
     public function __construct()
     {
         $this->supplementaryTokens = $this->registerSupplementary();
-
     }
 
 
@@ -103,7 +102,6 @@ final public function register()
         }//end foreach
 
         return array_unique(array_merge($listenTypes, $this->supplementaryTokens));
-
     }
 
 
@@ -135,7 +133,6 @@ private function getPatternTokenTypes(array $pattern)
         }
 
         return $tokenTypes;
-
     }
 
 
@@ -162,7 +159,6 @@ private function getListenerTokenPos(array $pattern)
         }
 
         return $tokenTypes[$token];
-
     }
 
 
@@ -228,7 +224,6 @@ final public function process(File $phpcsFile, int $stackPtr)
         foreach ($allErrors as $stackPtr => $error) {
             $phpcsFile->addError($error, $stackPtr, 'Found');
         }
-
     }
 
 
@@ -685,7 +680,6 @@ protected function processPattern(array $patternInfo, File $phpcsFile, int $stac
         }
 
         return $errors;
-
     }
 
 
@@ -709,7 +703,6 @@ protected function prepareError(string $found, string $patternCode)
         $error = "Expected \"$expected\"; found \"$found\"";
 
         return $error;
-
     }
 
 
@@ -734,7 +727,6 @@ abstract protected function getPatterns();
     protected function registerSupplementary()
     {
         return [];
-
     }
 
 
@@ -751,7 +743,6 @@ protected function registerSupplementary()
      */
     protected function processSupplementary(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
@@ -841,7 +832,6 @@ private function parse(string $pattern)
         }//end for
 
         return $patterns;
-
     }
 
 
@@ -895,7 +885,6 @@ private function createSkipPattern(string $pattern, int $from)
         }
 
         return $skip;
-
     }
 
 
@@ -932,7 +921,6 @@ private function createTokenPattern(string $str)
         }
 
         return $patterns;
-
     }
 
 
diff --git a/src/Sniffs/AbstractScopeSniff.php b/src/Sniffs/AbstractScopeSniff.php
index cac6bd9711..35cbf6d9f1 100644
--- a/src/Sniffs/AbstractScopeSniff.php
+++ b/src/Sniffs/AbstractScopeSniff.php
@@ -93,7 +93,6 @@ public function __construct(
         $this->listenOutside = $listenOutside;
         $this->scopeTokens   = array_flip($scopeTokens);
         $this->tokens        = $tokens;
-
     }
 
 
@@ -110,7 +109,6 @@ public function __construct(
     final public function register()
     {
         return $this->tokens;
-
     }
 
 
@@ -147,7 +145,6 @@ final public function process(File $phpcsFile, int $stackPtr)
         if (empty($skipTokens) === false) {
             return min($skipTokens);
         }
-
     }
 
 
diff --git a/src/Sniffs/AbstractVariableSniff.php b/src/Sniffs/AbstractVariableSniff.php
index 5c903c23b9..837d7ec25b 100644
--- a/src/Sniffs/AbstractVariableSniff.php
+++ b/src/Sniffs/AbstractVariableSniff.php
@@ -67,7 +67,6 @@ public function __construct()
         ];
 
         parent::__construct($scopes, $listen, true);
-
     }
 
 
@@ -146,7 +145,6 @@ final protected function processTokenWithinScope(File $phpcsFile, int $stackPtr,
         } else {
             return $this->processMemberVar($phpcsFile, $stackPtr);
         }
-
     }
 
 
@@ -177,7 +175,6 @@ final protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr
                 return $this->processVariableInString($phpcsFile, $stackPtr);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
index 929d5c54bc..c7d219b4c2 100644
--- a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
@@ -39,7 +39,6 @@ class ArrayIndentSniff extends AbstractArraySniff
      */
     public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices)
     {
-
     }
 
 
@@ -187,7 +186,6 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
         } else {
             $phpcsFile->fixer->replaceToken(($arrayEnd - 1), $padding);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
index 7e97ca7a1e..28c3718db2 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
@@ -24,7 +24,6 @@ class DisallowLongArraySyntaxSniff implements Sniff
     public function register()
     {
         return [T_ARRAY];
-
     }
 
 
@@ -65,7 +64,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
index bc466ebcdc..52ef37777f 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
@@ -24,7 +24,6 @@ class DisallowShortArraySyntaxSniff implements Sniff
     public function register()
     {
         return [T_OPEN_SHORT_ARRAY];
-
     }
 
 
@@ -54,7 +53,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($closer, ')');
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
index ab27b8ebd2..2bb7100899 100644
--- a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
@@ -32,7 +32,6 @@ class DuplicateClassNameSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -111,7 +110,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end while
 
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
index 77a4ecce9f..f6961ae49a 100644
--- a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -116,7 +115,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
index 1101e9b5d1..e2ef9ef36c 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
@@ -62,7 +62,6 @@ public function register()
             T_WHILE,
             T_MATCH,
         ];
-
     }
 
 
@@ -164,7 +163,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $startPos = $hasAssignment;
         } while ($startPos < $closer);
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
index b4e9fa05b7..2a6c02250c 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
@@ -31,7 +31,6 @@ public function register()
             T_SEMICOLON,
             T_CLOSE_TAG,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processCloseTag($phpcsFile, $stackPtr);
         }
-
     }
 
 
@@ -133,7 +131,6 @@ private function processSemicolon(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }//end if
-
     }
 
 
@@ -172,7 +169,6 @@ private function processCloseTag(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
index 7d33ece012..10c5152489 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
@@ -52,7 +52,6 @@ public function register()
             T_WHILE,
             T_MATCH,
         ];
-
     }
 
 
@@ -90,7 +89,6 @@ 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]);
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
index 832cd1bbeb..16a004c3e8 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
@@ -38,7 +38,6 @@ class ForLoopShouldBeWhileLoopSniff implements Sniff
     public function register()
     {
         return [T_FOR];
-
     }
 
 
@@ -84,7 +83,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'This FOR loop can be simplified to a WHILE loop';
             $phpcsFile->addWarning($error, $stackPtr, 'CanSimplify');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
index 1c99e2ad53..6ffd199cc4 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
@@ -42,7 +42,6 @@ class ForLoopWithTestFunctionCallSniff implements Sniff
     public function register()
     {
         return [T_FOR];
-
     }
 
 
@@ -94,7 +93,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 break;
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
index 47d11981e8..7e1541852e 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
@@ -44,7 +44,6 @@ class JumbledIncrementerSniff implements Sniff
     public function register()
     {
         return [T_FOR];
-
     }
 
 
@@ -93,7 +92,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
             }
         }
-
     }
 
 
@@ -127,7 +125,6 @@ protected function findIncrementers(array $tokens, array $token)
         }
 
         return $incrementers;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
index fd74a7cde2..03726fe522 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
@@ -58,7 +58,6 @@ public function register()
         $this->searchTargets[T_INLINE_ELSE] = T_INLINE_ELSE;
 
         return Tokens::BOOLEAN_OPERATORS;
-
     }
 
 
@@ -105,7 +104,6 @@ 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');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
index 6c0aa1bb86..5e65a03057 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
@@ -45,7 +45,6 @@ public function register()
             T_IF,
             T_ELSEIF,
         ];
-
     }
 
 
@@ -86,7 +85,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Avoid IF statements that are always true or false';
             $phpcsFile->addWarning($error, $stackPtr, 'Found');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
index 4bd044b6fa..6a8dbb19a9 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
@@ -37,7 +37,6 @@ class UnnecessaryFinalModifierSniff implements Sniff
     public function register()
     {
         return [T_CLASS];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $next = $tokens[$next]['scope_closer'];
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
index 94b202544d..c6ba0069b1 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
@@ -69,7 +69,6 @@ public function register()
             T_CLOSURE,
             T_FN,
         ];
-
     }
 
 
@@ -298,7 +297,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
index 234ed64687..29d32b8f9a 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
@@ -48,7 +48,6 @@ class UselessOverridingMethodSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -177,7 +176,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if (count($parameters) === count($signature) && $parameters === $signature) {
             $phpcsFile->addWarning('Possible useless method overriding detected', $stackPtr, 'Found');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
index 525bfcae53..4885a0e603 100644
--- a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
@@ -25,7 +25,6 @@ class DocCommentSniff implements Sniff
     public function register()
     {
         return [T_DOC_COMMENT_OPEN_TAG];
-
     }
 
 
@@ -340,7 +339,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $foundTags[$tagName] = true;
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
index 221802f7e8..1c00eab11a 100644
--- a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
@@ -26,7 +26,6 @@ class FixmeSniff implements Sniff
     public function register()
     {
         return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS);
-
     }
 
 
@@ -61,7 +60,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->addError($error, $stackPtr, $type, $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
index c087454e49..28d1b1dee9 100644
--- a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
@@ -25,7 +25,6 @@ class TodoSniff implements Sniff
     public function register()
     {
         return array_diff(Tokens::COMMENT_TOKENS, Tokens::PHPCS_ANNOTATION_TOKENS);
-
     }
 
 
@@ -60,7 +59,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
index 4b96b90b2f..323bd2cbb9 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -29,7 +29,6 @@ public function register()
         unset($tokens[T_COALESCE]);
 
         return $tokens;
-
     }
 
 
@@ -122,7 +121,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $stackPtr,
             'Found'
         );
-
     }
 
 
@@ -179,7 +177,6 @@ public function isArrayStatic(File $phpcsFile, int $arrayToken)
         }
 
         return true;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
index 606554577d..2aac11a21b 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -40,7 +40,6 @@ public function register()
             T_DO,
             T_FOR,
         ];
-
     }
 
 
@@ -317,7 +316,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end if
 
         $phpcsFile->fixer->endChangeset();
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
index 7896467d18..da629f46c9 100644
--- a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
@@ -47,7 +47,6 @@ class ByteOrderMarkSniff implements Sniff
     public function register()
     {
         return [T_INLINE_HTML];
-
     }
 
 
@@ -84,7 +83,6 @@ public function process(File $phpcsFile, int $stackPtr)
         $phpcsFile->recordMetric($stackPtr, 'Using byte order mark', 'no');
 
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
index 91ea90601a..dd044c648b 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -66,7 +65,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
index 53dd7ea7b9..2121dfe966 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -73,7 +72,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
index e121d64cb4..46a4da1f52 100644
--- a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
index 440c59c114..749f260f3f 100644
--- a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
@@ -46,7 +46,6 @@ class InlineHTMLSniff implements Sniff
     public function register()
     {
         return [T_INLINE_HTML];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
         $phpcsFile->addError($error, $stackPtr, 'Found');
 
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
index 31f4c65c08..f2adf708f7 100644
--- a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
@@ -34,7 +34,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -125,7 +124,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
index 7a3b44da6b..ccd457d056 100644
--- a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
@@ -55,7 +55,6 @@ class LineLengthSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -194,7 +192,6 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
             $warning = 'Line exceeds %s characters; contains %s characters';
             $phpcsFile->addWarning($warning, $stackPtr, 'TooLong', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
index 9e64fbef9a..7a2a141a14 100644
--- a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -63,7 +62,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
index 745919906e..1631fc9cef 100644
--- a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
@@ -24,7 +24,6 @@ class OneClassPerFileSniff implements Sniff
     public function register()
     {
         return [T_CLASS];
-
     }
 
 
@@ -50,7 +49,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Only one class is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
index c59bd042f1..6dff203392 100644
--- a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
@@ -24,7 +24,6 @@ class OneInterfacePerFileSniff implements Sniff
     public function register()
     {
         return [T_INTERFACE];
-
     }
 
 
@@ -50,7 +49,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Only one interface is allowed in a file';
             $phpcsFile->addError($error, $nextInterface, 'MultipleFound');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
index a832e8c804..98b56ef3f9 100644
--- a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Only one object structure is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
index f74d7f1eb1..570e8b8e1a 100644
--- a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
@@ -24,7 +24,6 @@ class OneTraitPerFileSniff implements Sniff
     public function register()
     {
         return [T_TRAIT];
-
     }
 
 
@@ -50,7 +49,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Only one trait is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
index 3fc6912627..9f1f57bf2c 100644
--- a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
@@ -24,7 +24,6 @@ class DisallowMultipleStatementsSniff implements Sniff
     public function register()
     {
         return [T_SEMICOLON];
-
     }
 
 
@@ -98,7 +97,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'Multiple statements on same line', 'no');
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
index 3b9caa1d89..7edcf2cbf5 100644
--- a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
@@ -48,7 +48,6 @@ public function register()
         $tokens = Tokens::ASSIGNMENT_TOKENS;
         unset($tokens[T_DOUBLE_ARROW]);
         return $tokens;
-
     }
 
 
@@ -65,7 +64,6 @@ public function process(File $phpcsFile, int $stackPtr)
     {
         $lastAssign = $this->checkAlignment($phpcsFile, $stackPtr);
         return ($lastAssign + 1);
-
     }
 
 
@@ -397,7 +395,6 @@ public function checkAlignment(File $phpcsFile, int $stackPtr, ?int $end = null)
         } else {
             return $assign;
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
index 0e237130df..804ae2ebb7 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
@@ -39,7 +39,6 @@ class SpaceAfterCastSniff implements Sniff
     public function register()
     {
         return Tokens::CAST_TOKENS;
-
     }
 
 
@@ -154,7 +153,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
index 925b4adf25..b0ae4d9d7c 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
@@ -39,7 +39,6 @@ class SpaceAfterNotSniff implements Sniff
     public function register()
     {
         return [T_BOOLEAN_NOT];
-
     }
 
 
@@ -126,7 +125,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
index eb3d608e3c..cbc72216c4 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
@@ -25,7 +25,6 @@ class SpaceBeforeCastSniff implements Sniff
     public function register()
     {
         return Tokens::CAST_TOKENS;
-
     }
 
 
@@ -66,7 +65,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
index c733950770..cadb2c7fff 100644
--- a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
@@ -35,7 +35,6 @@ public function register()
         $targets[] = T_CLOSE_PARENTHESIS;
 
         return $targets;
-
     }
 
 
@@ -84,7 +83,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         $this->checkSpacing($phpcsFile, $stackPtr, $openBracket);
-
     }
 
 
@@ -190,7 +188,6 @@ public function checkSpacing(File $phpcsFile, int $stackPtr, int $openBracket)
                 }//end if
             }//end if
         }//end while
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
index e4e5fe9d69..d4bd9a0dde 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
@@ -42,7 +42,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -217,7 +216,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end if
 
         $phpcsFile->recordMetric($stackPtr, "$metricType opening brace placement", 'new line');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
index 78f53e6b58..7c534678cd 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
@@ -42,7 +42,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -170,7 +169,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
index fbc2f38700..704eb8dc8e 100644
--- a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
@@ -64,7 +64,6 @@ class CyclomaticComplexitySniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -114,7 +113,6 @@ public function process(File $phpcsFile, int $stackPtr)
             ];
             $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
index 5216e7c599..89e9215c48 100644
--- a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
@@ -39,7 +39,6 @@ class NestingLevelSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -93,7 +92,6 @@ public function process(File $phpcsFile, int $stackPtr)
             ];
             $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
index 8b12281c0f..39a574fd1e 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
@@ -23,7 +23,6 @@ class AbstractClassNamePrefixSniff implements Sniff
     public function register()
     {
         return [T_CLASS];
-
     }
 
 
@@ -53,7 +52,6 @@ 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]);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
index b7fcd14120..7b175a308a 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
@@ -112,7 +112,6 @@ class CamelCapsFunctionNameSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true);
-
     }
 
 
@@ -198,7 +197,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
         } else {
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
-
     }
 
 
@@ -242,7 +240,6 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
index 83fe3f18ba..1092a45c9f 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
@@ -41,7 +41,6 @@ class ConstructorNameSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct([T_CLASS, T_ANON_CLASS], [T_FUNCTION], true);
-
     }
 
 
@@ -130,7 +129,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
 
             $startIndex = $nextNonEmpty;
         }//end while
-
     }
 
 
@@ -146,7 +144,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
@@ -181,7 +178,6 @@ protected function loadFunctionNamesInScope(File $phpcsFile, int $currScope)
                 $i = $tokens[$i]['scope_closer'];
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
index 05a32a0f60..4186de6f2b 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
@@ -23,7 +23,6 @@ class InterfaceNameSuffixSniff implements Sniff
     public function register()
     {
         return [T_INTERFACE];
-
     }
 
 
@@ -48,7 +47,6 @@ 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]);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
index 7db0d89108..eb5f1317c2 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
@@ -23,7 +23,6 @@ class TraitNameSuffixSniff implements Sniff
     public function register()
     {
         return [T_TRAIT];
-
     }
 
 
@@ -48,7 +47,6 @@ 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]);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
index 0adb659d52..70892eea31 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_NAME_FULLY_QUALIFIED,
             T_CONST,
         ];
-
     }
 
 
@@ -145,7 +144,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($constPtr, 'Constant name case', 'upper');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
index 1886997e50..34d395e19a 100644
--- a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
@@ -24,7 +24,6 @@ class BacktickOperatorSniff implements Sniff
     public function register()
     {
         return [T_BACKTICK];
-
     }
 
 
@@ -41,7 +40,6 @@ public function process(File $phpcsFile, int $stackPtr)
     {
         $error = 'Use of the backtick operator is forbidden';
         $phpcsFile->addError($error, $stackPtr, 'Found');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
index 3dc90d348d..c2269c75f0 100644
--- a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
@@ -46,7 +46,6 @@ class CharacterBeforePHPOpeningTagSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -88,7 +87,6 @@ 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;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
index 57621b4657..8d24d5e3e6 100644
--- a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -47,7 +46,6 @@ 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');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
index 1f00c930ef..621904ceba 100644
--- a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
@@ -43,7 +43,6 @@ public function __construct()
                 $this->forbiddenFunctions[$functionName] = null;
             }
         }
-
     }
 
 
@@ -69,7 +68,6 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
         } else {
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
index c5f98dcb13..d814801a46 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
@@ -26,7 +26,6 @@ class DisallowAlternativePHPTagsSniff implements Sniff
     public function register()
     {
         return [T_INLINE_HTML];
-
     }
 
 
@@ -73,7 +72,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data);
         }
-
     }
 
 
@@ -103,7 +101,6 @@ protected function getSnippet(string $content, string $start = '', int $length =
         }
 
         return $snippet;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
index cdac1136fb..47287af8e0 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
@@ -24,7 +24,6 @@ class DisallowRequestSuperglobalSniff implements Sniff
     public function register()
     {
         return [T_VARIABLE];
-
     }
 
 
@@ -48,7 +47,6 @@ 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');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
index 30ba117aff..b9c5ec02fd 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
@@ -35,7 +35,6 @@ public function register()
         }
 
         return $targets;
-
     }
 
 
@@ -133,7 +132,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
@@ -163,7 +161,6 @@ protected function getSnippet(string $content, string $start = '', int $length =
         }
 
         return $snippet;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
index ab3d612932..3c372ebbb8 100644
--- a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_GOTO,
             T_GOTO_LABEL,
         ];
-
     }
 
 
@@ -43,7 +42,6 @@ public function register()
     public function process(File $phpcsFile, int $stackPtr)
     {
         $phpcsFile->addWarning('Use of the GOTO language construct is discouraged', $stackPtr, 'Found');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
index 2e9f0d21cb..bde01c8699 100644
--- a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
@@ -109,7 +109,6 @@ public function register()
         $targets[] = T_NAME_FULLY_QUALIFIED;
 
         return $targets;
-
     }
 
 
@@ -195,7 +194,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end if
 
         $this->addError($phpcsFile, $stackPtr, $function, $pattern);
-
     }
 
 
@@ -237,7 +235,6 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
         } else {
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
index 2518b9deb2..2ebab79509 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
@@ -73,7 +73,6 @@ public function register()
         $targets[] = T_CONST;
 
         return $targets;
-
     }
 
 
@@ -188,7 +187,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Handle everything else.
         $this->processConstant($phpcsFile, $stackPtr);
-
     }
 
 
@@ -227,7 +225,6 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'lower');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
index 317d5fbc81..35a26d6718 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
@@ -39,7 +39,6 @@ public function register()
         ];
 
         return $targets;
-
     }
 
 
@@ -78,7 +77,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'PHP keyword case', 'lower');
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
index 2c62adea00..ccec5bf59f 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
@@ -56,7 +56,6 @@ public function register()
         $tokens[] = T_CLOSURE;
         $tokens[] = T_FN;
         return $tokens;
-
     }
 
 
@@ -249,7 +248,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end foreach
-
     }
 
 
@@ -313,7 +311,6 @@ protected function processUnionType(File $phpcsFile, int $typeDeclStart, int $ty
         ) {
             $this->processType($phpcsFile, $typeStart, $type, $error, $errorCode);
         }
-
     }
 
 
@@ -352,7 +349,6 @@ protected function processType(File $phpcsFile, int $stackPtr, string $type, str
         if ($fix === true) {
             $phpcsFile->fixer->replaceToken($stackPtr, $typeLower);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
index 407d382b68..236065d947 100644
--- a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -38,7 +38,6 @@ class NoSilencedErrorsSniff implements Sniff
     public function register()
     {
         return [T_ASPERAND];
-
     }
 
 
@@ -70,7 +69,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Silencing errors is discouraged; found: %s';
             $phpcsFile->addWarning($error, $stackPtr, 'Discouraged', [$found]);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
index 064a9310ae..903094f7e2 100644
--- a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
@@ -25,7 +25,6 @@ class RequireStrictTypesSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -101,7 +100,6 @@ 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;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
index ee2bf08bbc..f205d90643 100644
--- a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_STRING,
             T_NAME_FULLY_QUALIFIED,
         ];
-
     }
 
 
@@ -65,7 +64,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $error = 'Use the PHP_SAPI constant instead of calling php_sapi_name()';
         $phpcsFile->addError($error, $stackPtr, 'FunctionFound');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
index 9b11733d4a..86936cdd48 100644
--- a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
@@ -37,7 +37,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -67,7 +66,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -97,7 +95,6 @@ private function getPhpLintCommand(File $phpcsFile)
             Common::escapeshellcmd($this->phpPath),
             $fileName
         );
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
index 512069cf4d..09d4b75278 100644
--- a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
@@ -50,7 +50,6 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'upper');
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
index 41d47df1fc..a35df53f7d 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
@@ -53,7 +53,6 @@ class UnnecessaryHeredocSniff implements Sniff
     public function register()
     {
         return [T_START_HEREDOC];
-
     }
 
 
@@ -138,7 +137,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
index bc7800cbc1..a03b17ff50 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
@@ -35,7 +35,6 @@ class UnnecessaryStringConcatSniff implements Sniff
     public function register()
     {
         return [T_STRING_CONCAT];
-
     }
 
 
@@ -88,7 +87,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $error = 'String concat is not required here; use a single string instead';
         $phpcsFile->addError($error, $stackPtr, 'Found');
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
index f0395aad5b..170c4520b5 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -124,7 +123,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
index 5c9d4120da..edd49a8de0 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
@@ -48,7 +48,6 @@ class SubversionPropertiesSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -111,7 +110,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -188,7 +186,6 @@ protected function getProperties(string $path)
         }
 
         return $properties;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
index 878804508d..2dd5f05681 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
@@ -63,7 +63,6 @@ public function register()
             T_OPEN_PARENTHESIS,
             T_CLOSE_PARENTHESIS,
         ];
-
     }
 
 
@@ -228,7 +227,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }//end if
             }//end if
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
index 0ee5860626..38361bd1c4 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -48,7 +48,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -219,7 +218,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
index f1ed2c10de..6f6b657e32 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
@@ -50,7 +50,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -189,7 +188,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
index 5a23721d8f..5f66ccccfb 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
@@ -25,7 +25,6 @@ class GotoTargetSpacingSniff implements Sniff
     public function register()
     {
         return [T_GOTO_LABEL];
-
     }
 
 
@@ -79,7 +78,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
index 2e813f73d8..f243e9f1c0 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_START_HEREDOC,
             T_START_NOWDOC,
         ];
-
     }
 
 
@@ -62,7 +61,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $replacement = str_replace([' ', "\t"], '', $tokens[$stackPtr]['content']);
             $phpcsFile->fixer->replaceToken($stackPtr, $replacement);
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
index 61577b026b..2c25319a66 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_DEC,
             T_INC,
         ];
-
     }
 
 
@@ -154,7 +153,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
index 3351a24e6a..2cf2193a09 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
@@ -41,7 +41,6 @@ public function register()
             T_USE,
             T_GOTO,
         ];
-
     }
 
 
@@ -157,7 +156,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->addContent($stackPtr, ' ');
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
index 64c5011fab..07bb8469c0 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -98,7 +98,6 @@ class ScopeIndentSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -1307,7 +1306,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Don't process the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -1394,7 +1392,6 @@ protected function adjustIndent(File $phpcsFile, int $stackPtr, int $length, int
         }//end if
 
         return true;
-
     }
 
 
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
index 33dc2a87cf..accb8762df 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
@@ -39,7 +39,6 @@ class SpreadOperatorSpacingAfterSniff implements Sniff
     public function register()
     {
         return [T_ELLIPSIS];
-
     }
 
 
@@ -152,7 +151,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
index 8f7a0b15a5..6d91d8b28f 100644
--- a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
@@ -59,7 +59,6 @@ public function getErrorList()
             143 => 1,
             149 => 1,
         ];
-
     }
 
 
@@ -74,7 +73,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
index f8c5137d73..3e54679116 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
@@ -53,7 +53,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -68,7 +67,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
index 3bf319fe5e..56ad85858d 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             7 => 1,
             8 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
index ae063f277f..18accd2509 100644
--- a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
@@ -31,7 +31,6 @@ final class DuplicateClassNameUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -91,7 +90,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
index 119587d73a..048a37922b 100644
--- a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
@@ -46,7 +46,6 @@ public function getErrorList()
             94  => 1,
             100 => 1,
         ];
-
     }
 
 
@@ -61,7 +60,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
index 584f5e2914..05e10400ad 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
@@ -31,7 +31,6 @@ final class AssignmentInConditionUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -89,7 +88,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
index fb6b94b747..41238048c4 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
@@ -37,7 +37,6 @@ protected function getTestFiles(string $testFileBase)
         }
 
         return $testFiles;
-
     }
 
 
@@ -52,7 +51,6 @@ protected function getTestFiles(string $testFileBase)
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -104,7 +102,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
index 0dbd602000..be600fcd39 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
@@ -46,7 +46,6 @@ public function getErrorList()
             72 => 2,
             74 => 1,
         ];
-
     }
 
 
@@ -61,7 +60,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
index 9b91f033fe..fc7b7dac0e 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
@@ -31,7 +31,6 @@ final class ForLoopShouldBeWhileLoopUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -57,7 +56,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
index 4767d5844d..1f229bda4c 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
@@ -31,7 +31,6 @@ final class ForLoopWithTestFunctionCallUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -71,7 +70,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
index 6b73b6f56e..7b9876d77a 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
@@ -31,7 +31,6 @@ final class JumbledIncrementerUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -65,7 +64,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
index 1214f95f35..341473dc61 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
@@ -69,7 +69,6 @@ public function getErrorList()
             103 => 1,
             116 => 1,
         ];
-
     }
 
 
@@ -84,7 +83,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
index 6eefd64123..354228e85a 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
@@ -31,7 +31,6 @@ final class UnconditionalIfStatementUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -60,7 +59,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
index f2532d0ec5..485febadb4 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
@@ -31,7 +31,6 @@ final class UnnecessaryFinalModifierUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -64,7 +63,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
index 771c21483b..ec1b3c1469 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
@@ -31,7 +31,6 @@ final class UnusedFunctionParameterUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -71,7 +70,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
index 6b52763e58..5adfb8b669 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
@@ -31,7 +31,6 @@ final class UselessOverridingMethodUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -65,7 +64,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
index 0cb1da529b..99270d2717 100644
--- a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
@@ -32,7 +32,6 @@ final class DocCommentUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
-
     }
 
 
@@ -105,7 +104,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -120,7 +118,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
index 699ff33dd5..8c04b8baa3 100644
--- a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
@@ -41,7 +41,6 @@ public function getErrorList()
             18 => 1,
             21 => 1,
         ];
-
     }
 
 
@@ -56,7 +55,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
index 28fca9591d..ac19e6ac6a 100644
--- a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
@@ -31,7 +31,6 @@ final class TodoUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -55,7 +54,6 @@ public function getWarningList()
             18 => 1,
             21 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
index 823aa486cc..5176438e1b 100644
--- a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
@@ -80,7 +80,6 @@ public function getErrorList()
             202 => 2,
             205 => 1,
         ];
-
     }
 
 
@@ -95,7 +94,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
index 4f68ebb4e7..40818835ae 100644
--- a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
@@ -87,7 +87,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -102,7 +101,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
index 5c2d0173de..3ec7265c0e 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
@@ -41,7 +41,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -70,7 +69,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
index 132a18c084..c03e72f248 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -59,7 +58,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
index 05522421d2..bd7fba3c7d 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -61,7 +60,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
index 889aa2c25d..ae0df9af03 100644
--- a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -29,7 +29,6 @@ protected function shouldSkipTest()
     {
         // Skip on Windows which doesn't have the concept of executable files.
         return PHP_OS_FAMILY === 'Windows';
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -69,7 +67,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
index f000c524fc..64cbd6075b 100644
--- a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -62,7 +61,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
index 21b035a745..1cac1a8aad 100644
--- a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
@@ -32,7 +32,6 @@ final class LineEndingsUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
-
     }
 
 
@@ -47,7 +46,6 @@ public function setCliValues(string $testFile, Config $config)
     public function getErrorList()
     {
         return [1 => 1];
-
     }
 
 
@@ -62,7 +60,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
index a1ad64257b..e0f347ce4e 100644
--- a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
@@ -32,7 +32,6 @@ final class LineLengthUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
-
     }
 
 
@@ -64,7 +63,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -108,7 +106,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
index 25c0c22b29..d6e546ad38 100644
--- a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
@@ -37,7 +37,6 @@ protected function getTestFiles(string $testFileBase)
         $testFiles[] = $testFileDir . DIRECTORY_SEPARATOR . 'lowercased_filename_unit_test.inc';
 
         return $testFiles;
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -75,7 +73,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
@@ -99,7 +96,6 @@ public function testStdIn()
         $this->assertSame(0, $file->getErrorCount());
         $this->assertSame(0, $file->getWarningCount());
         $this->assertCount(0, $file->getErrors());
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
index 0015a77701..1b1ab588a4 100644
--- a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             6  => 1,
             10 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
index 4e3f4d15be..5f71df24ab 100644
--- a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             6  => 1,
             10 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
index 12e071be00..dd5d577c3a 100644
--- a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
@@ -37,7 +37,6 @@ public function getErrorList()
             18 => 1,
             22 => 1,
         ];
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
index cee57148a8..21a8477b7e 100644
--- a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             6  => 1,
             10 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
index 9b1f2998a4..41658aa4b4 100644
--- a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
@@ -37,7 +37,6 @@ public function getErrorList()
             8  => 2,
             16 => 2,
         ];
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
index 31acb26c8e..d6eca0ba43 100644
--- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
@@ -31,7 +31,6 @@ final class MultipleStatementAlignmentUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -123,7 +122,6 @@ public function getWarningList()
             499 => 1,
             500 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
index 27464bd6af..e49975eab2 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
@@ -81,7 +81,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -96,7 +95,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
index 9c1487e98f..bd799b5919 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
@@ -67,7 +67,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -82,7 +81,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
index f32ddfb59e..26143d92a9 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
@@ -61,7 +61,6 @@ public function getErrorList()
             55 => 1,
             56 => 1,
         ];
-
     }
 
 
@@ -76,7 +75,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
index d2c2f49cff..80dab7ba0a 100644
--- a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
@@ -77,7 +77,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -92,7 +91,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
index ada1e5892c..0b2cb8e4da 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
@@ -69,7 +69,6 @@ public function getErrorList()
             268 => 1,
             270 => 1,
         ];
-
     }
 
 
@@ -84,7 +83,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
index 63ba34909f..46b5c703eb 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
@@ -34,7 +34,6 @@ public function setCliValues(string $testFile, Config $config)
         if ($testFile === 'OpeningFunctionBraceKernighanRitchieUnitTest.2.inc') {
             $config->tabWidth = 4;
         }
-
     }
 
 
@@ -95,7 +94,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -110,7 +108,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
index 3c4304c747..e863f8c723 100644
--- a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -70,7 +69,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
index 32f7592134..f8240450f7 100644
--- a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -63,7 +62,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
index 88a3059146..186e00d193 100644
--- a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
index 5f24fadf1d..be156723dd 100644
--- a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
@@ -83,7 +83,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -98,7 +97,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
index 3646af10fa..1012b53816 100644
--- a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -66,7 +65,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
index cea2bba062..fef0054964 100644
--- a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
@@ -40,7 +40,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -55,7 +54,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
index 6c172c4fe4..0c712d4f46 100644
--- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
@@ -41,7 +41,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -56,7 +55,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
index 5c8f99ce32..9f096d3ba2 100644
--- a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
@@ -54,7 +54,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -69,7 +68,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
index 63546dd423..ad42a8a1bb 100644
--- a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
@@ -33,7 +33,6 @@ public function getErrorList()
         return [
             2 => 2,
         ];
-
     }
 
 
@@ -48,7 +47,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
index 72329bda18..7977ed6cde 100644
--- a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
@@ -39,7 +39,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -54,7 +53,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
index 9df3314326..a536309fb6 100644
--- a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
index 93a5598b51..196ac32949 100644
--- a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList()
         }
 
         return $errors;
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
index 42b686f0d4..57c4dc330b 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -78,7 +77,6 @@ public function getWarningList($testFile = '')
         }
 
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
index 131925f7ea..439039058e 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
@@ -34,7 +34,6 @@ protected function getErrorList()
             12 => 1,
             13 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ protected function getErrorList()
     protected function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
index 775364950a..3c43d3be87 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
@@ -40,7 +40,6 @@ protected function getTestFiles(string $testFileBase)
         }
 
         return $testFiles;
-
     }
 
 
@@ -74,7 +73,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -108,7 +106,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
index 56bfdd43b9..993e1966ef 100644
--- a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
@@ -31,7 +31,6 @@ final class DiscourageGotoUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getWarningList()
             11 => 1,
             16 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
index 092bb6c114..5fd94558f2 100644
--- a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
         ];
 
         return $errors;
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
index e8eb7e6baf..94a0daa97a 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
@@ -78,7 +78,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -93,7 +92,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
index 60eced69fa..5e01089e39 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
@@ -61,7 +61,6 @@ public function getErrorList()
             71 => 1,
             72 => 1,
         ];
-
     }
 
 
@@ -76,7 +75,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
index 672d055325..5d35a9ce62 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
@@ -103,7 +103,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -118,7 +117,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
index e820e80664..443e7daf82 100644
--- a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -31,7 +31,6 @@ final class NoSilencedErrorsUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [13 => 1];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getWarningList()
             10 => 1,
             16 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
index d3344328f0..8791dbbc5c 100644
--- a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -65,7 +64,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
index 1b4d3fe5ed..2de9349799 100644
--- a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             2 => 1,
             6 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
index 7862412b0a..619fbfefe6 100644
--- a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -59,7 +58,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
@@ -103,7 +101,6 @@ public function testStdIn($content, $errorCount, $expectedErrors)
             $file->getErrors(),
             'Error list does not match expected errors'
         );
-
     }
 
 
@@ -163,7 +160,6 @@ public static function dataStdIn()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
index 666dd7890b..9b1cedc0c6 100644
--- a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
@@ -59,7 +59,6 @@ public function getErrorList()
             117 => 1,
             118 => 1,
         ];
-
     }
 
 
@@ -74,7 +73,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
index 08f1300b21..7a56ccb2e4 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
@@ -31,7 +31,6 @@ final class UnnecessaryHeredocUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -67,7 +66,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
index 8b53e15481..770aa8b46f 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
@@ -46,7 +46,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -61,7 +60,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
index c5449f134e..8e3ff3a243 100644
--- a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
@@ -117,7 +117,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -132,7 +131,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
index 36d6591986..7dd366aac8 100644
--- a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
@@ -29,7 +29,6 @@ protected function shouldSkipTest()
     {
         // This sniff cannot be tested as no SVN version control directory is available.
         return true;
-
     }
 
 
@@ -44,7 +43,6 @@ protected function shouldSkipTest()
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -59,7 +57,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
index 7c56ddf773..8ca0aa9e5b 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
@@ -73,7 +73,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -99,7 +98,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
index 4206bf94ec..b2936e3897 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
@@ -36,7 +36,6 @@ public function setCliValues(string $testFile, Config $config)
         }
 
         $config->tabWidth = 4;
-
     }
 
 
@@ -118,7 +117,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -133,7 +131,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
index edc81547db..3cf8f364ff 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
@@ -32,7 +32,6 @@ final class DisallowTabIndentUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
-
     }
 
 
@@ -119,7 +118,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -134,7 +132,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
index 86d95e948f..202c5d443d 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             24 => 1,
             34 => 1,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
index e8ff59b4b0..c03c921dac 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             19 => 1,
             23 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
index 796af6c73c..8ac6dbd4b2 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
@@ -56,7 +56,6 @@ public function getErrorList()
             56 => 1,
             58 => 1,
         ];
-
     }
 
 
@@ -71,7 +70,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
index b37c71fd6c..7571903538 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
@@ -80,7 +80,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -95,7 +94,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
index 339d44ebc6..ac32cef614 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -39,7 +39,6 @@ public function setCliValues(string $testFile, Config $config)
         } else {
             $config->tabWidth = 0;
         }
-
     }
 
 
@@ -174,7 +173,6 @@ public function getErrorList($testFile = '')
             1633 => 1,
             1634 => 1,
         ];
-
     }
 
 
@@ -189,7 +187,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
index 41e6ceb42d..2663bb312f 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
@@ -50,7 +50,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
index 08374ec034..2bba6b9a62 100644
--- a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -142,7 +141,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
index 2b5d1accc0..7b2b999ccd 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -87,7 +86,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Check each tag.
         $this->processTags($phpcsFile, $stackPtr, $tokens[$commentEnd]['comment_opener']);
-
     }
 
 
@@ -115,7 +113,6 @@ protected function processVersion(File $phpcsFile, array $tags)
                 $phpcsFile->addWarning($error, $tag, 'InvalidVersion', $data);
             }
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
index 06305a2df8..d94bfdfbe0 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
@@ -86,7 +86,6 @@ class FileCommentSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -214,7 +213,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -313,7 +311,6 @@ protected function processTags(File $phpcsFile, int $stackPtr, int $commentStart
                 $pos++;
             }
         }//end foreach
-
     }
 
 
@@ -355,7 +352,6 @@ protected function processCategory(File $phpcsFile, array $tags)
                 $phpcsFile->addError($error, $tag, 'InvalidCategory', $data);
             }
         }//end foreach
-
     }
 
 
@@ -408,7 +404,6 @@ protected function processPackage(File $phpcsFile, array $tags)
                 $phpcsFile->addError($error, $tag, 'InvalidPackage', $data);
             }//end if
         }//end foreach
-
     }
 
 
@@ -452,7 +447,6 @@ protected function processSubpackage(File $phpcsFile, array $tags)
             ];
             $phpcsFile->addError($error, $tag, 'InvalidSubpackage', $data);
         }//end foreach
-
     }
 
 
@@ -482,7 +476,6 @@ protected function processAuthor(File $phpcsFile, array $tags)
                 $phpcsFile->addError($error, $tag, 'InvalidAuthors');
             }
         }
-
     }
 
 
@@ -523,7 +516,6 @@ protected function processCopyright(File $phpcsFile, array $tags)
                 $phpcsFile->addError($error, $tag, 'IncompleteCopyright');
             }
         }//end foreach
-
     }
 
 
@@ -552,7 +544,6 @@ protected function processLicense(File $phpcsFile, array $tags)
                 $phpcsFile->addError($error, $tag, 'IncompleteLicense');
             }
         }
-
     }
 
 
@@ -584,7 +575,6 @@ protected function processVersion(File $phpcsFile, array $tags)
                 $phpcsFile->addWarning($error, $tag, 'InvalidVersion', $data);
             }
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
index 34d3051dd6..890015ddb0 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
@@ -44,7 +44,6 @@ class FunctionCommentSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -175,7 +174,6 @@ public function process(File $phpcsFile, int $stackPtr)
         $this->processReturn($phpcsFile, $stackPtr, $commentStart);
         $this->processThrows($phpcsFile, $stackPtr, $commentStart);
         $this->processParams($phpcsFile, $stackPtr, $commentStart);
-
     }
 
 
@@ -224,7 +222,6 @@ 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
-
     }
 
 
@@ -259,7 +256,6 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta
                 $phpcsFile->addError($error, $tag, 'InvalidThrows');
             }
         }//end foreach
-
     }
 
 
@@ -543,7 +539,6 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta
             $data  = [$neededParam];
             $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data);
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
index 05e5affcfa..f81bd9f9f0 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
@@ -24,7 +24,6 @@ class InlineCommentSniff implements Sniff
     public function register()
     {
         return [T_COMMENT];
-
     }
 
 
@@ -61,7 +60,6 @@ public function process(File $phpcsFile, int $stackPtr)
         ) {
             $phpcsFile->recordMetric($stackPtr, 'Inline comment style', '/* ... */');
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
index 424e4606e9..d94da7ea96 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -41,7 +41,6 @@ protected function getPatterns()
             'do {EOL',
             'match (...) {EOL',
         ];
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
index 9692dce08e..be70c09d2d 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
@@ -35,7 +35,6 @@ public function register()
             T_IF,
             T_ELSEIF,
         ];
-
     }
 
 
@@ -266,7 +265,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken(($closeBracket + 1), ' ');
             }
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
index 9f34ac6c03..1711233872 100644
--- a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
+++ b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
@@ -32,7 +32,6 @@ public function register()
             T_REQUIRE,
             T_INCLUDE,
         ];
-
     }
 
 
@@ -129,7 +128,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
index 08713ca756..02c95cdf73 100644
--- a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
@@ -31,7 +31,6 @@ class MultiLineAssignmentSniff implements Sniff
     public function register()
     {
         return [T_EQUAL];
-
     }
 
 
@@ -99,7 +98,6 @@ public function process(File $phpcsFile, int $stackPtr)
             ];
             $phpcsFile->addError($error, $stackPtr, 'Indent', $data);
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
index c5910d2417..821ca02c50 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -60,7 +60,6 @@ public function register()
         $tokens[] = T_CLOSE_PARENTHESIS;
 
         return $tokens;
-
     }
 
 
@@ -154,7 +153,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processSingleLineCall($phpcsFile, $stackPtr, $openBracket, $tokens);
         }
-
     }
 
 
@@ -179,7 +177,6 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket
         }
 
         return false;
-
     }
 
 
@@ -309,7 +306,6 @@ public function processSingleLineCall(File $phpcsFile, int $stackPtr, int $openB
                 }//end if
             }//end if
         }//end if
-
     }
 
 
@@ -619,7 +615,6 @@ public function processMultiLineCall(File $phpcsFile, int $stackPtr, int $openBr
                 $argEnd   = $phpcsFile->findEndOfStatement($next, [T_COLON]);
             }//end if
         }//end for
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
index 5669664de9..5bc8147db4 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -37,7 +37,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -193,7 +192,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens);
         }
-
     }
 
 
@@ -230,7 +228,6 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open
         }
 
         return false;
-
     }
 
 
@@ -257,7 +254,6 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr
 
         $sniff->checkClosures = true;
         $sniff->process($phpcsFile, $stackPtr);
-
     }
 
 
@@ -355,7 +351,6 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra
                 }
             }
         }
-
     }
 
 
@@ -529,7 +524,6 @@ public function processArgumentList(File $phpcsFile, int $stackPtr, int $indent,
                 continue;
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
index befc589859..cc00c4f437 100644
--- a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_CLOSURE,
             T_FN,
         ];
-
     }
 
 
@@ -74,7 +73,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 return;
             }
         }//end foreach
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
index ee65aeec6a..174a7d3775 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -91,7 +90,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addError($error, $stackPtr, 'Invalid', $data);
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 24314cb9da..646062e7b5 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -74,7 +74,6 @@ class ValidFunctionNameSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION], true);
-
     }
 
 
@@ -183,7 +182,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
                 $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
             }
         }
-
     }
 
 
@@ -290,7 +288,6 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $data[] = $newName;
             $phpcsFile->addError($error, $stackPtr, 'FunctionNameInvalid', $data);
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 08046a7ecd..f78df9ba5e 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -25,7 +25,6 @@ class ValidVariableNameSniff extends AbstractVariableSniff
     public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
-
     }
 
 
@@ -80,7 +79,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'PublicUnderscore', $data);
             return;
         }
-
     }
 
 
@@ -94,10 +92,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
      */
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // We don't care about normal variables.
     }
 
 
@@ -111,10 +106,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
      */
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // 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 1cb0fde648..ced5674e64 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -48,7 +48,6 @@ class ObjectOperatorIndentSniff implements Sniff
     public function register()
     {
         return self::TARGET_TOKENS;
-
     }
 
 
@@ -194,7 +193,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $end
             );
         }//end while
-
     }
 
 
diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index 32f1448919..b3535b2835 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -32,7 +32,6 @@ class ScopeClosingBraceSniff implements Sniff
     public function register()
     {
         return Tokens::SCOPE_OPENERS;
-
     }
 
 
@@ -175,7 +174,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->addContentBefore($lineStart, $spaces);
             }
         }
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
index 3a4ac3ddc5..73a9e9b024 100644
--- a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
@@ -36,7 +36,6 @@ public function setCliValues(string $testFile, Config $config)
         }
 
         $config->tabWidth = 4;
-
     }
 
 
@@ -73,7 +72,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -90,7 +88,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return[];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
index 07676ce31e..967889167c 100644
--- a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
@@ -66,7 +66,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -92,7 +91,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
index 91db38015f..d18e8ed6c7 100644
--- a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
@@ -60,7 +60,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -88,7 +87,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
index 3eb692f2f5..afa6edd1cd 100644
--- a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
@@ -104,7 +104,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -119,7 +118,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
index a47cf5c6d8..e0a8c6c4da 100644
--- a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
@@ -39,7 +39,6 @@ public function getErrorList()
             29 => 1,
             31 => 1,
         ];
-
     }
 
 
@@ -54,7 +53,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
index 7dc7c68e8f..c9f0bed063 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -55,7 +55,6 @@ public function getErrorList()
             157 => 1,
             165 => 1,
         ];
-
     }
 
 
@@ -70,7 +69,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
index af9f7a4ec9..cce69026f6 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
@@ -67,7 +67,6 @@ public function getErrorList()
             240 => 2,
             248 => 2,
         ];
-
     }
 
 
@@ -82,7 +81,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
index 5eb4c5a86d..8063f7b0db 100644
--- a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
+++ b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
@@ -50,7 +50,6 @@ public function getErrorList()
             98 => 1,
             99 => 2,
         ];
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
index 8726d946ad..207eb099de 100644
--- a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             6 => 1,
             8 => 1,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
index fdc9fcf19c..baad23d9d3 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
@@ -129,7 +129,6 @@ public function getErrorList()
             604 => 1,
             605 => 2,
         ];
-
     }
 
 
@@ -144,7 +143,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
index 18c502d893..467a93bab1 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -118,7 +118,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -133,7 +132,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
index 6e64ca8824..bd4f6897ed 100644
--- a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
@@ -52,7 +52,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -67,7 +66,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
index 36003cd18f..e8925265f8 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
@@ -56,7 +56,6 @@ public function getErrorList()
             88 => 2,
             90 => 1,
         ];
-
     }
 
 
@@ -71,7 +70,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 98bd1fc5d1..5a62322f94 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -140,7 +140,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -155,7 +154,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
index bd0b527a3c..c498227ccb 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -66,7 +65,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
index 45ece65f3c..af85545770 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
@@ -58,7 +58,6 @@ public function getErrorList()
             142 => 1,
             152 => 1,
         ];
-
     }
 
 
@@ -73,7 +72,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
index 6e01c392bd..ea0c2261fa 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList()
             164 => 1,
             170 => 1,
         ];
-
     }
 
 
@@ -66,7 +65,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
index 8943d8999d..8fac569b23 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -32,7 +32,6 @@ final class ScopeIndentUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->setConfigData('scope_indent_debug', '0', true);
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList()
             284 => 1,
             311 => 1,
         ];
-
     }
 
 
@@ -80,7 +78,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
index 382bd39adf..1da6e5820e 100644
--- a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
@@ -29,7 +29,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -68,7 +67,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'Class defined in namespace', 'yes');
         }
-
     }
 
 
diff --git a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
index 6a5efca13a..8ed6fd791e 100644
--- a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
+++ b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
@@ -49,7 +49,6 @@ class SideEffectsSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -308,7 +306,6 @@ private function searchForConflict(File $phpcsFile, int $start, int $end, array
             'symbol' => $firstSymbol,
             'effect' => $firstEffect,
         ];
-
     }
 
 
diff --git a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
index bc0a2a427b..6243923c8c 100644
--- a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
+++ b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
@@ -69,7 +69,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
         } else {
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
-
     }
 
 
@@ -84,7 +83,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
diff --git a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
index 89d5f6421d..8af5e25093 100644
--- a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
@@ -40,7 +40,6 @@ public function getErrorList($testFile = '')
             2 => 1,
             3 => 2,
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
index 9d5824fa80..c958999a4e 100644
--- a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
+++ b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
@@ -34,7 +34,6 @@ public function setCliValues(string $testFile, Config $config)
         if ($testFile === 'SideEffectsUnitTest.12.inc') {
             $config->annotations = false;
         }
-
     }
 
 
@@ -51,7 +50,6 @@ public function setCliValues(string $testFile, Config $config)
     public function getErrorList($testFile = '')
     {
         return [];
-
     }
 
 
@@ -79,7 +77,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
index fa8f2a761d..987cad6fe3 100644
--- a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
+++ b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
@@ -50,7 +50,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
index 1373233db1..4a824ed4e0 100644
--- a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
@@ -41,7 +41,6 @@ class AnonClassDeclarationSniff extends ClassDeclarationSniff
     public function register()
     {
         return [T_ANON_CLASS];
-
     }
 
 
@@ -131,7 +130,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }//end if
-
     }
 
 
@@ -218,7 +216,6 @@ public function processSingleLineArgumentList(File $phpcsFile, int $stackPtr)
                 }//end if
             }//end if
         }//end if
-
     }
 
 
@@ -239,7 +236,6 @@ public function processMultiLineArgumentList(File $phpcsFile, int $stackPtr)
 
         $this->multiLineSniff->processBracket($phpcsFile, $openBracket, $tokens, 'argument');
         $this->multiLineSniff->processArgumentList($phpcsFile, $stackPtr, $this->indent, 'argument');
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
index 6a14054d48..7e9efec62b 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
@@ -25,7 +25,6 @@ class ClassInstantiationSniff implements Sniff
     public function register()
     {
         return [T_NEW];
-
     }
 
 
@@ -104,7 +103,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $prev = $phpcsFile->findPrevious(Tokens::EMPTY_TOKENS, ($classNameEnd - 1), null, true);
             $phpcsFile->fixer->addContent($prev, '()');
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
index d79c2ccd69..de2bb99193 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
@@ -30,7 +30,6 @@ public function register()
             T_ENUM,
             T_FUNCTION,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ 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');
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
index f6b00938b1..0831352079 100644
--- a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
@@ -25,7 +25,6 @@ class OpeningBraceSpaceSniff implements Sniff
     public function register()
     {
         return Tokens::OO_SCOPE_TOKENS;
-
     }
 
 
@@ -73,7 +72,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         $phpcsFile->fixer->endChangeset();
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
index 43d007ba4c..e2e5d51577 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
@@ -49,7 +49,6 @@ public function register()
             T_ELSEIF,
             T_MATCH,
         ];
-
     }
 
 
@@ -227,7 +226,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end foreach
 
         $phpcsFile->fixer->endChangeset();
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
index 946ae085c0..048b5eaa70 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -38,7 +38,6 @@ class ControlStructureSpacingSniff implements Sniff
     public function __construct()
     {
         $this->psr2ControlStructureSpacing = new PSR2ControlStructureSpacing();
-
     }
 
 
@@ -59,7 +58,6 @@ public function register()
             T_CATCH,
             T_MATCH,
         ];
-
     }
 
 
@@ -213,7 +211,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
index add352c7e9..2eb04ffb1d 100644
--- a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
@@ -25,7 +25,6 @@ class DeclareStatementSniff implements Sniff
     public function register()
     {
         return [T_DECLARE];
-
     }
 
 
@@ -255,7 +254,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
index dddfd979c5..9cec2fd9fc 100644
--- a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
@@ -25,7 +25,6 @@ class FileHeaderSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -115,7 +114,6 @@ public function process(File $phpcsFile, int $stackPtr)
         $this->processHeaderLines($phpcsFile, $possibleHeaders[$openTag]);
 
         return $phpcsFile->numTokens;
-
     }
 
 
@@ -273,7 +271,6 @@ public function getHeaderLines(File $phpcsFile, int $stackPtr)
         } while ($next !== false);
 
         return $headerLines;
-
     }
 
 
@@ -424,7 +421,6 @@ public function processHeaderLines(File $phpcsFile, array $headerLines)
                 $phpcsFile->addError($error, $found[$type]['start'], 'IncorrectOrder', $data);
             }//end if
         }//end foreach
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
index 75d0c78b58..a5f2769a70 100644
--- a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
@@ -25,7 +25,6 @@ class ImportStatementSniff implements Sniff
     public function register()
     {
         return [T_USE];
-
     }
 
 
@@ -70,7 +69,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if ($fix === true) {
             $phpcsFile->fixer->replaceToken($next, ltrim($tokens[$next]['content'], '\\'));
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
index 25e9dd30e4..42f84c4067 100644
--- a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
@@ -24,7 +24,6 @@ class OpenTagSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -77,7 +76,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
index 2071901495..6f05da2cab 100644
--- a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
@@ -40,7 +40,6 @@ class NullableTypeDeclarationSniff implements Sniff
     public function register()
     {
         return [T_NULLABLE];
-
     }
 
 
@@ -86,7 +85,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Non-whitespace tokens found; trigger error but don't fix.
         $phpcsFile->addError($error, $stackPtr, 'UnexpectedCharactersFound');
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
index 68e11ea284..7d3cc658db 100644
--- a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_CLOSURE,
             T_FN,
         ];
-
     }
 
 
@@ -103,7 +102,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addError($error, $colon, 'SpaceBeforeColon');
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
index 26f47b94ce..bb40a724a6 100644
--- a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
+++ b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_BOOL_CAST,
             T_INT_CAST,
         ];
-
     }
 
 
@@ -68,7 +67,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->replaceToken($stackPtr, $replacement);
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
index 7315c53a8b..c0c5bf02dd 100644
--- a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
+++ b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
@@ -31,7 +31,6 @@ class CompoundNamespaceDepthSniff implements Sniff
     public function register()
     {
         return [T_OPEN_USE_GROUP];
-
     }
 
 
@@ -78,7 +77,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $depth = 1;
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
index b0280724f6..46eb6148c8 100644
--- a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
@@ -39,7 +39,6 @@ public function register()
         $targets[] = T_DECLARE;
 
         return $targets;
-
     }
 
 
@@ -121,7 +120,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->addContent($stackPtr, ' ');
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
index 9e0c7e184b..f7e83de4e1 100644
--- a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
+++ b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
@@ -36,7 +36,6 @@ class ConstantVisibilitySniff implements Sniff
     public function register()
     {
         return [T_CONST];
-
     }
 
 
@@ -68,7 +67,6 @@ 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');
-
     }
 
 
diff --git a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
index 176ddf5ed1..dc1a67a295 100644
--- a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
@@ -25,7 +25,6 @@ class UseDeclarationSniff implements Sniff
     public function register()
     {
         return [T_USE];
-
     }
 
 
@@ -299,7 +298,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end foreach
 
         return $tokens[$ooToken]['scope_closer'];
-
     }
 
 
@@ -667,7 +665,6 @@ protected function processUseGroup(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
@@ -693,7 +690,6 @@ protected function processUseStatement(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken($next, ';' . $phpcsFile->eolChar . $padding . 'use ');
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
index 479c2e97a9..5608404ce5 100644
--- a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
@@ -58,7 +58,6 @@ public function getErrorList()
             94 => 1,
             96 => 1,
         ];
-
     }
 
 
@@ -73,7 +72,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
index 7a87a6964c..0dc90c0287 100644
--- a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
@@ -52,7 +52,6 @@ public function getErrorList()
             55 => 1,
             56 => 1,
         ];
-
     }
 
 
@@ -67,7 +66,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
index 601f8ba2a4..3a682da903 100644
--- a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             31 => 1,
             52 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
index fa47223764..3a8425f824 100644
--- a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             41 => 1,
             55 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
index c55b54b986..b130f1423c 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList()
             104 => 1,
             125 => 1,
         ];
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
index 546ddde6cb..c0b76bcb44 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -55,7 +55,6 @@ public function getErrorList()
             117 => 1,
             127 => 1,
         ];
-
     }
 
 
@@ -70,7 +69,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
index dfd79dff45..dd1b430c08 100644
--- a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
@@ -62,7 +62,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -77,7 +76,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
index a9394094e3..4206ee18e5 100644
--- a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
@@ -65,7 +65,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -80,7 +79,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
index 2086b97e38..6f549e0a6c 100644
--- a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             7  => 1,
             10 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
index 42b66f5d5e..87a26e4252 100644
--- a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
index dbffa1ba18..16888a2f2b 100644
--- a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
@@ -51,7 +51,6 @@ protected function getErrorList()
             95 => 1,
             98 => 3,
         ];
-
     }
 
 
@@ -66,7 +65,6 @@ protected function getErrorList()
     protected function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
index b566e0685a..0cacbacb14 100644
--- a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
@@ -44,7 +44,6 @@ protected function getErrorList()
             62 => 1,
             64 => 1,
         ];
-
     }
 
 
@@ -59,7 +58,6 @@ protected function getErrorList()
     protected function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
index 27089d9ebc..057626bd87 100644
--- a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
+++ b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
@@ -37,7 +37,6 @@ public function getErrorList()
             13 => 1,
             14 => 1,
         ];
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
index 70477578e4..5dd6c385f1 100644
--- a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
+++ b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             19 => 1,
             22 => 1,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
index 80085ce5bc..75226d9de3 100644
--- a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
@@ -59,7 +59,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -74,7 +73,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
index 4442c447e4..ee5a370353 100644
--- a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
+++ b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
@@ -31,7 +31,6 @@ final class ConstantVisibilityUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -63,7 +62,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
diff --git a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
index 95a7971d59..de173420f8 100644
--- a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
@@ -54,7 +54,6 @@ public function getErrorList()
             208 => 1,
             219 => 3,
         ];
-
     }
 
 
@@ -69,7 +68,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
index c8de0aca50..f7c4645122 100644
--- a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
@@ -57,7 +57,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $this->processOpen($phpcsFile, $stackPtr);
         $this->processClose($phpcsFile, $stackPtr);
-
     }
 
 
@@ -460,7 +459,6 @@ public function processOpen(File $phpcsFile, int $stackPtr)
                 $nextComma = ($className + 1);
             }//end if
         }//end foreach
-
     }
 
 
@@ -516,7 +514,6 @@ public function processClose(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addError($error, $closeBrace, 'CloseBraceSameLine', $data);
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
index 9e3ab9c390..a7ed1c9118 100644
--- a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -25,7 +25,6 @@ class PropertyDeclarationSniff extends AbstractVariableSniff
     public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
-
     }
 
 
@@ -278,7 +277,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
@@ -292,10 +290,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
      */
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // We don't care about normal variables.
     }
 
 
@@ -309,10 +304,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
      */
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // 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 330f76a5ec..168b60ce09 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -48,7 +48,6 @@ public function register()
             T_CATCH,
             T_MATCH,
         ];
-
     }
 
 
@@ -134,7 +133,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
index 2c9ae796a4..b8d493d932 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_ELSE,
             T_ELSEIF,
         ];
-
     }
 
 
@@ -65,7 +64,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index 294ce039e5..bb24152eac 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -46,7 +46,6 @@ class SwitchDeclarationSniff implements Sniff
     public function register()
     {
         return [T_SWITCH];
-
     }
 
 
@@ -221,7 +220,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end while
-
     }
 
 
@@ -250,7 +248,6 @@ private function findNextCase(File $phpcsFile, int $stackPtr, int $end)
         }
 
         return $stackPtr;
-
     }
 
 
@@ -403,7 +400,6 @@ private function findNestedTerminator(File $phpcsFile, int $stackPtr, int $end)
         }//end if
 
         return false;
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
index e2edeed4d9..af3d1db8f4 100644
--- a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
@@ -25,7 +25,6 @@ class ClosingTagSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -82,7 +81,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
index 2318e814dd..cf20b26bcf 100644
--- a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -100,7 +99,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Skip the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
index c87b1353c9..71733cde21 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
@@ -72,7 +72,6 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket
         }
 
         return false;
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
index f61e268cc5..96f761d151 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -84,7 +83,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
index 7e0d26048c..929e76f323 100644
--- a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
@@ -23,7 +23,6 @@ class MethodDeclarationSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]);
-
     }
 
 
@@ -139,7 +138,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
@@ -155,7 +153,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
index bc4ec52c13..e1a3fe543b 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
@@ -24,7 +24,6 @@ class NamespaceDeclarationSniff implements Sniff
     public function register()
     {
         return [T_NAMESPACE];
-
     }
 
 
@@ -86,7 +85,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
index 30400bc01f..c9bfa2176c 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -25,7 +25,6 @@ class UseDeclarationSniff implements Sniff
     public function register()
     {
         return [T_USE];
-
     }
 
 
@@ -261,7 +260,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
@@ -295,7 +293,6 @@ private function shouldIgnoreUse(File $phpcsFile, int $stackPtr)
         }
 
         return false;
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
index b4317d9495..35b2b8216d 100644
--- a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
@@ -81,7 +81,6 @@ public function getErrorList()
             324 => 1,
             344 => 1,
         ];
-
     }
 
 
@@ -96,7 +95,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
index 3669578353..699c7f1728 100644
--- a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -89,7 +89,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -118,7 +117,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
index 3107b93939..bbb57b775a 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList()
             77 => 2,
             79 => 2,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
index 41b51c1ff8..692cf6fdd5 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -31,7 +31,6 @@ final class ElseIfDeclarationUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getWarningList()
             4  => 1,
             12 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
index e8a442c357..a9dad6abd1 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -69,7 +69,6 @@ public function getErrorList()
             620 => 1,
             622 => 1,
         ];
-
     }
 
 
@@ -84,7 +83,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
index bed93ad217..6773149a5c 100644
--- a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
@@ -47,7 +47,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -62,7 +61,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
index 24458bfada..92ddba0ebe 100644
--- a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
@@ -47,7 +47,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -64,7 +63,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
index 9e7bbd96b1..e7f307f435 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
@@ -82,7 +82,6 @@ public function getErrorList()
             281 => 1,
             282 => 3,
         ];
-
     }
 
 
@@ -97,7 +96,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
index c74728a2ed..2f6d760824 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             63 => 1,
             70 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
index 66c86b9732..ed6b1d08de 100644
--- a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
@@ -55,7 +55,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -85,7 +84,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
index 612c1bcee2..41f51cb752 100644
--- a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             17 => 1,
             19 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
index b8485e591f..dbae525e6c 100644
--- a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
@@ -80,7 +80,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -95,7 +94,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
index ce3b410adb..7ed6fe28bc 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_OPEN_SQUARE_BRACKET,
             T_CLOSE_SQUARE_BRACKET,
         ];
-
     }
 
 
@@ -88,7 +87,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
index 861821bbbf..2260b28623 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_ARRAY,
             T_OPEN_SHORT_ARRAY,
         ];
-
     }
 
 
@@ -146,7 +145,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $arrayEnd);
         }
-
     }
 
 
@@ -320,7 +318,6 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arra
                 }
             }//end foreach
         }//end if
-
     }
 
 
@@ -955,7 +952,6 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
                 }
             }
         }//end foreach
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
index 94105750a4..aa6f5655a0 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
@@ -38,7 +38,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Only one interface or class is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleClasses');
         }
-
     }
 
 
@@ -83,7 +82,6 @@ public function processOpen(File $phpcsFile, int $stackPtr)
                 }
             }//end if
         }//end if
-
     }
 
 
@@ -217,7 +215,6 @@ public function processClose(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
index 41d0557a56..c10b4a89e0 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
@@ -28,7 +28,6 @@ public function register()
         unset($targets[T_ANON_CLASS]);
 
         return $targets;
-
     }
 
 
@@ -68,7 +67,6 @@ public function process(File $phpcsFile, int $stackPtr)
             ];
             $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
index f011c6ce97..5d2488ce80 100644
--- a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
@@ -34,7 +34,6 @@ public function register()
         $targets[] = T_CONST;
 
         return $targets;
-
     }
 
 
@@ -66,7 +65,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken($stackPtr, $contentLc);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
index 0c57a859ab..179646944c 100644
--- a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
@@ -28,7 +28,6 @@ class SelfMemberReferenceSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct([T_CLASS], [T_DOUBLE_COLON]);
-
     }
 
 
@@ -151,7 +150,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
@@ -167,7 +165,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
@@ -197,7 +194,6 @@ protected function getNamespaceName(File $phpcsFile, int $stackPtr)
         }
 
         return $namespace;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
index d4eee0d53e..1d09ab6c10 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
@@ -31,7 +31,6 @@ public function register()
             T_TRAIT,
             T_ENUM,
         ];
-
     }
 
 
@@ -79,7 +78,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'yes');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
index ac048d7021..6a25163ab3 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
@@ -35,7 +35,6 @@ public function register()
             T_COMMENT,
             T_DOC_COMMENT_OPEN_TAG,
         ];
-
     }
 
 
@@ -392,7 +391,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Empty line required after block comment';
             $phpcsFile->addError($error, $commentCloser, 'NoEmptyLineAfter');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
index a332bb102f..9f09a3ad4e 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
@@ -32,7 +32,6 @@ class ClassCommentSniff implements Sniff
     public function register()
     {
         return [T_CLASS];
-
     }
 
 
@@ -102,7 +101,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $data  = [$tokens[$tag]['content']];
             $phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
index 5563c7725d..dd8f18c83f 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
@@ -30,7 +30,6 @@ public function register()
             T_INTERFACE,
             T_TRAIT,
         ];
-
     }
 
 
@@ -125,7 +124,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             return;
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
index b5c9bc2f1b..8d9c0f7cce 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
@@ -25,7 +25,6 @@ class DocCommentAlignmentSniff implements Sniff
     public function register()
     {
         return [T_DOC_COMMENT_OPEN_TAG];
-
     }
 
 
@@ -140,7 +139,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
index 80932538af..61010f3294 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
@@ -24,7 +24,6 @@ class EmptyCatchCommentSniff implements Sniff
     public function register()
     {
         return [T_CATCH];
-
     }
 
 
@@ -48,7 +47,6 @@ 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');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
index e8dafe1544..01a3d7f68f 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
@@ -36,7 +36,6 @@ class FileCommentSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -214,7 +213,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
index 274d9c34c2..d2ec6450a9 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
@@ -188,7 +188,6 @@ 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
-
     }
 
 
@@ -264,7 +263,6 @@ protected function processThrows(File $phpcsFile, int $stackPtr, int $commentSta
                 }
             }//end if
         }//end foreach
-
     }
 
 
@@ -639,7 +637,6 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta
             $data  = [$neededParam];
             $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data);
         }
-
     }
 
 
@@ -698,7 +695,6 @@ protected function checkSpacingAfterParamType(File $phpcsFile, array $param, int
                 $phpcsFile->fixer->endChangeset();
             }//end if
         }//end if
-
     }
 
 
@@ -757,7 +753,6 @@ protected function checkSpacingAfterParamName(File $phpcsFile, array $param, int
                 $phpcsFile->fixer->endChangeset();
             }//end if
         }//end if
-
     }
 
 
@@ -793,7 +788,6 @@ protected function checkInheritdoc(File $phpcsFile, int $stackPtr, int $commentS
         }
 
         return false;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
index ab1214e656..364bbe3e01 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
@@ -25,7 +25,6 @@ class FunctionCommentThrowTagSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -226,7 +225,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $data  = [$throw];
             $phpcsFile->addError($error, $commentEnd, 'Missing', $data);
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
index c14329fd6a..855b4cf802 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
@@ -39,7 +39,6 @@ public function register()
             T_COMMENT,
             T_DOC_COMMENT_OPEN_TAG,
         ];
-
     }
 
 
@@ -309,7 +308,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }//end if
 
         return ($lastCommentToken + 1);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
index dbcab4adb3..b5ec76ff3d 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
@@ -57,7 +57,6 @@ class LongConditionClosingCommentSniff implements Sniff
     public function register()
     {
         return [T_CLOSE_CURLY_BRACKET];
-
     }
 
 
@@ -201,7 +200,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             return;
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
index c913bc1837..f11f202694 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
@@ -42,7 +42,6 @@ class PostStatementCommentSniff implements Sniff
     public function register()
     {
         return [T_COMMENT];
-
     }
 
 
@@ -110,7 +109,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if ($fix === true) {
             $phpcsFile->fixer->addNewlineBefore($stackPtr);
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
index 65f0c8654e..78ae1e23ec 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
@@ -25,7 +25,6 @@ class VariableCommentSniff extends AbstractVariableSniff
     public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
-
     }
 
 
@@ -174,7 +173,6 @@ public function processMemberVar(File $phpcsFile, int $stackPtr)
                 unset($replacement);
             }
         }
-
     }
 
 
@@ -191,7 +189,6 @@ public function processMemberVar(File $phpcsFile, int $stackPtr)
      */
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
@@ -208,7 +205,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
      */
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
index 615c9abb82..da076ab2ef 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -45,7 +45,6 @@ public function register()
             T_SWITCH,
             T_MATCH,
         ];
-
     }
 
 
@@ -320,7 +319,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
index 492dfd3981..964c20ef75 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -24,7 +24,6 @@ class ElseIfDeclarationSniff implements Sniff
     public function register()
     {
         return [T_ELSEIF];
-
     }
 
 
@@ -44,7 +43,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if ($fix === true) {
             $phpcsFile->fixer->replaceToken($stackPtr, 'else if');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
index 34f4c51005..4065f701f2 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
@@ -38,7 +38,6 @@ class ForEachLoopDeclarationSniff implements Sniff
     public function register()
     {
         return [T_FOREACH];
-
     }
 
 
@@ -226,7 +225,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
index b8329a909b..27f4d84d83 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
@@ -46,7 +46,6 @@ class ForLoopDeclarationSniff implements Sniff
     public function register()
     {
         return [T_FOR];
-
     }
 
 
@@ -298,7 +297,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }//end if
             }//end if
         } while ($semicolonCount < 2);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
index 6f45488ca4..3b971f0489 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
@@ -24,7 +24,6 @@ class InlineIfDeclarationSniff implements Sniff
     public function register()
     {
         return [T_INLINE_THEN];
-
     }
 
 
@@ -148,7 +147,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
index 14e8e12633..cdb07ab1ac 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
@@ -36,7 +36,6 @@ public function register()
             T_CATCH,
             T_MATCH,
         ];
-
     }
 
 
@@ -68,7 +67,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken($stackPtr, $contentLc);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index ccf94e81ac..c5f51f5ba2 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -32,7 +32,6 @@ class SwitchDeclarationSniff implements Sniff
     public function register()
     {
         return [T_SWITCH];
-
     }
 
 
@@ -287,7 +286,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'SWITCH statements must contain at least one CASE statement';
             $phpcsFile->addError($error, $stackPtr, 'MissingCase');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
index 5c7403f624..610f5a2ff3 100644
--- a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
@@ -24,7 +24,6 @@ class FileExtensionSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -61,7 +60,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
index 96e7490e9c..e2782800fc 100644
--- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
+++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
@@ -25,7 +25,6 @@ class OperatorBracketSniff implements Sniff
     public function register()
     {
         return Tokens::OPERATORS;
-
     }
 
 
@@ -240,7 +239,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if ($lastAssignment !== false && $lastAssignment > $lastBracket) {
             $this->addMissingBracketsError($phpcsFile, $stackPtr);
         }
-
     }
 
 
@@ -363,7 +361,6 @@ public function addMissingBracketsError(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($after, $tokens[$after]['content'] . ')');
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
index edfc066404..d2952ed8a8 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
@@ -51,7 +51,6 @@ public function register()
             T_CLOSURE,
             T_FN,
         ];
-
     }
 
 
@@ -88,7 +87,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $this->processBracket($phpcsFile, $tokens[$use]['parenthesis_opener']);
             }
         }
-
     }
 
 
@@ -561,7 +559,6 @@ public function processBracket(File $phpcsFile, int $openBracket)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
index ff6d56dd84..b862e45d98 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -27,7 +27,6 @@ protected function getPatterns()
             'function abc(...)',
             'abstract function abc(...);',
         ];
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
index 1e5ce30ea1..41cc544754 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
@@ -24,7 +24,6 @@ class FunctionDuplicateArgumentSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -57,7 +56,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
index d06a64a559..fa6974d134 100644
--- a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
@@ -24,7 +24,6 @@ class GlobalFunctionSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -54,7 +53,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
index 7a3d655303..462b41cc35 100644
--- a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
@@ -30,7 +30,6 @@ public function register()
         $tokens[] = T_FN;
 
         return $tokens;
-
     }
 
 
@@ -62,7 +61,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken($stackPtr, $contentLc);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
index c8cb53db3f..ccccf2f653 100644
--- a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
@@ -77,7 +77,6 @@ public function isMultiLineDeclaration(File $phpcsFile, int $stackPtr, int $open
         }//end foreach
 
         return false;
-
     }
 
 
@@ -125,7 +124,6 @@ public function processSingleLineDeclaration(File $phpcsFile, int $stackPtr, arr
                 }
             }
         }//end if
-
     }
 
 
@@ -158,7 +156,6 @@ public function processMultiLineDeclaration(File $phpcsFile, int $stackPtr, arra
         }
 
         $this->processBracket($phpcsFile, $tokens[$use]['parenthesis_opener'], $tokens, 'use');
-
     }
 
 
@@ -242,7 +239,6 @@ public function processBracket(File $phpcsFile, int $openBracket, array $tokens,
                 }
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index ebf63c800b..20408184d1 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -47,7 +47,6 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $error = 'Function name "%s" is not in camel caps format';
             $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
index be64087050..4ed1877b3b 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -100,7 +100,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             $data  = [$originalVarName];
             $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $data);
         }
-
     }
 
 
@@ -150,7 +149,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $error = 'Member variable "%s" is not in valid camel caps format';
             $phpcsFile->addError($error, $stackPtr, 'MemberNotCamelCaps', $errorData);
         }
-
     }
 
 
@@ -181,7 +179,6 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
index cb54cfb71f..3ccfed0e27 100644
--- a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
@@ -25,7 +25,6 @@ class ObjectInstantiationSniff implements Sniff
     public function register()
     {
         return [T_NEW];
-
     }
 
 
@@ -78,7 +77,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $error = 'New objects must be assigned to a variable';
         $phpcsFile->addError($error, $stackPtr, 'NotAssigned');
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
index 3e3507c157..4ec804fb77 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
@@ -57,7 +57,6 @@ public function register()
             T_WHILE,
             T_FOR,
         ];
-
     }
 
 
@@ -207,7 +206,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $error = 'Implicit true comparisons prohibited; use === TRUE instead';
             $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
index b3d779aec5..37bc6a6b5c 100644
--- a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
@@ -31,7 +31,6 @@ public function register()
             T_INC,
             T_DEC,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->processAssignment($phpcsFile, $stackPtr);
         }
-
     }
 
 
@@ -103,7 +101,6 @@ 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');
         }
-
     }
 
 
@@ -224,7 +221,6 @@ 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
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
index 4dc4dd6f20..d9067a5931 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_LOGICAL_AND,
             T_LOGICAL_OR,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ public function process(File $phpcsFile, int $stackPtr)
             $replacements[$operator],
         ];
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed', $data);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
index 7777dae3a7..7d1c7c2cb2 100644
--- a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
@@ -35,7 +35,6 @@ class CommentedOutCodeSniff implements Sniff
     public function register()
     {
         return [T_COMMENT];
-
     }
 
 
@@ -272,7 +271,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         return ($lastCommentBlockToken + 1);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
index 95bf1ed753..72b134b66b 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
@@ -25,7 +25,6 @@ class DisallowBooleanStatementSniff implements Sniff
     public function register()
     {
         return Tokens::BOOLEAN_OPERATORS;
-
     }
 
 
@@ -52,7 +51,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $error = 'Boolean operators are not allowed outside of control structure conditions';
         $phpcsFile->addError($error, $stackPtr, 'Found');
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
index ac3f17c5dd..6186c63eb3 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
@@ -25,7 +25,6 @@ class DisallowComparisonAssignmentSniff implements Sniff
     public function register()
     {
         return [T_EQUAL];
-
     }
 
 
@@ -103,7 +102,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 break;
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
index e0462293ed..6c2013afa8 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
@@ -24,7 +24,6 @@ class DisallowInlineIfSniff implements Sniff
     public function register()
     {
         return [T_INLINE_THEN];
-
     }
 
 
@@ -40,7 +39,6 @@ public function register()
     public function process(File $phpcsFile, int $stackPtr)
     {
         $phpcsFile->addError('Inline IF statements are not allowed', $stackPtr, 'Found');
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
index 8e4e3ba590..258d25729e 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
@@ -25,7 +25,6 @@ class DisallowMultipleAssignmentsSniff implements Sniff
     public function register()
     {
         return [T_EQUAL];
-
     }
 
 
@@ -188,7 +187,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         $phpcsFile->addError($error, $stackPtr, $errorCode);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
index 99d7766450..b58b452c03 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
@@ -47,7 +47,6 @@ public function register()
             T_WHILE,
             T_FOR,
         ];
-
     }
 
 
@@ -95,7 +94,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->addError($error, $i, 'Found', $data);
             }//end if
         }//end for
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
index 3a36758527..e57977fa67 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
@@ -28,7 +28,6 @@ public function register()
             T_OPEN_TAG,
             T_OPEN_TAG_WITH_ECHO,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function process(File $phpcsFile, int $stackPtr)
         } else {
             $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag);
         }
-
     }
 
 
@@ -320,7 +318,6 @@ private function validateMultilineEmbeddedPhp(File $phpcsFile, int $stackPtr, $c
                 $phpcsFile->fixer->endChangeset();
             }
         }//end if
-
     }
 
 
@@ -427,7 +424,6 @@ private function validateInlineEmbeddedPhp(File $phpcsFile, int $stackPtr, int $
                 }
             }
         }
-
     }
 
 
@@ -466,7 +462,6 @@ private function reportEmptyTagSet(File $phpcsFile, int $stackPtr, int $closeTag
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
@@ -506,7 +501,6 @@ private function calculateLineIndent(File $phpcsFile, int $stackPtr)
         }
 
         return $indent;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
index ef544bee9b..5ce4ae4c37 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
@@ -24,7 +24,6 @@ class EvalSniff implements Sniff
     public function register()
     {
         return [T_EVAL];
-
     }
 
 
@@ -41,7 +40,6 @@ public function process(File $phpcsFile, int $stackPtr)
     {
         $error = 'Use of eval() is discouraged';
         $phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
index d777b2fa8f..8ce43ff88d 100644
--- a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
@@ -24,7 +24,6 @@ class GlobalKeywordSniff implements Sniff
     public function register()
     {
         return [T_GLOBAL];
-
     }
 
 
@@ -46,7 +45,6 @@ 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);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
index 5980b10b53..bc3513e858 100644
--- a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_START_HEREDOC,
             T_START_NOWDOC,
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ 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);
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
index 7b50f832a4..d40bfcb2fa 100644
--- a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
@@ -25,7 +25,6 @@ class InnerFunctionsSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -69,7 +68,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $error = 'The use of inner functions is forbidden';
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
index 1f53cafbfc..73b1506d3b 100644
--- a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
@@ -32,7 +32,6 @@ public function __construct()
 
         $allFunctions           = get_defined_functions();
         $this->builtInFunctions = array_flip($allFunctions['internal']);
-
     }
 
 
@@ -47,7 +46,6 @@ public function register()
             T_STRING,
             T_NAME_FULLY_QUALIFIED,
         ];
-
     }
 
 
@@ -154,7 +152,6 @@ public function process(File $phpcsFile, int $stackPtr)
         if ($fix === true) {
             $phpcsFile->fixer->replaceToken($stackPtr, strtolower($tokens[$stackPtr]['content']));
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
index 90a4190b5f..7a2462cf35 100644
--- a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
@@ -48,7 +48,6 @@ public function register()
             T_EXIT,
             T_GOTO,
         ];
-
     }
 
 
@@ -296,7 +295,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $lastLine = $line;
             }
         }//end for
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
index b709a3aaa0..f173ce04c4 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
@@ -25,7 +25,6 @@ class MemberVarScopeSniff extends AbstractVariableSniff
     public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
-
     }
 
 
@@ -60,7 +59,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $data  = [$tokens[$stackPtr]['content']];
             $phpcsFile->addError($error, $stackPtr, 'AsymReadMissing', $data);
         }
-
     }
 
 
@@ -74,10 +72,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
      */
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // We don't care about normal variables.
     }
 
 
@@ -91,10 +86,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
      */
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // 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 9f5fc9fa59..5875c468f7 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
@@ -23,7 +23,6 @@ class MethodScopeSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct(Tokens::OO_SCOPE_TOKENS, [T_FUNCTION]);
-
     }
 
 
@@ -60,7 +59,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
             $data  = [$methodName];
             $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
         }
-
     }
 
 
@@ -76,7 +74,6 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
index 68929ffbec..39d01937d7 100644
--- a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
@@ -23,7 +23,6 @@ class StaticThisUsageSniff extends AbstractScopeSniff
     public function __construct()
     {
         parent::__construct([T_CLASS, T_TRAIT, T_ENUM, T_ANON_CLASS], [T_FUNCTION]);
-
     }
 
 
@@ -69,7 +68,6 @@ public function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $cur
         $end  = $tokens[$stackPtr]['scope_closer'];
 
         $this->checkThisUsage($phpcsFile, $next, $end);
-
     }
 
 
@@ -105,7 +103,6 @@ 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);
-
     }
 
 
@@ -121,7 +118,6 @@ private function checkThisUsage(File $phpcsFile, int $next, int $end)
      */
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
index c83bbcfa1c..ea8f64303c 100644
--- a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
@@ -39,7 +39,6 @@ class ConcatenationSpacingSniff implements Sniff
     public function register()
     {
         return [T_STRING_CONCAT];
-
     }
 
 
@@ -157,7 +156,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
index a94b15c035..4a404ae38d 100644
--- a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
@@ -53,7 +53,6 @@ public function register()
             T_CONSTANT_ENCAPSED_STRING,
             T_DOUBLE_QUOTED_STRING,
         ];
-
     }
 
 
@@ -142,7 +141,6 @@ public function process(File $phpcsFile, int $stackPtr)
         }
 
         return $skipTo;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
index 94c730bc86..b539282b69 100644
--- a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
@@ -25,7 +25,6 @@ class EchoedStringsSniff implements Sniff
     public function register()
     {
         return [T_ECHO];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
index 487e11cb85..07fd0d4083 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
@@ -25,7 +25,6 @@ class CastSpacingSniff implements Sniff
     public function register()
     {
         return Tokens::CAST_TOKENS;
-
     }
 
 
@@ -58,7 +57,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->replaceToken($stackPtr, $expected);
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index f59c962c94..9d068b74a7 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -38,7 +38,6 @@ public function register()
             T_FINALLY,
             T_MATCH,
         ];
-
     }
 
 
@@ -342,7 +341,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
index 735b5171b2..8f8faecbf2 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -127,7 +126,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }//end if
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
index 05a329bd88..b8b44e37fd 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
@@ -27,7 +27,6 @@ public function register()
             T_FUNCTION,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -81,7 +80,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 $phpcsFile->fixer->endChangeset();
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
index c9738da102..d676836ec6 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
@@ -53,7 +53,6 @@ class FunctionSpacingSniff implements Sniff
     public function register()
     {
         return [T_FUNCTION];
-
     }
 
 
@@ -369,7 +368,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }//end if
             }//end if
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
index 0f6eeb8faf..4550a1b744 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
@@ -25,7 +25,6 @@ class LogicalOperatorSpacingSniff implements Sniff
     public function register()
     {
         return Tokens::BOOLEAN_OPERATORS;
-
     }
 
 
@@ -85,7 +84,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
index c5aa0fc1c9..8cdab342b7 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
@@ -38,7 +38,6 @@ class MemberVarSpacingSniff extends AbstractVariableSniff
     public function __construct()
     {
         AbstractScopeSniff::__construct(Tokens::OO_SCOPE_TOKENS, [T_VARIABLE], false);
-
     }
 
 
@@ -228,7 +227,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
         if ($endOfStatement !== false) {
             return $endOfStatement;
         }
-
     }
 
 
@@ -242,10 +240,7 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
      */
     protected function processVariable(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // We don't care about normal variables.
     }
 
 
@@ -259,10 +254,7 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
      */
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
-        /*
-            We don't care about normal variables.
-        */
-
+        // 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 01b399861e..7929837fa2 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -35,7 +35,6 @@ public function register()
             T_DOUBLE_COLON,
             T_NULLSAFE_OBJECT_OPERATOR,
         ];
-
     }
 
 
@@ -82,7 +81,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->recordMetric($stackPtr, 'Spacing after object operator', $after);
         $this->checkSpacingAfterOperator($phpcsFile, $stackPtr, $after);
-
     }
 
 
@@ -121,7 +119,6 @@ protected function checkSpacingBeforeOperator(File $phpcsFile, int $stackPtr, $b
         }
 
         return true;
-
     }
 
 
@@ -160,7 +157,6 @@ protected function checkSpacingAfterOperator(File $phpcsFile, int $stackPtr, $af
         }
 
         return true;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index 8dda6065ab..b84c2f139a 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -108,7 +108,6 @@ public function register()
         $targets[] = T_DECLARE;
 
         return $targets;
-
     }
 
 
@@ -326,7 +325,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }//end if
         }//end if
-
     }
 
 
@@ -392,7 +390,6 @@ protected function isOperator(File $phpcsFile, int $stackPtr)
         }//end if
 
         return true;
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index 735c84d8b5..9ceb6dbb5b 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -25,7 +25,6 @@ class ScopeClosingBraceSniff implements Sniff
     public function register()
     {
         return Tokens::SCOPE_OPENERS;
-
     }
 
 
@@ -107,7 +106,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
index 4f74630fba..870d69754c 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -28,7 +28,6 @@ public function register()
         $register += Tokens::SCOPE_MODIFIERS;
         $register[T_READONLY] = T_READONLY;
         return $register;
-
     }
 
 
@@ -165,7 +164,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }//end if
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
index 3ba56dd40e..a3f64b69e2 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
@@ -25,7 +25,6 @@ class SemicolonSpacingSniff implements Sniff
     public function register()
     {
         return [T_SEMICOLON];
-
     }
 
 
@@ -99,7 +98,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
             $phpcsFile->fixer->endChangeset();
         }
-
     }
 
 
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
index 60406a6b3a..e4f724943e 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
@@ -45,7 +45,6 @@ public function register()
             T_DOC_COMMENT_WHITESPACE,
             T_CLOSURE,
         ];
-
     }
 
 
@@ -207,7 +206,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }//end if
         }//end if
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
index 59deb6d492..bdf3a92b31 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
@@ -40,7 +40,6 @@ public function getErrorList()
             30 => 1,
             31 => 2,
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
index 930ea89741..e4085c8c29 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
@@ -240,7 +240,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -255,7 +254,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
index fc7203e555..f02eda9c3f 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
@@ -71,7 +71,6 @@ public function getErrorList()
             132 => 1,
             141 => 1,
         ];
-
     }
 
 
@@ -86,7 +85,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
index 89ea9d6255..2fd95f5e45 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
@@ -57,7 +57,6 @@ protected function getTestFiles(string $testFileBase)
         sort($testFiles, SORT_NATURAL);
 
         return $testFiles;
-
     }
 
 
@@ -124,7 +123,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -139,7 +137,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
index 2f6acecb34..88b21b6dd4 100644
--- a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
@@ -47,7 +47,6 @@ public function getErrorList()
         ];
 
         return $errors;
-
     }
 
 
@@ -62,7 +61,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
index 1d2c018cdc..51b4aa15f1 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
@@ -48,7 +48,6 @@ public function getErrorList()
             183 => 1,
             197 => 1,
         ];
-
     }
 
 
@@ -63,7 +62,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
index 4a2c51c011..df4c70248b 100644
--- a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
@@ -61,7 +61,6 @@ public function getErrorList()
             197 => 1,
             200 => 1,
         ];
-
     }
 
 
@@ -76,7 +75,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
index 68a6b19263..1682fe4f12 100644
--- a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
@@ -32,7 +32,6 @@ final class BlockCommentUnitTest extends AbstractSniffTestCase
     public function setCliValues(string $testFile, Config $config)
     {
         $config->tabWidth = 4;
-
     }
 
 
@@ -88,7 +87,6 @@ public function getErrorList()
         ];
 
         return $errors;
-
     }
 
 
@@ -103,7 +101,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
index 767e60bfbc..cb35732cc9 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -80,7 +79,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
index 2de54e880b..f1e71a8dc5 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
@@ -62,7 +62,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -79,7 +78,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
index d774016754..fc92fc877c 100644
--- a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
@@ -68,7 +68,6 @@ public function getErrorList()
             143 => 1,
             144 => 1,
         ];
-
     }
 
 
@@ -83,7 +82,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
index 628e67856c..d31330a786 100644
--- a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             51 => 1,
             52 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
index acb771c3db..0fdced18fd 100644
--- a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
@@ -59,7 +59,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -74,7 +73,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
index ad90c3bc66..6908843406 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList()
             519 => 1,
             530 => 1,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
index 6fff52fcf4..e8219e4cfc 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
@@ -183,7 +183,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -198,7 +197,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
index 07849eacd5..c045d7dcde 100644
--- a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
@@ -50,7 +50,6 @@ public function getErrorList()
             149 => 1,
             189 => 1,
         ];
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
index 8a3c310993..9aab59bec2 100644
--- a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
@@ -61,7 +61,6 @@ public function getErrorList()
             1008 => 1,
             1032 => 1,
         ];
-
     }
 
 
@@ -76,7 +75,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
index 912064dc87..74fc7f961f 100644
--- a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
@@ -43,7 +43,6 @@ public function getErrorList()
             63 => 1,
             64 => 1,
         ];
-
     }
 
 
@@ -58,7 +57,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
index ec4f14eb3a..c185a7c66a 100644
--- a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
@@ -67,7 +67,6 @@ public function getErrorList()
             403 => 1,
             457 => 1,
         ];
-
     }
 
 
@@ -87,7 +86,6 @@ public function getWarningList()
             495 => 1,
             496 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
index 793a7498aa..c42dc5fe7d 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -89,7 +89,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -104,7 +103,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
index 3173633074..463f909f53 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             8  => 1,
             13 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
index e8ad4af205..6d939ca365 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
@@ -39,7 +39,6 @@ public function getErrorList()
             26 => 2,
             28 => 2,
         ];
-
     }
 
 
@@ -54,7 +53,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
index bf011f3bc2..b70b130751 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
@@ -70,7 +70,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -87,7 +86,6 @@ public function getErrorList($testFile = '')
     public function getWarningList($testFile = '')
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
index 27e7717d55..a70a62aafa 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
@@ -30,7 +30,6 @@ final class InlineIfDeclarationUnitTest extends AbstractSniffTestCase
     public function getCliValues($testFile)
     {
         return ['--encoding=utf-8'];
-
     }
 
 
@@ -58,7 +57,6 @@ public function getErrorList()
             44 => 1,
             47 => 1,
         ];
-
     }
 
 
@@ -73,7 +71,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
index 3337cdee3a..b741d1424a 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList()
             21 => 1,
             24 => 1,
         ];
-
     }
 
 
@@ -59,7 +58,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
index d575b37f29..c4d43e3e73 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -79,7 +79,6 @@ public function getErrorList()
             339 => 2,
             342 => 1,
         ];
-
     }
 
 
@@ -94,7 +93,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
index e197c1497d..539e859f89 100644
--- a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
index 07d61317d4..af2ba1a797 100644
--- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
+++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
@@ -82,7 +82,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -97,7 +96,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
index a9592cfe5f..4e6be93d49 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
@@ -106,7 +106,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -121,7 +120,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
index a548ce1a6e..14eda4f255 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
index 7d652c87a4..aa73bac96e 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             4 => 2,
             5 => 1,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
index ea4183c74e..08469e8cb6 100644
--- a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
@@ -31,7 +31,6 @@ final class GlobalFunctionUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -54,7 +53,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
index 764b68f76f..d89dfa8009 100644
--- a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
@@ -41,7 +41,6 @@ public function getErrorList()
             25 => 4,
             28 => 1,
         ];
-
     }
 
 
@@ -56,7 +55,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
index 812a4a6a4b..e22eb7f108 100644
--- a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
@@ -75,7 +75,6 @@ public function getErrorList()
             318 => 1,
             323 => 1,
         ];
-
     }
 
 
@@ -90,7 +89,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 58fe2ebcaf..2c5fdb1987 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -50,7 +50,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -65,7 +64,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 68afb3a57b..958730948b 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -81,7 +81,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -96,7 +95,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
index 1aa8014d3c..b1600f0696 100644
--- a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             31 => 1,
             39 => 2,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
index 3a95ab69a3..b0631a690e 100644
--- a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
@@ -65,7 +65,6 @@ public function getErrorList()
             148 => 1,
             156 => 2,
         ];
-
     }
 
 
@@ -80,7 +79,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
index 7e4e9429fb..f78fb0adb5 100644
--- a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList()
             55 => 1,
             56 => 1,
         ];
-
     }
 
 
@@ -66,7 +65,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
index 345a2f4929..6d52251e42 100644
--- a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             11 => 1,
             17 => 2,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
index 13485d6822..2a9dffb61d 100644
--- a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
@@ -31,7 +31,6 @@ final class CommentedOutCodeUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -59,7 +58,6 @@ public function getWarningList()
             147 => 1,
             158 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
index 4f082c99f0..4cd43d4078 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             13 => 1,
             15 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
index ff07f247a2..236e7303fc 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList()
             58 => 1,
             62 => 1,
         ];
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
index 00151ac57c..9f0d71592d 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             8  => 1,
             18 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
index a2a343867b..0ef78be8b3 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
@@ -49,7 +49,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -64,7 +63,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
index c6fb94060f..c302c7f39e 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
@@ -47,7 +47,6 @@ public function getErrorList()
             61 => 1,
             63 => 1,
         ];
-
     }
 
 
@@ -62,7 +61,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
index adf3a13de4..b8c9315cc3 100644
--- a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
@@ -31,7 +31,6 @@ final class DiscouragedFunctionsUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getWarningList()
             3 => 1,
             4 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
index d4fd938f74..a582971bf4 100644
--- a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
@@ -219,7 +219,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -243,7 +242,6 @@ public function getWarningList($testFile = '')
         }
 
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
index ea9747ae61..2b9a9512af 100644
--- a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
@@ -31,7 +31,6 @@ final class EvalUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getWarningList()
             2 => 1,
             4 => 1,
         ];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
index 571397dd3b..f48266899f 100644
--- a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
@@ -34,7 +34,6 @@ public function getErrorList()
             8 => 1,
             9 => 1,
         ];
-
     }
 
 
@@ -49,7 +48,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
index 8842d5cf14..4d4640848a 100644
--- a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
index 98993940a2..eb02e73003 100644
--- a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
@@ -36,7 +36,6 @@ public function getErrorList()
             55 => 1,
             83 => 1,
         ];
-
     }
 
 
@@ -51,7 +50,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
index a59de4c4bf..9d120bafbe 100644
--- a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             35 => 1,
             36 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
index f9c1d5f220..075f0f523a 100644
--- a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
@@ -31,7 +31,6 @@ final class NonExecutableCodeUnitTest extends AbstractSniffTestCase
     public function getErrorList()
     {
         return [];
-
     }
 
 
@@ -119,7 +118,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
index f6297af621..dd586beb5e 100644
--- a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
@@ -54,7 +54,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -69,7 +68,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
index b03d6a1184..4e238cf912 100644
--- a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -59,7 +58,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
index 24f21d8617..c8d92cf9f5 100644
--- a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList()
             99  => 1,
             125 => 1,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
index 702493fff2..67c489627d 100644
--- a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
@@ -49,7 +49,6 @@ public function getErrorList()
             47 => 2,
             49 => 1,
         ];
-
     }
 
 
@@ -64,7 +63,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
index ddbb164d62..e8afe135fb 100644
--- a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
@@ -45,7 +45,6 @@ public function getErrorList()
             30 => 1,
             32 => 1,
         ];
-
     }
 
 
@@ -60,7 +59,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
index ebb39d39ae..7b2a04178e 100644
--- a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
@@ -38,7 +38,6 @@ public function getErrorList()
             9  => 1,
             13 => 1,
         ];
-
     }
 
 
@@ -53,7 +52,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
index a12a77852a..4fcc324d9a 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
@@ -37,7 +37,6 @@ public function getErrorList()
             6 => 1,
             9 => 1,
         ];
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index abb182a3e2..b21ddca15f 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -62,7 +62,6 @@ public function getErrorList()
             261 => 1,
             262 => 1,
         ];
-
     }
 
 
@@ -77,7 +76,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
index 6cb62132ee..9a8c397065 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList()
             81 => 1,
             88 => 1,
         ];
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
index 9c2c6045f8..a3e36d725e 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
@@ -35,7 +35,6 @@ public function getErrorList()
             25 => 1,
             49 => 1,
         ];
-
     }
 
 
@@ -50,7 +49,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
index 111d13d24a..a4d0ea59d5 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
@@ -128,7 +128,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -143,7 +142,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
index 8b415abd8a..ed9c1f63f9 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
@@ -37,7 +37,6 @@ public function getErrorList()
             15 => 1,
             17 => 1,
         ];
-
     }
 
 
@@ -52,7 +51,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
index fec7cb70d6..2bb3919291 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
@@ -98,7 +98,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -113,7 +112,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
index 4f0c9c64ed..0065704836 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -51,7 +51,6 @@ public function getErrorList()
             51 => 1,
             52 => 2,
         ];
-
     }
 
 
@@ -66,7 +65,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index 1c708e87c7..b90a5542f1 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -115,7 +115,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -130,7 +129,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
index 282d54f81c..1253cf85db 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -42,7 +42,6 @@ public function getErrorList()
             130 => 1,
             134 => 1,
         ];
-
     }
 
 
@@ -57,7 +56,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
index 61c248bd8f..6b435bcddd 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
@@ -82,7 +82,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -97,7 +96,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
index b5da9e1376..5dca79318b 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
@@ -44,7 +44,6 @@ public function getErrorList()
             30 => 2,
             36 => 1,
         ];
-
     }
 
 
@@ -59,7 +58,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
index 270294a0b8..f3c5ac1eff 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
@@ -72,7 +72,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -87,7 +86,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
index 73c2762a84..90dd7e0a41 100644
--- a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
@@ -25,7 +25,6 @@ class ClosingTagSniff implements Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
 
@@ -72,7 +71,6 @@ public function process(File $phpcsFile, int $stackPtr)
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
-
     }
 
 
diff --git a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 630af3d084..7c909567d6 100644
--- a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -100,7 +100,6 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
             $data    = [$originalVarName];
             $phpcsFile->addWarning($warning, $stackPtr, 'ContainsNumbers', $data);
         }
-
     }
 
 
@@ -156,7 +155,6 @@ protected function processMemberVar(File $phpcsFile, int $stackPtr)
             $data    = [$varName];
             $phpcsFile->addWarning($warning, $stackPtr, 'MemberVarContainsNumbers', $data);
         }
-
     }
 
 
@@ -191,7 +189,6 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
                 }
             }//end foreach
         }//end if
-
     }
 
 
diff --git a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
index c780e73227..79bb9da00d 100644
--- a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
@@ -48,7 +48,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }
-
     }
 
 
@@ -63,7 +62,6 @@ public function getErrorList($testFile = '')
     public function getWarningList()
     {
         return [];
-
     }
 
 
diff --git a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 853a7987c0..b9ac17f935 100644
--- a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -76,7 +76,6 @@ public function getErrorList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
@@ -115,7 +114,6 @@ public function getWarningList($testFile = '')
         default:
             return [];
         }//end switch
-
     }
 
 
diff --git a/src/Tokenizers/Comment.php b/src/Tokenizers/Comment.php
index fe88a41ea5..9bf804a7d9 100644
--- a/src/Tokenizers/Comment.php
+++ b/src/Tokenizers/Comment.php
@@ -174,7 +174,6 @@ public function tokenizeString(string $comment, string $eolChar, int $stackPtr)
         }
 
         return $tokens;
-
     }
 
 
@@ -250,7 +249,6 @@ private function processLine(string $comment, string $eolChar, int $start, int $
         }
 
         return $tokens;
-
     }
 
 
@@ -283,7 +281,6 @@ private function collectWhitespace(string $comment, int $start, int $end)
             'code'    => T_DOC_COMMENT_WHITESPACE,
             'type'    => 'T_DOC_COMMENT_WHITESPACE',
         ];
-
     }
 
 
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
index f3eb04973f..936b059aaa 100644
--- a/src/Tokenizers/PHP.php
+++ b/src/Tokenizers/PHP.php
@@ -2755,7 +2755,6 @@ function return types. We want to keep the parenthesis map clean,
         }
 
         return $finalTokens;
-
     }
 
 
@@ -3754,7 +3753,6 @@ protected function processAdditional()
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             StatusWriter::write('*** END ADDITIONAL PHP PROCESSING ***', 1);
         }
-
     }
 
 
@@ -3832,7 +3830,6 @@ public static function standardiseToken($token)
 
         $newToken['content'] = $token[1];
         return $newToken;
-
     }
 
 
@@ -3940,7 +3937,6 @@ public static function resolveSimpleToken(string $token)
 
         self::$resolveTokenCache[$token] = $newToken;
         return $newToken;
-
     }
 
 
@@ -3977,7 +3973,6 @@ private function findCloser(array &$tokens, int $start, $openerTokens, string $c
         }
 
         return $closer;
-
     }
 
 
@@ -4040,7 +4035,6 @@ private function parsePhpAttribute(array &$tokens, int $stackPtr)
         }
 
         return $subTokens;
-
     }
 
 
@@ -4077,7 +4071,6 @@ private function createAttributesNestingMap()
                 }
             }//end if
         }//end for
-
     }
 
 
diff --git a/src/Tokenizers/Tokenizer.php b/src/Tokenizers/Tokenizer.php
index 8fe02f3981..8fb54a0c4a 100644
--- a/src/Tokenizers/Tokenizer.php
+++ b/src/Tokenizers/Tokenizer.php
@@ -128,7 +128,6 @@ public function __construct(string $content, ?Config $config, string $eolChar =
 
         // Allow the tokenizer to do additional processing if required.
         $this->processAdditional();
-
     }
 
 
@@ -152,7 +151,6 @@ protected function isMinifiedContent(string $content, string $eolChar = '\n')
         }
 
         return false;
-
     }
 
 
@@ -164,7 +162,6 @@ protected function isMinifiedContent(string $content, string $eolChar = '\n')
     public function getTokens()
     {
         return $this->tokens;
-
     }
 
 
@@ -482,7 +479,6 @@ private function createPositionMap()
         if ($checkAnnotations === false) {
             $this->ignoredLines = [];
         }
-
     }
 
 
@@ -572,7 +568,6 @@ public function replaceTabsInToken(array &$token, string $prefix = ' ', string $
         $token['orig_content'] = $token['content'];
         $token['content']      = $newContent;
         $token['length']       = $length;
-
     }
 
 
@@ -749,7 +744,6 @@ private function createTokenMap()
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             StatusWriter::write('*** END TOKEN MAP ***', 1);
         }
-
     }
 
 
@@ -786,7 +780,6 @@ private function createParenthesisNestingMap()
                 }
             }//end if
         }//end for
-
     }
 
 
@@ -826,7 +819,6 @@ private function createScopeMap()
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             StatusWriter::write('*** END SCOPE MAP ***', 1);
         }
-
     }
 
 
@@ -1356,7 +1348,6 @@ private function recurseScopeMap(int $stackPtr, int $depth = 1, int &$ignore = 0
         }//end for
 
         return $stackPtr;
-
     }
 
 
@@ -1584,7 +1575,6 @@ private function createLevelMap()
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             StatusWriter::write('*** END LEVEL MAP ***', 1);
         }
-
     }
 
 
diff --git a/src/Util/Cache.php b/src/Util/Cache.php
index 333c4454e8..3560b40028 100644
--- a/src/Util/Cache.php
+++ b/src/Util/Cache.php
@@ -283,7 +283,6 @@ static function ($file, $key, $iterator) {
         }
 
         self::$cache['config'] = $configData;
-
     }
 
 
@@ -295,7 +294,6 @@ static function ($file, $key, $iterator) {
     public static function save()
     {
         file_put_contents(self::$path, json_encode(self::$cache));
-
     }
 
 
@@ -318,7 +316,6 @@ public static function get(?string $key = null)
         }
 
         return false;
-
     }
 
 
@@ -338,7 +335,6 @@ public static function set(?string $key, $value)
         } else {
             self::$cache[$key] = $value;
         }
-
     }
 
 
@@ -350,7 +346,6 @@ public static function set(?string $key, $value)
     public static function getSize()
     {
         return (count(self::$cache) - 1);
-
     }
 
 
diff --git a/src/Util/Common.php b/src/Util/Common.php
index 20b15c6e50..7d436788b4 100644
--- a/src/Util/Common.php
+++ b/src/Util/Common.php
@@ -56,7 +56,6 @@ public static function isPharFile(string $path)
         }
 
         return false;
-
     }
 
 
@@ -84,7 +83,6 @@ public static function isReadable(string $path)
         }
 
         return false;
-
     }
 
 
@@ -137,7 +135,6 @@ public static function realpath(string $path)
         }
 
         return false;
-
     }
 
 
@@ -167,7 +164,6 @@ public static function stripBasepath(string $path, ?string $basepath)
         }
 
         return $path;
-
     }
 
 
@@ -188,7 +184,6 @@ public static function detectLineEndings(string $contents)
         }
 
         return $eolChar;
-
     }
 
 
@@ -247,7 +242,6 @@ public static function isStdinATTY()
         $isTTY = ($mode !== $type['S_IFIFO']);
 
         return $isTTY;
-
     }
 
 
@@ -269,7 +263,6 @@ public static function escapeshellcmd(string $cmd)
         }
 
         return $cmd;
-
     }
 
 
@@ -318,7 +311,6 @@ public static function prepareForOutput(string $content, array $exclude = [])
         }//end if
 
         return $content;
-
     }
 
 
@@ -332,7 +324,6 @@ public static function prepareForOutput(string $content, array $exclude = [])
     public static function stripColors(string $text)
     {
         return preg_replace('`\033\[[0-9;]+m`', '', $text);
-
     }
 
 
@@ -417,7 +408,6 @@ public static function isCamelCaps(
         }//end if
 
         return true;
-
     }
 
 
@@ -455,7 +445,6 @@ public static function isUnderscoreName(string $name)
         }
 
         return $validName;
-
     }
 
 
@@ -529,7 +518,6 @@ public static function suggestType(string $varType)
                 return $varType;
             }//end if
         }//end if
-
     }
 
 
@@ -578,7 +566,6 @@ public static function getSniffCode($sniffClass)
         $standard = $parts[($partsCount - 4)];
         $category = $parts[($partsCount - 2)];
         return $standard . '.' . $category . '.' . $sniff;
-
     }
 
 
@@ -609,7 +596,6 @@ public static function cleanSniffClass(string $sniffClass)
 
         $newName = substr($newName, ($start + 1));
         return $newName;
-
     }
 
 
diff --git a/src/Util/ExitCode.php b/src/Util/ExitCode.php
index 6c69c6eefe..71744a4495 100644
--- a/src/Util/ExitCode.php
+++ b/src/Util/ExitCode.php
@@ -138,7 +138,6 @@ public static function calculate(Reporter $reporter)
         }
 
         return $exitCode;
-
     }
 
 
diff --git a/src/Util/Help.php b/src/Util/Help.php
index 2fc4ea5e23..8fe05943af 100644
--- a/src/Util/Help.php
+++ b/src/Util/Help.php
@@ -148,7 +148,6 @@ public function __construct(Config $config, array $longOptions, string $shortOpt
         $this->gutterWidth = strlen(self::GUTTER);
 
         $this->setMaxOptionNameLength();
-
     }
 
 
@@ -161,7 +160,6 @@ public function display()
     {
         $this->printUsage();
         $this->printCategories();
-
     }
 
 
@@ -211,7 +209,6 @@ private function filterOptions()
         }//end foreach
 
         $this->activeOptions = $filteredOptions;
-
     }
 
 
@@ -236,7 +233,6 @@ private function setMaxOptionNameLength()
         if (empty($lengths) === false) {
             $this->maxOptionNameLength = max($lengths);
         }
-
     }
 
 
@@ -251,7 +247,6 @@ private function setMaxOptionNameLength()
     private function getMaxWidth()
     {
         return max(self::MIN_WIDTH, $this->config->reportWidth);
-
     }
 
 
@@ -263,7 +258,6 @@ private function getMaxWidth()
     private function getDescriptionColumnWidth()
     {
         return ($this->getMaxWidth() - $this->maxOptionNameLength - $this->indentWidth - $this->gutterWidth);
-
     }
 
 
@@ -275,7 +269,6 @@ private function getDescriptionColumnWidth()
     private function getDescriptionFollowupLineIndentLength()
     {
         return ($this->maxOptionNameLength + $this->indentWidth + $this->gutterWidth);
-
     }
 
 
@@ -294,7 +287,6 @@ private function printUsage()
         $this->printCategoryHeader('Usage');
 
         echo self::INDENT . $command . ' [options] <file|directory>' . PHP_EOL;
-
     }
 
 
@@ -309,7 +301,6 @@ private function printCategories()
             $this->printCategoryHeader($category);
             $this->printCategoryOptions($options);
         }
-
     }
 
 
@@ -328,7 +319,6 @@ private function printCategoryHeader(string $header)
         }
 
         echo PHP_EOL . $header . PHP_EOL;
-
     }
 
 
@@ -372,7 +362,6 @@ private function printCategoryOptions(array $options)
         }
 
         echo $output;
-
     }
 
 
@@ -389,7 +378,6 @@ private function printCategoryOptions(array $options)
     private function colorizeVariableInput(string $text)
     {
         return preg_replace('`(<(?:(?>[^<>]+)|(?R))*>)`', "\033[36m" . '$1' . "\033[32m", $text);
-
     }
 
 
@@ -636,7 +624,6 @@ private function getAllOptions()
         // phpcs:enable
 
         return $options;
-
     }
 
 
diff --git a/src/Util/IgnoreList.php b/src/Util/IgnoreList.php
index 442f0e9ba4..4412ae1523 100644
--- a/src/Util/IgnoreList.php
+++ b/src/Util/IgnoreList.php
@@ -38,7 +38,6 @@ final class IgnoreList
      */
     private function __construct()
     {
-
     }
 
 
@@ -50,7 +49,6 @@ private function __construct()
     public static function getInstanceIgnoringNothing()
     {
         return new self();
-
     }
 
 
@@ -64,7 +62,6 @@ public static function getInstanceIgnoringAll()
         $instance = new self();
         $instance->data['.default'] = true;
         return $instance;
-
     }
 
 
@@ -84,7 +81,6 @@ public static function getNewInstanceFrom(?IgnoreList $ignoreList)
         }
 
         return clone $ignoreList;
-
     }
 
 
@@ -115,7 +111,6 @@ public function set(string $code, bool $ignore)
         $data[$part] = (bool) $ignore;
 
         return $this;
-
     }
 
 
@@ -147,7 +142,6 @@ public function isIgnored(string $code)
         }
 
         return $returnValue;
-
     }
 
 
@@ -173,7 +167,6 @@ public function ignoresNothing()
         }
 
         return true;
-
     }
 
 
@@ -199,7 +192,6 @@ public function ignoresEverything()
         }
 
         return true;
-
     }
 
 
diff --git a/src/Util/MessageCollector.php b/src/Util/MessageCollector.php
index 6e3fc3ea77..3a9c27d934 100644
--- a/src/Util/MessageCollector.php
+++ b/src/Util/MessageCollector.php
@@ -114,7 +114,6 @@ public function add($message, $type = self::NOTICE)
             'message' => $message,
             'type'    => $type,
         ];
-
     }
 
 
@@ -128,7 +127,6 @@ public function containsBlockingErrors()
         $seenTypes     = array_column($this->cache, 'type');
         $typeFrequency = array_count_values($seenTypes);
         return isset($typeFrequency[self::ERROR]);
-
     }
 
 
@@ -169,7 +167,6 @@ public function display(string $order = self::ORDERBY_SEVERITY)
         } else {
             StatusWriter::write($allMessages, 0, 2);
         }
-
     }
 
 
@@ -187,7 +184,6 @@ private function prefixAll(array $messages)
         }
 
         return $messages;
-
     }
 
 
@@ -220,7 +216,6 @@ private function prefix(string $message, int $type)
         }
 
         return $message;
-
     }
 
 
@@ -263,7 +258,6 @@ private function sortBySeverity(array $messages)
         }
 
         return array_merge($errors, $warnings, $notices, $deprecations);
-
     }
 
 
@@ -275,7 +269,6 @@ private function sortBySeverity(array $messages)
     private function clearCache()
     {
         $this->cache = [];
-
     }
 
 
diff --git a/src/Util/Standards.php b/src/Util/Standards.php
index ae3ed51b7b..663d0dfba2 100644
--- a/src/Util/Standards.php
+++ b/src/Util/Standards.php
@@ -46,7 +46,6 @@ public static function getInstalledStandardPaths()
         }
 
         return $resolvedInstalledPaths;
-
     }
 
 
@@ -144,7 +143,6 @@ public static function getInstalledStandardDetails(
         }//end foreach
 
         return $installedStandards;
-
     }
 
 
@@ -215,7 +213,6 @@ public static function getInstalledStandards(
         }//end foreach
 
         return $installedStandards;
-
     }
 
 
@@ -262,7 +259,6 @@ public static function isInstalledStandard(string $standard)
         }//end if
 
         return false;
-
     }
 
 
@@ -307,7 +303,6 @@ public static function getInstalledStandardPath(string $standard)
         }//end foreach
 
         return null;
-
     }
 
 
@@ -336,7 +331,6 @@ public static function prepareInstalledStandardsForDisplay()
         }
 
         return $output;
-
     }
 
 
@@ -350,7 +344,6 @@ public static function prepareInstalledStandardsForDisplay()
     public static function printInstalledStandards()
     {
         echo self::prepareInstalledStandardsForDisplay(), PHP_EOL;
-
     }
 
 
diff --git a/src/Util/Timing.php b/src/Util/Timing.php
index b35f944ebf..2dcbc6cd12 100644
--- a/src/Util/Timing.php
+++ b/src/Util/Timing.php
@@ -61,7 +61,6 @@ public static function startTiming()
     {
 
         self::$startTime = microtime(true);
-
     }
 
 
@@ -78,7 +77,6 @@ public static function getDuration()
         }
 
         return ((microtime(true) - self::$startTime) * 1000);
-
     }
 
 
@@ -92,7 +90,6 @@ public static function getDuration()
     public static function getDurationSince(float $startTime)
     {
         return ((microtime(true) - $startTime) * 1000);
-
     }
 
 
@@ -120,7 +117,6 @@ public static function getHumanReadableDuration(float $duration)
         }
 
         return $timeString;
-
     }
 
 
@@ -151,7 +147,6 @@ public static function printRunTime(bool $force = false)
         StatusWriter::write("Time: $duration; Memory: $mem");
 
         self::$printed = true;
-
     }
 
 
diff --git a/src/Util/Tokens.php b/src/Util/Tokens.php
index cc701fc113..7274768a75 100644
--- a/src/Util/Tokens.php
+++ b/src/Util/Tokens.php
@@ -942,7 +942,6 @@ public static function tokenName($token)
         }
 
         return substr($token, 6);
-
     }
 
 
@@ -984,7 +983,6 @@ public static function getHighestWeightedToken(array $tokens)
         }
 
         return $highestType;
-
     }
 
 
diff --git a/src/Util/Writers/StatusWriter.php b/src/Util/Writers/StatusWriter.php
index 54b7c3a210..e31b675224 100644
--- a/src/Util/Writers/StatusWriter.php
+++ b/src/Util/Writers/StatusWriter.php
@@ -67,7 +67,6 @@ public static function write(string $message, int $indent = 0, int $newlines = 1
         }
 
         self::forceWrite($message, $indent, $newlines);
-
     }
 
 
@@ -94,7 +93,6 @@ public static function forceWrite(string $message, int $indent = 0, int $newline
         }
 
         fwrite(self::$stream, $message);
-
     }
 
 
@@ -109,7 +107,6 @@ public static function forceWrite(string $message, int $indent = 0, int $newline
     public static function writeNewline(int $nr = 1)
     {
         self::write('', 0, $nr);
-
     }
 
 
@@ -124,7 +121,6 @@ public static function writeNewline(int $nr = 1)
     public static function forceWriteNewline(int $nr = 1)
     {
         self::forceWrite('', 0, $nr);
-
     }
 
 
@@ -137,7 +133,6 @@ public static function pause()
     {
         self::$paused = true;
         ++self::$pauseCount;
-
     }
 
 
@@ -155,7 +150,6 @@ public static function resume()
         if (self::$pauseCount === 0) {
             self::$paused = false;
         }
-
     }
 
 
@@ -167,7 +161,6 @@ public static function resume()
     public static function isPaused()
     {
         return self::$paused;
-
     }
 
 
diff --git a/tests/ConfigDouble.php b/tests/ConfigDouble.php
index 2765bc0e39..e8e34818c5 100644
--- a/tests/ConfigDouble.php
+++ b/tests/ConfigDouble.php
@@ -68,7 +68,6 @@ public function __construct(array $cliArgs = [], bool $skipSettingStandard = fal
         if ($skipSettingReportWidth !== true) {
             $this->preventAutoDiscoveryScreenWidth();
         }
-
     }
 
 
@@ -83,7 +82,6 @@ public function __destruct()
         $this->setStaticConfigProperty('executablePaths', []);
         $this->setStaticConfigProperty('configData', null);
         $this->setStaticConfigProperty('configDataFile', null);
-
     }
 
 
@@ -101,7 +99,6 @@ public function setCommandLineValues($args)
         if ($this->skipSettingStandard !== true) {
             $this->preventSearchingForRuleset();
         }
-
     }
 
 
@@ -113,7 +110,6 @@ public function setCommandLineValues($args)
     private function resetSelectProperties()
     {
         $this->setStaticConfigProperty('executablePaths', []);
-
     }
 
 
@@ -129,7 +125,6 @@ private function preventReadingCodeSnifferConfFile()
     {
         $this->setStaticConfigProperty('configData', []);
         $this->setStaticConfigProperty('configDataFile', '');
-
     }
 
 
@@ -153,7 +148,6 @@ private function preventSearchingForRuleset()
         }
 
         self::setStaticConfigProperty('overriddenDefaults', $overriddenDefaults);
-
     }
 
 
@@ -169,7 +163,6 @@ private function preventAutoDiscoveryScreenWidth()
         if ($settings['reportWidth'] === 'auto') {
             $this->reportWidth = self::DEFAULT_REPORT_WIDTH;
         }
-
     }
 
 
@@ -190,7 +183,6 @@ private function getStaticConfigProperty(string $name)
         }
 
         return $property->getValue();
-
     }
 
 
@@ -214,7 +206,6 @@ private function setStaticConfigProperty(string $name, $value)
         }
 
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
-
     }
 
 
diff --git a/tests/Core/AbstractMethodTestCase.php b/tests/Core/AbstractMethodTestCase.php
index d3cf4c5b02..b1e0e164ce 100644
--- a/tests/Core/AbstractMethodTestCase.php
+++ b/tests/Core/AbstractMethodTestCase.php
@@ -61,7 +61,6 @@ public static function setUpBeforeClass(): void
 
         self::$phpcsFile = new LocalFile($pathToTestFile, $ruleset, $config);
         self::$phpcsFile->parse();
-
     }
 
 
@@ -82,7 +81,6 @@ public static function tearDownAfterClass(): void
 
         self::$tabWidth  = 4;
         self::$phpcsFile = null;
-
     }
 
 
@@ -103,7 +101,6 @@ public static function tearDownAfterClass(): void
     public function testTestMarkersAreUnique()
     {
         $this->assertTestMarkersAreUnique(self::$phpcsFile);
-
     }
 
 
@@ -133,7 +130,6 @@ public static function assertTestMarkersAreUnique(File $phpcsFile)
         }
 
         self::assertSame(array_unique($seenComments), $seenComments, 'Duplicate test markers found.');
-
     }
 
 
@@ -152,7 +148,6 @@ public static function assertTestMarkersAreUnique(File $phpcsFile)
     public function getTargetToken($commentString, $tokenType, $tokenContent = null)
     {
         return self::getTargetTokenFromFile(self::$phpcsFile, $commentString, $tokenType, $tokenContent);
-
     }
 
 
@@ -222,7 +217,6 @@ public static function getTargetTokenFromFile(File $phpcsFile, $commentString, $
         }
 
         return $target;
-
     }
 
 
@@ -238,7 +232,6 @@ public function expectRunTimeException($message)
     {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($message);
-
     }
 
 
diff --git a/tests/Core/Autoloader/DetermineLoadedClassTest.php b/tests/Core/Autoloader/DetermineLoadedClassTest.php
index 0d04534d66..0df29af7f5 100644
--- a/tests/Core/Autoloader/DetermineLoadedClassTest.php
+++ b/tests/Core/Autoloader/DetermineLoadedClassTest.php
@@ -29,7 +29,6 @@ final class DetermineLoadedClassTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         include __DIR__ . '/TestFiles/Sub/C.inc';
-
     }
 
 
@@ -59,7 +58,6 @@ public function testOrdered()
 
         $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
-
     }
 
 
@@ -117,7 +115,6 @@ public function testUnordered()
 
         $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
-
     }
 
 
diff --git a/tests/Core/Config/AbstractRealConfigTestCase.php b/tests/Core/Config/AbstractRealConfigTestCase.php
index fb95e1b743..f45976ba12 100644
--- a/tests/Core/Config/AbstractRealConfigTestCase.php
+++ b/tests/Core/Config/AbstractRealConfigTestCase.php
@@ -32,7 +32,6 @@ protected function setUp(): void
         // from being read and influencing the tests.
         self::setStaticConfigProperty('configData', []);
         self::setStaticConfigProperty('configDataFile', '');
-
     }
 
 
@@ -44,7 +43,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $_SERVER['argv'] = [];
-
     }
 
 
@@ -60,7 +58,6 @@ public static function tearDownAfterClass(): void
         self::setStaticConfigProperty('configData', null);
         self::setStaticConfigProperty('configDataFile', null);
         $_SERVER['argv'] = [];
-
     }
 
 
@@ -78,7 +75,6 @@ protected static function setStaticConfigProperty($name, $value)
         (PHP_VERSION_ID < 80100) && $property->setAccessible(true);
         $property->setValue(null, $value);
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
-
     }
 
 
diff --git a/tests/Core/Config/ExtensionsArgTest.php b/tests/Core/Config/ExtensionsArgTest.php
index 340446603e..98e717c78e 100644
--- a/tests/Core/Config/ExtensionsArgTest.php
+++ b/tests/Core/Config/ExtensionsArgTest.php
@@ -36,7 +36,6 @@ public function testValidExtensions($passedValue, $expected)
         $config = new ConfigDouble(["--extensions=$passedValue"]);
 
         $this->assertSame($expected, $config->extensions);
-
     }
 
 
@@ -97,7 +96,6 @@ public static function dataValidExtensions()
                 ],
             ],
         ];
-
     }
 
 
@@ -116,7 +114,6 @@ public function testOnlySetOnce()
         );
 
         $this->assertSame(['php' => 'PHP'], $config->extensions);
-
     }
 
 
@@ -139,7 +136,6 @@ public function testInvalidExtensions($passedValue)
         $this->expectExceptionMessage($message);
 
         new ConfigDouble(["--extensions={$passedValue}"]);
-
     }
 
 
@@ -163,7 +159,6 @@ public static function dataInvalidExtensions()
                 'passedValue' => 'php,js/js,phpt/php',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Config/GeneratorArgTest.php b/tests/Core/Config/GeneratorArgTest.php
index d0042c8fa9..6d2515e2ed 100644
--- a/tests/Core/Config/GeneratorArgTest.php
+++ b/tests/Core/Config/GeneratorArgTest.php
@@ -31,7 +31,6 @@ protected function setUp(): void
         if (PHP_CODESNIFFER_CBF === true) {
             $this->markTestSkipped('This test needs CS mode to run');
         }
-
     }
 
 
@@ -50,7 +49,6 @@ public function testValidGenerators($argumentValue, $expectedPropertyValue)
         $config = new ConfigDouble(["--generator=$argumentValue"]);
 
         $this->assertSame($expectedPropertyValue, $config->generator);
-
     }
 
 
@@ -89,7 +87,6 @@ public static function dataValidGeneratorNames()
                 'expectedPropertyValue' => 'HTML',
             ],
         ];
-
     }
 
 
@@ -109,7 +106,6 @@ public function testOnlySetOnce()
         );
 
         $this->assertSame('Text', $config->generator);
-
     }
 
 
@@ -130,7 +126,6 @@ public function testInvalidGenerator($generatorName)
         $this->expectExceptionMessage($message);
 
         new ConfigDouble(["--generator={$generatorName}"]);
-
     }
 
 
@@ -148,7 +143,6 @@ public static function dataInvalidGeneratorNames()
             ['Text,HTML'],
             [''],
         ];
-
     }
 
 
diff --git a/tests/Core/Config/IniSetTest.php b/tests/Core/Config/IniSetTest.php
index 7103e7c1fd..482041facc 100644
--- a/tests/Core/Config/IniSetTest.php
+++ b/tests/Core/Config/IniSetTest.php
@@ -46,7 +46,6 @@ protected function tearDown(): void
         if (is_string($this->originalValue) === true) {
             @ini_set($this->currentOption, $this->originalValue);
         }
-
     }
 
 
@@ -66,7 +65,6 @@ public function testIniValueHandlingWhenValueIsAlreadyCorrect()
         new ConfigDouble(['-d', "{$this->currentOption}={$this->originalValue}"]);
 
         $this->assertSame($this->originalValue, ini_get($this->currentOption));
-
     }
 
 
@@ -96,7 +94,6 @@ public function testIniValueIsUpdatedToTrueWhenNoValuePassed()
         new ConfigDouble(['-d', $this->currentOption]);
 
         $this->assertSame($expected, ini_get($this->currentOption));
-
     }
 
 
@@ -126,7 +123,6 @@ public function testIniValueIsUpdated($option, $newValue, $alternativeValue)
         new ConfigDouble(['-d', "$option=$newValue"]);
 
         $this->assertSame($newValue, ini_get($option));
-
     }
 
 
@@ -145,7 +141,6 @@ public static function dataIniValueIsUpdated()
                 'alternativeValue' => '20',
             ],
         ];
-
     }
 
 
@@ -175,7 +170,6 @@ public function testIniValueIsUpdatedWhenOptionalBcmathExtensionIsAvailable()
         new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]);
 
         $this->assertSame($newValue, ini_get($this->currentOption));
-
     }
 
 
@@ -211,7 +205,6 @@ public function testIniValueIsUpdatedWhenOptionalSqllite3ExtensionIsAvailable()
         new ConfigDouble(['-d', "{$this->currentOption}=$newValue"]);
 
         $this->assertSame($newValue, ini_get($this->currentOption));
-
     }
 
 
@@ -237,7 +230,6 @@ 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');
-
     }
 
 
@@ -257,7 +249,6 @@ 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');
-
     }
 
 
@@ -286,7 +277,6 @@ public function testIniValueCannotBeUpdatedAtRuntime($option, $newValue, $altern
         }
 
         new ConfigDouble(['-d', "$option=$newValue"]);
-
     }
 
 
@@ -321,7 +311,6 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
                 'alternativeValue' => '300',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Config/IssueSquiz2675Test.php b/tests/Core/Config/IssueSquiz2675Test.php
index 61d5e687e0..58f234c9c1 100644
--- a/tests/Core/Config/IssueSquiz2675Test.php
+++ b/tests/Core/Config/IssueSquiz2675Test.php
@@ -36,7 +36,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Config/PrepareConfigDataForDisplayTest.php b/tests/Core/Config/PrepareConfigDataForDisplayTest.php
index dd557c168f..97a3c3236a 100644
--- a/tests/Core/Config/PrepareConfigDataForDisplayTest.php
+++ b/tests/Core/Config/PrepareConfigDataForDisplayTest.php
@@ -41,7 +41,6 @@ public function testPrepareConfigDataForDisplay($data, $expected)
         $actual = $config->prepareConfigDataForDisplay($data);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -95,7 +94,6 @@ public static function dataPrepareConfigDataForDisplay()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -110,7 +108,6 @@ public function testPrintConfigData()
 
         $config = new ConfigDouble();
         $config->printConfigData([]);
-
     }
 
 
diff --git a/tests/Core/Config/ReportArgsTest.php b/tests/Core/Config/ReportArgsTest.php
index ae46271b25..ccdf9b2001 100644
--- a/tests/Core/Config/ReportArgsTest.php
+++ b/tests/Core/Config/ReportArgsTest.php
@@ -36,7 +36,6 @@ public function testReportFileDoesNotSetReportsCs()
         $this->assertTrue(is_string($config->reportFile));
         $this->assertStringEndsWith('/report.txt', $config->reportFile);
         $this->assertSame(['full' => null], $config->reports);
-
     }
 
 
@@ -57,7 +56,6 @@ public function testReportFileDoesNotSetReportsCbf()
 
         $this->assertNull($config->reportFile);
         $this->assertSame(['full' => null], $config->reports);
-
     }
 
 
diff --git a/tests/Core/Config/ReportWidthTest.php b/tests/Core/Config/ReportWidthTest.php
index 0c35e67cd6..0dbbfff8f8 100644
--- a/tests/Core/Config/ReportWidthTest.php
+++ b/tests/Core/Config/ReportWidthTest.php
@@ -36,7 +36,6 @@ 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');
-
     }
 
 
@@ -62,7 +61,6 @@ 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');
-
     }
 
 
@@ -86,7 +84,6 @@ public function testReportWidthCanBeSetFromConfFile()
 
         $config = new Config(['--standard=PSR1']);
         $this->assertSame(120, $config->reportWidth);
-
     }
 
 
@@ -108,7 +105,6 @@ public function testReportWidthCanBeSetFromCLI()
 
         $config = new Config();
         $this->assertSame(100, $config->reportWidth);
-
     }
 
 
@@ -131,7 +127,6 @@ public function testReportWidthWhenSetFromCLIFirstValuePrevails()
 
         $config = new Config();
         $this->assertSame(100, $config->reportWidth);
-
     }
 
 
@@ -164,7 +159,6 @@ public function testReportWidthSetFromCLIOverrulesConfFile()
 
         $config = new Config($cliArgs);
         $this->assertSame(180, $config->reportWidth);
-
     }
 
 
@@ -183,7 +177,6 @@ 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');
-
     }
 
 
@@ -204,7 +197,6 @@ public function testReportWidthInputHandling($value, $expected)
         $config->reportWidth = $value;
 
         $this->assertSame($expected, $config->reportWidth);
-
     }
 
 
@@ -253,7 +245,6 @@ public static function dataReportWidthInputHandling()
                 'expected' => 180,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Config/SniffsExcludeArgsTest.php b/tests/Core/Config/SniffsExcludeArgsTest.php
index 59cd61e2df..54623175e0 100644
--- a/tests/Core/Config/SniffsExcludeArgsTest.php
+++ b/tests/Core/Config/SniffsExcludeArgsTest.php
@@ -59,7 +59,6 @@ public function testInvalid($argument, $value, $errors, $suggestion)
         $this->expectExceptionMessage($message);
 
         new ConfigDouble(["--$argument=$value"]);
-
     }
 
 
@@ -195,7 +194,6 @@ public static function dataInvalid()
         }//end foreach
 
         return $data;
-
     }
 
 
@@ -214,7 +212,6 @@ public function testValid($argument, $value, $result)
         $config = new ConfigDouble(["--$argument=$value"]);
 
         $this->assertSame($result, $config->$argument);
-
     }
 
 
@@ -276,7 +273,6 @@ public static function dataValid()
         }//end foreach
 
         return $data;
-
     }
 
 
@@ -299,7 +295,6 @@ public function testOnlySetOnce($argument)
         );
 
         $this->assertSame(['StandardOne.Category.Sniff'], $config->$argument);
-
     }
 
 
@@ -314,7 +309,6 @@ public static function dataOnlySetOnce()
             'sniffs'  => ['sniffs'],
             'exclude' => ['exclude'],
         ];
-
     }
 
 
diff --git a/tests/Core/ErrorSuppressionTest.php b/tests/Core/ErrorSuppressionTest.php
index b6266a0802..7a2c4c38be 100644
--- a/tests/Core/ErrorSuppressionTest.php
+++ b/tests/Core/ErrorSuppressionTest.php
@@ -54,7 +54,6 @@ public function testSuppressError($before, $after, $expectedErrors = 0)
 
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
-
     }
 
 
@@ -134,7 +133,6 @@ public static function dataSuppressError()
                 'after'  => '/** phpcs:enable */',
             ],
         ];
-
     }
 
 
@@ -174,7 +172,6 @@ public function testSuppressSomeErrors($before, $between, $expectedErrors = 1)
 
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
-
     }
 
 
@@ -216,7 +213,6 @@ public static function dataSuppressSomeErrors()
                 'between' => '/** phpcs:enable */',
             ],
         ];
-
     }
 
 
@@ -255,7 +251,6 @@ public function testSuppressWarning($before, $after, $expectedWarnings = 0)
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -289,7 +284,6 @@ public static function dataSuppressWarning()
                 'after'  => '/** phpcs:enable */',
             ],
         ];
-
     }
 
 
@@ -329,7 +323,6 @@ public function testSuppressLine($before, $after = '', $expectedErrors = 1)
 
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
-
     }
 
 
@@ -387,7 +380,6 @@ public static function dataSuppressLine()
                 'after'  => ' # @phpcs:ignore',
             ],
         ];
-
     }
 
 
@@ -410,7 +402,6 @@ public function testSuppressLineMidLine()
 
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
-
     }
 
 
@@ -442,7 +433,6 @@ public function testSuppressLineWithinDocblock()
 
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
-
     }
 
 
@@ -480,7 +470,6 @@ public function testNestedSuppressLine($before, $after)
 
         $this->assertSame(0, $file->getErrorCount());
         $this->assertCount(0, $file->getErrors());
-
     }
 
 
@@ -522,7 +511,6 @@ public static function dataNestedSuppressLine()
                 'after'  => '# @phpcs:enable',
             ],
         ];
-
     }
 
 
@@ -565,7 +553,6 @@ function myFunction() {
 
         $this->assertSame($expectedErrors, $file->getErrorCount());
         $this->assertCount($expectedErrors, $file->getErrors());
-
     }
 
 
@@ -607,7 +594,6 @@ public static function dataSuppressScope()
                 'after'  => '/** @phpcs:enable */',
             ],
         ];
-
     }
 
 
@@ -649,7 +635,6 @@ class MyClass {}
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -701,7 +686,6 @@ public static function dataSuppressFile()
                 'after'  => '// phpcs:ignoreFile',
             ],
         ];
-
     }
 
 
@@ -747,7 +731,6 @@ public function testDisableSelected($before, $expectedErrors = 0, $expectedWarni
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -820,7 +803,6 @@ public static function dataDisableSelected()
                 'expectedWarnings' => 1,
             ],
         ];
-
     }
 
 
@@ -859,7 +841,6 @@ public function testEnableSelected($code, $expectedErrors, $expectedWarnings)
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -1068,7 +1049,6 @@ public static function dataEnableSelected()
                 'expectedWarnings' => 0,
             ],
         ];
-
     }
 
 
@@ -1112,7 +1092,6 @@ public function testIgnoreSelected($before, $expectedErrors, $expectedWarnings)
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -1159,7 +1138,6 @@ public static function dataIgnoreSelected()
                 'expectedWarnings' => 1,
             ],
         ];
-
     }
 
 
@@ -1198,7 +1176,6 @@ public function testCommenting($code, $expectedErrors, $expectedWarnings)
 
         $this->assertSame($expectedWarnings, $file->getWarningCount());
         $this->assertCount($expectedWarnings, $file->getWarnings());
-
     }
 
 
@@ -1259,7 +1236,6 @@ public static function dataCommenting()
                 'expectedWarnings' => 0,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
index 91a28d777d..2a4f4b1904 100644
--- a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
+++ b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
@@ -38,7 +38,6 @@ public function testRulesetIgnoredInternalErrorIsIgnored($sniffs, $exclude)
 
         $added = $phpcsFile->addError('No code found', 0, 'Internal.NoCodeFound');
         $this->assertFalse($added);
-
     }
 
 
@@ -58,7 +57,6 @@ public function testOtherInternalErrorIsNotIgnored($sniffs, $exclude)
 
         $added = $phpcsFile->addError('Some other error', 0, 'Internal.SomeError');
         $this->assertTrue($added);
-
     }
 
 
@@ -85,7 +83,6 @@ public static function dataSniffSelection()
                 'exclude' => 'Generic.Files.ByteOrderMark,Generic.PHP.DisallowShortOpenTag',
             ],
         ];
-
     }
 
 
@@ -119,7 +116,6 @@ private function getPhpcsFile($sniffs, $exclude)
         $phpcsFile->parse();
 
         return $phpcsFile;
-
     }
 
 
diff --git a/tests/Core/Files/File/FindEndOfStatementTest.php b/tests/Core/Files/File/FindEndOfStatementTest.php
index 00c4557111..3ecfd72c11 100644
--- a/tests/Core/Files/File/FindEndOfStatementTest.php
+++ b/tests/Core/Files/File/FindEndOfStatementTest.php
@@ -53,7 +53,6 @@ public function testEndIsNeverLessThanCurrentToken()
         }
 
         $this->assertSame([], $errors);
-
     }
 
 
@@ -68,7 +67,6 @@ public function testSimpleAssignment()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 5), $found);
-
     }
 
 
@@ -83,7 +81,6 @@ public function testControlStructure()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 6), $found);
-
     }
 
 
@@ -98,7 +95,6 @@ public function testClosureAssignment()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 13), $found);
-
     }
 
 
@@ -126,7 +122,6 @@ public function testHeredocFunctionArg()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -154,7 +149,6 @@ public function testSwitch()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 6), $found);
-
     }
 
 
@@ -182,7 +176,6 @@ public function testStatementAsArrayValue()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 3), $found);
-
     }
 
 
@@ -197,7 +190,6 @@ public function testUseGroup()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 21), $found);
-
     }
 
 
@@ -212,7 +204,6 @@ public function testArrowFunctionArrayValue()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 9), $found);
-
     }
 
 
@@ -230,7 +221,6 @@ public function testStaticArrowFunction()
         $endOfStatementFn     = self::$phpcsFile->findEndOfStatement($fn);
 
         $this->assertSame($endOfStatementFn, $endOfStatementStatic);
-
     }
 
 
@@ -245,7 +235,6 @@ public function testArrowFunctionReturnValue()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 18), $found);
-
     }
 
 
@@ -260,7 +249,6 @@ public function testArrowFunctionAsArgument()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 8), $found);
-
     }
 
 
@@ -275,7 +263,6 @@ public function testArrowFunctionWithArrayAsArgument()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 17), $found);
-
     }
 
 
@@ -295,7 +282,6 @@ public function testMatchCase()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 1), $found);
-
     }
 
 
@@ -315,7 +301,6 @@ public function testMatchDefault()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -333,7 +318,6 @@ public function testMatchMultipleCase()
         $start += 6;
         $found  = self::$phpcsFile->findEndOfStatement($start);
         $this->assertSame(($start + 7), $found);
-
     }
 
 
@@ -348,7 +332,6 @@ public function testMatchDefaultComma()
         $found = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 5), $found);
-
     }
 
 
@@ -368,7 +351,6 @@ public function testMatchFunctionCall()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 1), $found);
-
     }
 
 
@@ -390,7 +372,6 @@ public function testMatchFunctionCallArm()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 21), $found);
-
     }
 
 
@@ -410,7 +391,6 @@ public function testMatchClosure()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 14), $found);
-
     }
 
 
@@ -430,7 +410,6 @@ public function testMatchArray()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 22), $found);
-
     }
 
 
@@ -450,7 +429,6 @@ public function testNestedMatch()
         $found  = self::$phpcsFile->findEndOfStatement($start);
 
         $this->assertSame(($start + 5), $found);
-
     }
 
 
diff --git a/tests/Core/Files/File/FindExtendedClassNameTest.php b/tests/Core/Files/File/FindExtendedClassNameTest.php
index b0490688ca..2ddd810acd 100644
--- a/tests/Core/Files/File/FindExtendedClassNameTest.php
+++ b/tests/Core/Files/File/FindExtendedClassNameTest.php
@@ -29,7 +29,6 @@ public function testNonExistentToken()
     {
         $result = self::$phpcsFile->findExtendedClassName(100000);
         $this->assertFalse($result);
-
     }
 
 
@@ -43,7 +42,6 @@ public function testNotAClass()
         $token  = $this->getTargetToken('/* testNotAClass */', [T_FUNCTION]);
         $result = self::$phpcsFile->findExtendedClassName($token);
         $this->assertFalse($result);
-
     }
 
 
@@ -63,7 +61,6 @@ 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);
-
     }
 
 
@@ -150,7 +147,6 @@ public static function dataExtendedClass()
                 'expected'   => false,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
index 7be2bc36d9..6a6f97c649 100644
--- a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
+++ b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
@@ -29,7 +29,6 @@ public function testNonExistentToken()
     {
         $result = self::$phpcsFile->findImplementedInterfaceNames(100000);
         $this->assertFalse($result);
-
     }
 
 
@@ -43,7 +42,6 @@ public function testNotAClass()
         $token  = $this->getTargetToken('/* testNotAClass */', [T_FUNCTION]);
         $result = self::$phpcsFile->findImplementedInterfaceNames($token);
         $this->assertFalse($result);
-
     }
 
 
@@ -62,7 +60,6 @@ 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);
-
     }
 
 
@@ -162,7 +159,6 @@ public static function dataImplementedInterface()
                 'expected'   => false,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/FindStartOfStatementTest.php b/tests/Core/Files/File/FindStartOfStatementTest.php
index 77cea0f896..74aed51b01 100644
--- a/tests/Core/Files/File/FindStartOfStatementTest.php
+++ b/tests/Core/Files/File/FindStartOfStatementTest.php
@@ -55,7 +55,6 @@ public function testStartIsNeverMoreThanCurrentToken()
         }
 
         $this->assertSame([], $errors);
-
     }
 
 
@@ -70,7 +69,6 @@ public function testSimpleAssignment()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 5), $found);
-
     }
 
 
@@ -85,7 +83,6 @@ public function testFunctionCall()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 6), $found);
-
     }
 
 
@@ -100,7 +97,6 @@ public function testFunctionCallArgument()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -115,7 +111,6 @@ public function testControlStructure()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 6), $found);
-
     }
 
 
@@ -130,7 +125,6 @@ public function testClosureAssignment()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 11), $found);
-
     }
 
 
@@ -158,7 +152,6 @@ public function testHeredocFunctionArg()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -198,7 +191,6 @@ public function testSwitch()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 1), $found);
-
     }
 
 
@@ -232,7 +224,6 @@ public function testStatementAsArrayValue()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 5), $found);
-
     }
 
 
@@ -247,7 +238,6 @@ public function testUseGroup()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 21), $found);
-
     }
 
 
@@ -262,7 +252,6 @@ public function testArrowFunctionArrayValue()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 7), $found);
-
     }
 
 
@@ -277,7 +266,6 @@ public function testStaticArrowFunction()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 11), $found);
-
     }
 
 
@@ -292,7 +280,6 @@ public function testArrowFunctionReturnValue()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 18), $found);
-
     }
 
 
@@ -308,7 +295,6 @@ public function testArrowFunctionAsArgument()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 8), $found);
-
     }
 
 
@@ -324,7 +310,6 @@ public function testArrowFunctionWithArrayAsArgument()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 17), $found);
-
     }
 
 
@@ -339,7 +324,6 @@ public function testMatchCase()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 1), $found);
-
     }
 
 
@@ -354,7 +338,6 @@ public function testMatchDefault()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -374,7 +357,6 @@ public function testMatchMultipleCase()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 4), $found);
-
     }
 
 
@@ -394,7 +376,6 @@ public function testMatchDefaultComma()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame($start, $found);
-
     }
 
 
@@ -409,7 +390,6 @@ public function testMatchFunctionCall()
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 6), $found);
-
     }
 
 
@@ -431,7 +411,6 @@ public function testMatchFunctionCallArm()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 18), $found);
-
     }
 
 
@@ -452,7 +431,6 @@ public function testMatchClosure()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 10), $found);
-
     }
 
 
@@ -482,7 +460,6 @@ public function testMatchArray()
         $start += 30;
         $found  = self::$phpcsFile->findStartOfStatement($start);
         $this->assertSame(($start - 26), $found);
-
     }
 
 
@@ -508,7 +485,6 @@ public function testNestedMatch()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 2), $found);
-
     }
 
 
@@ -524,7 +500,6 @@ public function testOpenTag()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 1), $found);
-
     }
 
 
@@ -540,7 +515,6 @@ public function testOpenTagWithEcho()
         $found  = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame(($start - 1), $found);
-
     }
 
 
@@ -560,7 +534,6 @@ public function testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInAr
         $found = self::$phpcsFile->findStartOfStatement($start);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -586,7 +559,6 @@ public function testFindStartInsideSwitchCaseDefaultStatements($testMarker, $tar
         $found = self::$phpcsFile->findStartOfStatement($testToken);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -686,7 +658,6 @@ public static function dataFindStartInsideSwitchCaseDefaultStatements()
                 'expectedTarget' => T_CONTINUE,
             ],
         ];
-
     }
 
 
@@ -711,7 +682,6 @@ public function testFindStartInsideClosedScopeNestedWithinMatch($testMarker, $ta
         $found = self::$phpcsFile->findStartOfStatement($testToken);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -768,7 +738,6 @@ public static function dataFindStartInsideClosedScopeNestedWithinMatch()
                 'expectedTarget' => T_STRING,
             ],
         ];
-
     }
 
 
@@ -793,7 +762,6 @@ public function testFindStartInsideParenthesesNestedWithinMatch($testMarker, $ta
         $found = self::$phpcsFile->findStartOfStatement($testToken);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -848,7 +816,6 @@ public static function dataFindStartInsideParenthesesNestedWithinMatch()
                 'expectedTarget' => T_VARIABLE,
             ],
         ];
-
     }
 
 
@@ -874,7 +841,6 @@ public function testFindStartInsideParenthesesNestedWithinNestedMatch($testMarke
         $found = self::$phpcsFile->findStartOfStatement($testToken);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -929,7 +895,6 @@ public static function dataFindStartInsideParenthesesNestedWithinNestedMatch()
                 'expectedTarget' => T_VARIABLE,
             ],
         ];
-
     }
 
 
@@ -954,7 +919,6 @@ public function testFindStartInsideShortArrayNestedWithinMatch($testMarker, $tar
         $found = self::$phpcsFile->findStartOfStatement($testToken);
 
         $this->assertSame($expected, $found);
-
     }
 
 
@@ -982,7 +946,6 @@ public static function dataFindStartInsideShortArrayNestedWithinMatch()
                 'expectedTarget' => T_VARIABLE,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/GetClassPropertiesTest.php b/tests/Core/Files/File/GetClassPropertiesTest.php
index 36acbc1bbb..e1761cfb9e 100644
--- a/tests/Core/Files/File/GetClassPropertiesTest.php
+++ b/tests/Core/Files/File/GetClassPropertiesTest.php
@@ -36,7 +36,6 @@ public function testNotAClassException($testMarker, $tokenType)
 
         $target = $this->getTargetToken($testMarker, $tokenType);
         self::$phpcsFile->getClassProperties($target);
-
     }
 
 
@@ -63,7 +62,6 @@ public static function dataNotAClassException()
                 'tokenType'  => T_ENUM,
             ],
         ];
-
     }
 
 
@@ -82,7 +80,6 @@ public function testGetClassProperties($testMarker, $expected)
         $class  = $this->getTargetToken($testMarker, T_CLASS);
         $result = self::$phpcsFile->getClassProperties($class);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -185,7 +182,6 @@ public static function dataGetClassProperties()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/GetConditionTest.php b/tests/Core/Files/File/GetConditionTest.php
index 7d3032a091..fb8faa3914 100644
--- a/tests/Core/Files/File/GetConditionTest.php
+++ b/tests/Core/Files/File/GetConditionTest.php
@@ -138,7 +138,6 @@ protected function setUp(): void
                 self::$markerTokens[$marker] = $this->getTargetToken($marker, Tokens::SCOPE_OPENERS);
             }
         }
-
     }
 
 
@@ -154,7 +153,6 @@ public function testNonExistentToken()
 
         $result = self::$phpcsFile->hasCondition(100000, T_IF);
         $this->assertFalse($result);
-
     }
 
 
@@ -173,7 +171,6 @@ public function testNonConditionalToken()
 
         $result = self::$phpcsFile->hasCondition($stackPtr, Tokens::OO_SCOPE_TOKENS);
         $this->assertFalse($result);
-
     }
 
 
@@ -207,7 +204,6 @@ public function testGetCondition($testMarker, $expectedResults)
                 "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}"
             );
         }
-
     }
 
 
@@ -278,7 +274,6 @@ public static function dataGetCondition()
                 ],
             ],
         ];
-
     }
 
 
@@ -312,7 +307,6 @@ public function testGetConditionReversed($testMarker, $expectedResults)
                 "Assertion failed for test marker '{$testMarker}' with condition {$conditionType} (reversed)"
             );
         }
-
     }
 
 
@@ -344,7 +338,6 @@ public static function dataGetConditionReversed()
         $data['testInDefault']['expectedResults']['T_IF']       = '/* condition 4: if */';
 
         return $data;
-
     }
 
 
@@ -374,7 +367,6 @@ public function testHasCondition($testMarker, $expectedResults)
                 "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}"
             );
         }
-
     }
 
 
@@ -445,7 +437,6 @@ public static function dataHasCondition()
                 ],
             ],
         ];
-
     }
 
 
@@ -483,7 +474,6 @@ public function testHasConditionMultipleTypes()
             $result,
             'Failed asserting that "testSeriouslyNestedMethod" has an OO Scope token condition'
         );
-
     }
 
 
diff --git a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
index 8475b493ec..7b41b0541b 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
@@ -30,7 +30,6 @@ public function testGetDeclarationName()
         $target = $this->getTargetToken('/* testLiveCoding */', T_FUNCTION);
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame('', $result);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
index d9e44aab55..34dd0fd006 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
@@ -30,7 +30,6 @@ public function testGetDeclarationName()
         $target = $this->getTargetToken('/* testLiveCoding */', T_FUNCTION);
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame('', $result);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetDeclarationNameTest.php b/tests/Core/Files/File/GetDeclarationNameTest.php
index 0be8d23b37..4df50c6373 100644
--- a/tests/Core/Files/File/GetDeclarationNameTest.php
+++ b/tests/Core/Files/File/GetDeclarationNameTest.php
@@ -38,7 +38,6 @@ public function testInvalidTokenPassed($testMarker, $targetType)
 
         $target = $this->getTargetToken($testMarker, $targetType);
         self::$phpcsFile->getDeclarationName($target);
-
     }
 
 
@@ -77,7 +76,6 @@ public static function dataInvalidTokenPassed()
                 'targetType' => T_ANON_CLASS,
             ],
         ];
-
     }
 
 
@@ -107,7 +105,6 @@ public function testGetDeclarationName($testMarker, $expected, $targetType = nul
         $target = $this->getTargetToken($testMarker, $targetType);
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -206,7 +203,6 @@ public static function dataGetDeclarationName()
                 'expected'   => 'static',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMemberPropertiesTest.php b/tests/Core/Files/File/GetMemberPropertiesTest.php
index cdb52f468e..c4695e8624 100644
--- a/tests/Core/Files/File/GetMemberPropertiesTest.php
+++ b/tests/Core/Files/File/GetMemberPropertiesTest.php
@@ -45,7 +45,6 @@ public function testGetMemberProperties($identifier, $expected)
         }
 
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -1844,7 +1843,6 @@ public static function dataGetMemberProperties()
                 ],
             ],
         ];
-
     }
 
 
@@ -1863,7 +1861,6 @@ public function testNotClassPropertyException($identifier)
 
         $variable = $this->getTargetToken($identifier, T_VARIABLE);
         self::$phpcsFile->getMemberProperties($variable);
-
     }
 
 
@@ -1886,7 +1883,6 @@ public static function dataNotClassProperty()
             'method parameter in enum'                               => ['/* testEnumMethodParamNotProperty */'],
             'property in enum (parse error)'                         => ['/* testEnumProperty */'],
         ];
-
     }
 
 
@@ -1901,7 +1897,6 @@ public function testNotAVariableException()
 
         $next = $this->getTargetToken('/* testNotAVariable */', T_RETURN);
         self::$phpcsFile->getMemberProperties($next);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodParametersParseError1Test.php b/tests/Core/Files/File/GetMethodParametersParseError1Test.php
index 8d0293d08f..a62ea28700 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError1Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError1Test.php
@@ -31,7 +31,6 @@ public function testParseError()
         $result = self::$phpcsFile->getMethodParameters($target);
 
         $this->assertSame([], $result);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodParametersParseError2Test.php b/tests/Core/Files/File/GetMethodParametersParseError2Test.php
index 5a0178d439..0ad3362092 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError2Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError2Test.php
@@ -31,7 +31,6 @@ public function testParseError()
         $result = self::$phpcsFile->getMethodParameters($target);
 
         $this->assertSame([], $result);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodParametersParseError3Test.php b/tests/Core/Files/File/GetMethodParametersParseError3Test.php
index 3142f8e33d..a5a73e728f 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError3Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError3Test.php
@@ -30,7 +30,6 @@ public function testParseError()
 
         $target = $this->getTargetToken('/* testParseError */', [T_USE]);
         self::$phpcsFile->getMethodParameters($target);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodParametersParseError4Test.php b/tests/Core/Files/File/GetMethodParametersParseError4Test.php
index df94627a7e..6bb7c72750 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError4Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError4Test.php
@@ -30,7 +30,6 @@ public function testParseError()
         $result = self::$phpcsFile->getMethodParameters($target);
 
         $this->assertSame([], $result);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodParametersTest.php b/tests/Core/Files/File/GetMethodParametersTest.php
index 4b0968b2c5..9172f387d3 100644
--- a/tests/Core/Files/File/GetMethodParametersTest.php
+++ b/tests/Core/Files/File/GetMethodParametersTest.php
@@ -38,7 +38,6 @@ public function testUnexpectedTokenException($commentString, $targetTokenType)
 
         $target = $this->getTargetToken($commentString, $targetTokenType);
         self::$phpcsFile->getMethodParameters($target);
-
     }
 
 
@@ -71,7 +70,6 @@ public static function dataUnexpectedTokenException()
                 ],
             ],
         ];
-
     }
 
 
@@ -90,7 +88,6 @@ public function testInvalidUse($identifier)
 
         $use = $this->getTargetToken($identifier, [T_USE]);
         self::$phpcsFile->getMethodParameters($use);
-
     }
 
 
@@ -108,7 +105,6 @@ public static function dataInvalidUse()
             'ImportGroupUse' => ['/* testImportGroupUse */'],
             'TraitUse'       => ['/* testTraitUse */'],
         ];
-
     }
 
 
@@ -129,7 +125,6 @@ public function testNoParams($commentString, $targetTokenType = [T_FUNCTION, T_C
         $result = self::$phpcsFile->getMethodParameters($target);
 
         $this->assertSame([], $result);
-
     }
 
 
@@ -154,7 +149,6 @@ public static function dataNoParams()
                 'targetTokenType' => T_USE,
             ],
         ];
-
     }
 
 
@@ -184,7 +178,6 @@ public function testPassByReference()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -214,7 +207,6 @@ public function testArrayHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -244,7 +236,6 @@ public function testVariable()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -277,7 +268,6 @@ public function testSingleDefaultValue()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -328,7 +318,6 @@ public function testDefaultValues()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -374,7 +363,6 @@ public function testTypeHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -404,7 +392,6 @@ public function testSelfTypeHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -450,7 +437,6 @@ public function testNullableTypeHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -483,7 +469,6 @@ public function testBitwiseAndConstantExpressionDefaultValue()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -529,7 +514,6 @@ public function testArrowFunction()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -559,7 +543,6 @@ public function testArrowFunctionReturnByRef()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -610,7 +593,6 @@ public function testArrayDefaultValues()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -658,7 +640,6 @@ public function testConstantDefaultValueSecondParam()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -706,7 +687,6 @@ public function testScalarTernaryExpressionInDefault()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -736,7 +716,6 @@ public function testVariadicFunction()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -766,7 +745,6 @@ public function testVariadicByRefFunction()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -811,7 +789,6 @@ public function testVariadicFunctionClassType()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -856,7 +833,6 @@ public function testNameSpacedTypeDeclaration()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1045,7 +1021,6 @@ public function testWithAllTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1234,7 +1209,6 @@ public function testArrowFunctionWithAllTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1303,7 +1277,6 @@ public function testMessyDeclaration()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1333,7 +1306,6 @@ public function testPHP8MixedTypeHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1363,7 +1335,6 @@ public function testPHP8MixedTypeHintNullable()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1393,7 +1364,6 @@ public function testNamespaceOperatorTypeHint()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1438,7 +1408,6 @@ public function testPHP8UnionTypesSimple()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1483,7 +1452,6 @@ public function testPHP8UnionTypesWithSpreadOperatorAndReference()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1516,7 +1484,6 @@ public function testPHP8UnionTypesSimpleWithBitwiseOrInDefault()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1546,7 +1513,6 @@ public function testPHP8UnionTypesTwoClasses()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1576,7 +1542,6 @@ public function testPHP8UnionTypesAllBaseTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1608,7 +1573,6 @@ public function testPHP8UnionTypesAllPseudoTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1638,7 +1602,6 @@ public function testPHP8UnionTypesNullable()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1671,7 +1634,6 @@ public function testPHP8PseudoTypeNull()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1704,7 +1666,6 @@ public function testPHP8PseudoTypeFalse()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1737,7 +1698,6 @@ public function testPHP8PseudoTypeFalseAndBool()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1767,7 +1727,6 @@ public function testPHP8ObjectAndClass()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1797,7 +1756,6 @@ public function testPHP8PseudoTypeIterableAndArray()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1827,7 +1785,6 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1905,7 +1862,6 @@ public function testPHP8ConstructorPropertyPromotionNoTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1977,7 +1933,6 @@ public function testPHP8ConstructorPropertyPromotionWithTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2025,7 +1980,6 @@ public function testPHP8ConstructorPropertyPromotionAndNormalParam()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2078,7 +2032,6 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnly()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2132,7 +2085,6 @@ public function testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclarati
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2186,7 +2138,6 @@ public function testPHP81ConstructorPropertyPromotionWithOnlyReadOnly()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2302,7 +2253,6 @@ public function testPHP84ConstructorPropertyPromotionWithAsymVisibility()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2335,7 +2285,6 @@ public function testPHP8ConstructorPropertyPromotionGlobalFunction()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2386,7 +2335,6 @@ public function testPHP8ConstructorPropertyPromotionAbstractMethod()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2420,7 +2368,6 @@ public function testCommentsInParameter()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2516,7 +2463,6 @@ public function testParameterAttributesInFunctionDeclaration()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2561,7 +2507,6 @@ public function testPHP8IntersectionTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2607,7 +2552,6 @@ public function testPHP81IntersectionTypesWithSpreadOperatorAndReference()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2637,7 +2581,6 @@ public function testPHP81MoreIntersectionTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2667,7 +2610,6 @@ public function testPHP81IllegalIntersectionTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2697,7 +2639,6 @@ public function testPHP81NullableIntersectionTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2730,7 +2671,6 @@ public function testPHP82PseudoTypeTrue()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2763,7 +2703,6 @@ public function testPHP82PseudoTypeFalseAndTrue()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2814,7 +2753,6 @@ public function testPHP81NewInInitializers()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2863,7 +2801,6 @@ public function testPHP82DNFTypes()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2909,7 +2846,6 @@ public function testPHP82DNFTypesWithSpreadOperatorAndReference()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2939,7 +2875,6 @@ public function testPHP82DNFTypesIllegalNullable()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -2969,7 +2904,6 @@ public function testPHP82DNFTypesInArrow()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -3002,7 +2936,6 @@ public function testClosure()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -3047,7 +2980,6 @@ public function testClosureUse()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
-
     }
 
 
@@ -3092,7 +3024,6 @@ public function testClosureUseWithReference()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
-
     }
 
 
@@ -3140,7 +3071,6 @@ public function testFunctionParamListWithTrailingComma()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -3185,7 +3115,6 @@ public function testClosureParamListWithTrailingComma()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -3230,7 +3159,6 @@ public function testArrowFunctionParamListWithTrailingComma()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -3275,7 +3203,6 @@ public function testClosureUseWithTrailingComma()
         ];
 
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected, [T_USE]);
-
     }
 
 
@@ -3340,7 +3267,6 @@ private function getMethodParametersTestHelper($commentString, $expected, $targe
         }//end foreach
 
         $this->assertSame($expected, $found);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetMethodPropertiesTest.php b/tests/Core/Files/File/GetMethodPropertiesTest.php
index 3f7fffc670..03949f9251 100644
--- a/tests/Core/Files/File/GetMethodPropertiesTest.php
+++ b/tests/Core/Files/File/GetMethodPropertiesTest.php
@@ -36,7 +36,6 @@ public function testNotAFunctionException($commentString, $targetTokenType)
 
         $next = $this->getTargetToken($commentString, $targetTokenType);
         self::$phpcsFile->getMethodProperties($next);
-
     }
 
 
@@ -69,7 +68,6 @@ public static function dataNotAFunctionException()
                 ],
             ],
         ];
-
     }
 
 
@@ -94,7 +92,6 @@ public function testBasicFunction()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -120,7 +117,6 @@ public function testReturnFunction()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -146,7 +142,6 @@ public function testNestedClosure()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -171,7 +166,6 @@ public function testBasicMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -196,7 +190,6 @@ public function testPrivateStaticMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -221,7 +214,6 @@ public function testFinalMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -247,7 +239,6 @@ public function testProtectedReturnMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -273,7 +264,6 @@ public function testPublicReturnMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -299,7 +289,6 @@ public function testNullableReturnMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -325,7 +314,6 @@ public function testMessyNullableReturnMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -351,7 +339,6 @@ public function testReturnNamespace()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -377,7 +364,6 @@ public function testReturnMultilineNamespace()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -403,7 +389,6 @@ public function testReturnUnqualifiedName()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -429,7 +414,6 @@ public function testReturnPartiallyQualifiedName()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -454,7 +438,6 @@ public function testAbstractMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -480,7 +463,6 @@ public function testAbstractReturnMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -505,7 +487,6 @@ public function testInterfaceMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -531,7 +512,6 @@ public function testArrowFunction()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -557,7 +537,6 @@ public function testReturnTypeStatic()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -583,7 +562,6 @@ public function testReturnTypeNullableStatic()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -609,7 +587,6 @@ public function testPHP8MixedTypeHint()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -635,7 +612,6 @@ public function testPHP8MixedTypeHintNullable()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -661,7 +637,6 @@ public function testNamespaceOperatorTypeHint()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -687,7 +662,6 @@ public function testPHP8UnionTypesSimple()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -713,7 +687,6 @@ public function testPHP8UnionTypesTwoClasses()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -739,7 +712,6 @@ public function testPHP8UnionTypesAllBaseTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -767,7 +739,6 @@ public function testPHP8UnionTypesAllPseudoTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -793,7 +764,6 @@ public function testPHP8UnionTypesNullable()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -819,7 +789,6 @@ public function testPHP8PseudoTypeNull()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -845,7 +814,6 @@ public function testPHP8PseudoTypeFalse()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -871,7 +839,6 @@ public function testPHP8PseudoTypeFalseAndBool()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -897,7 +864,6 @@ public function testPHP8ObjectAndClass()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -923,7 +889,6 @@ public function testPHP8PseudoTypeIterableAndArray()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -949,7 +914,6 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -975,7 +939,6 @@ public function testPHP81NeverType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1001,7 +964,6 @@ public function testPHP81NullableNeverType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1027,7 +989,6 @@ public function testPHP8IntersectionTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1053,7 +1014,6 @@ public function testPHP81MoreIntersectionTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1079,7 +1039,6 @@ public function testPHP81IntersectionArrowFunction()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1105,7 +1064,6 @@ public function testPHP81IllegalIntersectionTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1131,7 +1089,6 @@ public function testPHP81NullableIntersectionTypes()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1157,7 +1114,6 @@ public function testPHP82PseudoTypeTrue()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1183,7 +1139,6 @@ public function testPHP82PseudoTypeFalseAndTrue()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1209,7 +1164,6 @@ public function testPHP82DNFType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1235,7 +1189,6 @@ public function testPHP82DNFTypeAbstractMethod()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1261,7 +1214,6 @@ public function testPHP82DNFTypeIllegalNullable()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1287,7 +1239,6 @@ public function testPHP82DNFTypeClosure()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1313,7 +1264,6 @@ public function testPHP82DNFTypeFn()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1341,7 +1291,6 @@ public function testPhpcsIssue1264()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1370,7 +1319,6 @@ public function testArrowFunctionArrayReturnValue()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1396,7 +1344,6 @@ public function testArrowFunctionReturnByRef()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1423,7 +1370,6 @@ public function testFunctionDeclarationNestedInTernaryPHPCS2975()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1449,7 +1395,6 @@ public function testClosureWithUseNoReturnType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1476,7 +1421,6 @@ public function testClosureWithUseNoReturnTypeIllegalUseProp()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1502,7 +1446,6 @@ public function testClosureWithUseWithReturnType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1528,7 +1471,6 @@ public function testClosureWithUseMultiParamWithReturnType()
         ];
 
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-
     }
 
 
@@ -1555,7 +1497,6 @@ private function getMethodPropertiesTestHelper($commentString, $expected)
         }
 
         $this->assertSame($expected, $found);
-
     }
 
 
diff --git a/tests/Core/Files/File/GetTokensAsStringTest.php b/tests/Core/Files/File/GetTokensAsStringTest.php
index dd7b43d557..cd61b3b8e7 100644
--- a/tests/Core/Files/File/GetTokensAsStringTest.php
+++ b/tests/Core/Files/File/GetTokensAsStringTest.php
@@ -30,7 +30,6 @@ public function testNonExistentToken()
         $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack');
 
         self::$phpcsFile->getTokensAsString(100000, 10);
-
     }
 
 
@@ -44,7 +43,6 @@ public function testNonIntegerStart()
         $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack');
 
         self::$phpcsFile->getTokensAsString(false, 10);
-
     }
 
 
@@ -60,7 +58,6 @@ public function testNonIntegerLength()
 
         $result = self::$phpcsFile->getTokensAsString(10, 1.5);
         $this->assertSame('', $result);
-
     }
 
 
@@ -76,7 +73,6 @@ public function testLengthEqualToOrLessThanZero()
 
         $result = self::$phpcsFile->getTokensAsString(10, 0);
         $this->assertSame('', $result);
-
     }
 
 
@@ -94,7 +90,6 @@ public function testLengthBeyondEndOfFile()
 ',
             $result
         );
-
     }
 
 
@@ -115,7 +110,6 @@ public function testGetTokensAsString($testMarker, $startTokenType, $length, $ex
         $start  = $this->getTargetToken($testMarker, $startTokenType);
         $result = self::$phpcsFile->getTokensAsString($start, $length);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -269,7 +263,6 @@ public static function dataGetTokensAsString()
                 'expected'       => 'echo   $foo;',
             ],
         ];
-
     }
 
 
@@ -290,7 +283,6 @@ public function testGetOrigContent($testMarker, $startTokenType, $length, $expec
         $start  = $this->getTargetToken($testMarker, $startTokenType);
         $result = self::$phpcsFile->getTokensAsString($start, $length, true);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -327,7 +319,6 @@ public static function dataGetOrigContent()
                 'expected'       => 'echo   $foo;',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/File/IsReferenceTest.php b/tests/Core/Files/File/IsReferenceTest.php
index 80dd26f4a2..3dfede1edd 100644
--- a/tests/Core/Files/File/IsReferenceTest.php
+++ b/tests/Core/Files/File/IsReferenceTest.php
@@ -36,7 +36,6 @@ public function testNotBitwiseAndToken($testMarker, $targetTokens)
 
         $target = $this->getTargetToken($testMarker, $targetTokens);
         $this->assertFalse(self::$phpcsFile->isReference($target));
-
     }
 
 
@@ -63,7 +62,6 @@ public static function dataNotBitwiseAndToken()
                 'targetTokens' => [T_TYPE_INTERSECTION],
             ],
         ];
-
     }
 
 
@@ -82,7 +80,6 @@ public function testIsReference($testMarker, $expected)
         $bitwiseAnd = $this->getTargetToken($testMarker, T_BITWISE_AND);
         $result     = self::$phpcsFile->isReference($bitwiseAnd);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -389,7 +386,6 @@ public static function dataIsReference()
                 'expected'   => true,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/FileList/AbstractFileListTestCase.php b/tests/Core/Files/FileList/AbstractFileListTestCase.php
index 7b2eec8196..bb25f128c0 100644
--- a/tests/Core/Files/FileList/AbstractFileListTestCase.php
+++ b/tests/Core/Files/FileList/AbstractFileListTestCase.php
@@ -46,7 +46,6 @@ public static function setUpBeforeClass(): void
             self::$config->filter = __DIR__ . '/FilterDouble.php';
             self::$ruleset        = new Ruleset(self::$config);
         }
-
     }
 
 
diff --git a/tests/Core/Files/FileList/AddFileTest.php b/tests/Core/Files/FileList/AddFileTest.php
index 9c48b8dd7c..e40f8df606 100644
--- a/tests/Core/Files/FileList/AddFileTest.php
+++ b/tests/Core/Files/FileList/AddFileTest.php
@@ -36,7 +36,6 @@ protected function setUp(): void
     {
         self::$config->files = [];
         $this->fileList      = new FileList(self::$config, self::$ruleset);
-
     }
 
 
@@ -70,7 +69,6 @@ public function testAddFile($fileName, $fileObject = null)
                 'File object not found in list'
             );
         }
-
     }
 
 
@@ -95,7 +93,6 @@ public static function dataAddFile()
                 'fileObject' => new File('test1.php', self::$ruleset, self::$config),
             ],
         ];
-
     }
 
 
@@ -127,7 +124,6 @@ public function testAddFileShouldNotAddTheSameFileTwice()
         $this->fileList->addFile($file2);
         $this->assertCount(2, $this->fileList);
         $this->assertSame($expectedFiles, array_keys(iterator_to_array($this->fileList)));
-
     }
 
 
diff --git a/tests/Core/Files/FileList/ConstructTest.php b/tests/Core/Files/FileList/ConstructTest.php
index 84924d2eef..e3bbe2a850 100644
--- a/tests/Core/Files/FileList/ConstructTest.php
+++ b/tests/Core/Files/FileList/ConstructTest.php
@@ -61,7 +61,6 @@ public function testConstruct($files, $expectedFiles)
             );
             $i++;
         }
-
     }
 
 
@@ -116,7 +115,6 @@ public static function dataConstruct()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Files/FileList/FilterDouble.php b/tests/Core/Files/FileList/FilterDouble.php
index 55ef99b414..873530aa99 100644
--- a/tests/Core/Files/FileList/FilterDouble.php
+++ b/tests/Core/Files/FileList/FilterDouble.php
@@ -24,7 +24,6 @@ final class FilterDouble extends Filter
     public function accept()
     {
         return true;
-
     }
 
 
diff --git a/tests/Core/Filters/AbstractFilterTestCase.php b/tests/Core/Filters/AbstractFilterTestCase.php
index 968ed1c65e..707aa96590 100644
--- a/tests/Core/Filters/AbstractFilterTestCase.php
+++ b/tests/Core/Filters/AbstractFilterTestCase.php
@@ -45,7 +45,6 @@ public static function setUpBeforeClass(): void
     {
         self::$config  = new ConfigDouble();
         self::$ruleset = new Ruleset(self::$config);
-
     }
 
 
@@ -63,7 +62,6 @@ public static function tearDownAfterClass(): void
         if (isset(self::$config) === true) {
             self::$config->__destruct();
         }
-
     }
 
 
@@ -98,7 +96,6 @@ protected function getMockedClass($className, array $constructorArgs = [], $meth
 
         return $mockedObj->getMock()
             ->setConstructorArgs($constructorArgs);
-
     }
 
 
@@ -118,7 +115,6 @@ protected function getFilteredResultsAsArray(Filter $filter)
         }
 
         return $files;
-
     }
 
 
@@ -130,7 +126,6 @@ protected function getFilteredResultsAsArray(Filter $filter)
     protected static function getBaseDir()
     {
         return dirname(__DIR__, 3);
-
     }
 
 
@@ -197,7 +192,6 @@ protected static function getFakeFileList()
             $basedir . '/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
             $basedir . '/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
         ];
-
     }
 
 
@@ -227,7 +221,6 @@ protected static function mapPathsToRuntimeOs(array $paths)
         }
 
         return $paths;
-
     }
 
 
diff --git a/tests/Core/Filters/Filter/AcceptTest.php b/tests/Core/Filters/Filter/AcceptTest.php
index 672e462c70..5900784acb 100644
--- a/tests/Core/Filters/Filter/AcceptTest.php
+++ b/tests/Core/Filters/Filter/AcceptTest.php
@@ -35,7 +35,6 @@ 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);
-
     }
 
 
@@ -55,7 +54,6 @@ public function testExcludePatterns($inputPaths, $expectedOutput)
         $filter = new Filter($fakeDI, '/', self::$config, self::$ruleset);
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter));
-
     }
 
 
@@ -101,7 +99,6 @@ public static function dataExcludePatterns()
 
         // Allow these tests to work on Windows as well.
         return self::mapPathsToRuntimeOs($testCases);
-
     }
 
 
diff --git a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
index f989fcc791..e9cd3e3bac 100644
--- a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
+++ b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
@@ -34,7 +34,6 @@ public function testFileWithoutExtensionIsAcceptedWhenExplicitlyRequested()
         $filter = new Filter($fakeDI, $fileWithoutExt, self::$config, self::$ruleset);
 
         $this->assertSame([$fileWithoutExt], $this->getFilteredResultsAsArray($filter));
-
     }
 
 
@@ -64,7 +63,6 @@ public function testFileWithoutExtensionIsRejectedWhenRecursingDirectory()
         ];
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter));
-
     }
 
 
diff --git a/tests/Core/Filters/GitModifiedTest.php b/tests/Core/Filters/GitModifiedTest.php
index f7c6b56169..5c0094f502 100644
--- a/tests/Core/Filters/GitModifiedTest.php
+++ b/tests/Core/Filters/GitModifiedTest.php
@@ -47,7 +47,6 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname()
             ->willReturn(['autoload.php']);
 
         $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj));
-
     }
 
 
@@ -78,7 +77,6 @@ public function testAcceptOnlyGitModified($inputPaths, $outputGitModified, $expe
             ->willReturn($outputGitModified);
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
-
     }
 
 
@@ -197,7 +195,6 @@ public static function dataAcceptOnlyGitModified()
         ];
 
         return $testCases;
-
     }
 
 
@@ -229,7 +226,6 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
         $result = $reflMethod->invoke($filter, $cmd);
 
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -263,7 +259,6 @@ public static function dataExecAlwaysReturnsArray()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Filters/GitStagedTest.php b/tests/Core/Filters/GitStagedTest.php
index 5d9523aa45..76ecdb933b 100644
--- a/tests/Core/Filters/GitStagedTest.php
+++ b/tests/Core/Filters/GitStagedTest.php
@@ -47,7 +47,6 @@ public function testFileNamePassesAsBasePathWillTranslateToDirname()
             ->willReturn(['autoload.php']);
 
         $this->assertSame([$rootFile], $this->getFilteredResultsAsArray($mockObj));
-
     }
 
 
@@ -78,7 +77,6 @@ public function testAcceptOnlyGitStaged($inputPaths, $outputGitStaged, $expected
             ->willReturn($outputGitStaged);
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
-
     }
 
 
@@ -197,7 +195,6 @@ public static function dataAcceptOnlyGitStaged()
         ];
 
         return $testCases;
-
     }
 
 
@@ -229,7 +226,6 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
         $result = $reflMethod->invoke($filter, $cmd);
 
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -263,7 +259,6 @@ public static function dataExecAlwaysReturnsArray()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Fixer/FixFileReturnValueTest.php b/tests/Core/Fixer/FixFileReturnValueTest.php
index f919242191..fbf83371d9 100644
--- a/tests/Core/Fixer/FixFileReturnValueTest.php
+++ b/tests/Core/Fixer/FixFileReturnValueTest.php
@@ -39,7 +39,6 @@ public function testReturnValueIsTrueWhenFileWasFixed()
         $fixed = $phpcsFile->fixer->fixFile();
 
         $this->assertTrue($fixed);
-
     }
 
 
@@ -63,7 +62,6 @@ public function testReturnValueIsFalse($standard)
         $fixed = $phpcsFile->fixer->fixFile();
 
         $this->assertFalse($fixed);
-
     }
 
 
@@ -82,7 +80,6 @@ public static function dataReturnValueIsFalse()
                 'standard' => __DIR__ . '/FixFileReturnValueNotEnoughLoopsTest.xml',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Fixer/GenerateDiffTest.php b/tests/Core/Fixer/GenerateDiffTest.php
index 0171e97711..21e0ba2718 100644
--- a/tests/Core/Fixer/GenerateDiffTest.php
+++ b/tests/Core/Fixer/GenerateDiffTest.php
@@ -56,7 +56,6 @@ public static function setUpBeforeClass(): void
         self::$phpcsFile = new LocalFile(__DIR__ . '/Fixtures/GenerateDiffTest.inc', $ruleset, $config);
         self::$phpcsFile->parse();
         self::$phpcsFile->fixer->startFile(self::$phpcsFile);
-
     }
 
 
@@ -70,7 +69,6 @@ public function testGenerateDiffNoFile()
         $diff = self::$phpcsFile->fixer->generateDiff(null, false);
 
         $this->assertSame('', $diff);
-
     }
 
 
@@ -93,7 +91,6 @@ public function testGenerateDiff($filePath)
         $expectedDiffFile = str_replace('.inc', '.diff', $filePath);
 
         $this->assertStringEqualsFile($expectedDiffFile, $diff);
-
     }
 
 
@@ -138,7 +135,6 @@ public static function dataGenerateDiff()
                 'filePath' => __DIR__ . '/Fixtures/GenerateDiffTest-WhiteSpaceAtEnd.inc',
             ],
         ];
-
     }
 
 
@@ -169,7 +165,6 @@ public function testGenerateDiffColoured()
         $diff = str_replace('--- tests\Core\Fixer/', '--- tests/Core/Fixer/', $diff);
 
         $this->assertSame($expected, $diff);
-
     }
 
 
@@ -218,7 +213,6 @@ public function testGenerateDiffDifferentLineEndings()
         $diff = preg_replace('`\R`', "\n", $diff);
 
         $this->assertSame($expected, $diff);
-
     }
 
 
diff --git a/tests/Core/Generators/GeneratorTest.php b/tests/Core/Generators/GeneratorTest.php
index 2adc8dbd6c..c04d08a54c 100644
--- a/tests/Core/Generators/GeneratorTest.php
+++ b/tests/Core/Generators/GeneratorTest.php
@@ -42,7 +42,6 @@ public function testConstructor($standard, array $expected)
 
         $generator = new MockGenerator($ruleset);
         $this->assertSame($expected, $generator->docFiles);
-
     }
 
 
@@ -88,7 +87,6 @@ public static function dataConstructor()
                 ],
             ],
         ];
-
     }
 
 
@@ -109,7 +107,6 @@ public function testGeneratingInvalidDocsResultsInException()
 
         $generator = new MockGenerator($ruleset);
         $generator->generate();
-
     }
 
 
@@ -133,7 +130,6 @@ public function testGeneratingDocs($standard, $expected)
 
         $generator = new MockGenerator($ruleset);
         $generator->generate();
-
     }
 
 
@@ -169,7 +165,6 @@ public static function dataGeneratingDocs()
                 'expected' => $multidocExpected,
             ],
         ];
-
     }
 
 
@@ -192,7 +187,6 @@ public function testGetTitleFallbackToFilename()
 
         $generator = new MockGenerator($ruleset);
         $generator->generate();
-
     }
 
 
diff --git a/tests/Core/Generators/HTMLTest.php b/tests/Core/Generators/HTMLTest.php
index 582d065334..4f2896c9aa 100644
--- a/tests/Core/Generators/HTMLTest.php
+++ b/tests/Core/Generators/HTMLTest.php
@@ -42,7 +42,6 @@ public function testGeneratingInvalidDocsResultsInException()
 
         $generator = new HTML($ruleset);
         $generator->generate();
-
     }
 
 
@@ -71,7 +70,6 @@ public function testDocs($standard, $pathToExpected)
 
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
-
     }
 
 
@@ -96,7 +94,6 @@ public static function dataDocs()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.html',
             ],
         ];
-
     }
 
 
@@ -126,7 +123,6 @@ public function testDocSpecifics($sniffs, $pathToExpected)
 
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
-
     }
 
 
@@ -251,7 +247,6 @@ public static function dataDocSpecifics()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.html',
             ],
         ];
-
     }
 
 
@@ -277,7 +272,6 @@ public function testAnchorLinks()
 
         $generator = new HTMLDouble($ruleset);
         $generator->generate();
-
     }
 
 
@@ -307,7 +301,6 @@ public function testFooter()
             // PHPUnit < 9.1.0.
             $this->assertRegExp($regex, $footer);
         }
-
     }
 
 
@@ -332,7 +325,6 @@ public function testFooterResetsErrorReportingToOriginalSetting()
         $generator->getRealFooter();
 
         $this->assertSame($expected, error_reporting());
-
     }
 
 
@@ -372,7 +364,6 @@ public function testFooterDoesntThrowWarningOnMissingTimezone()
 
         // Reset the timezone to its original state.
         ini_set('date.timezone', $originalIni);
-
     }
 
 
diff --git a/tests/Core/Generators/MarkdownTest.php b/tests/Core/Generators/MarkdownTest.php
index 802d0c4c3a..68631932b7 100644
--- a/tests/Core/Generators/MarkdownTest.php
+++ b/tests/Core/Generators/MarkdownTest.php
@@ -42,7 +42,6 @@ public function testGeneratingInvalidDocsResultsInException()
 
         $generator = new Markdown($ruleset);
         $generator->generate();
-
     }
 
 
@@ -71,7 +70,6 @@ public function testDocs($standard, $pathToExpected)
 
         $generator = new MarkdownDouble($ruleset);
         $generator->generate();
-
     }
 
 
@@ -96,7 +94,6 @@ public static function dataDocs()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.md',
             ],
         ];
-
     }
 
 
@@ -126,7 +123,6 @@ public function testDocSpecifics($sniffs, $pathToExpected)
 
         $generator = new MarkdownDouble($ruleset);
         $generator->generate();
-
     }
 
 
@@ -251,7 +247,6 @@ public static function dataDocSpecifics()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.md',
             ],
         ];
-
     }
 
 
@@ -279,7 +274,6 @@ public function testFooter()
             // PHPUnit < 9.1.0.
             $this->assertRegExp($regex, $footer);
         }
-
     }
 
 
@@ -304,7 +298,6 @@ public function testFooterResetsErrorReportingToOriginalSetting()
         $generator->getRealFooter();
 
         $this->assertSame($expected, error_reporting());
-
     }
 
 
@@ -344,7 +337,6 @@ public function testFooterDoesntThrowWarningOnMissingTimezone()
 
         // Reset the timezone to its original state.
         ini_set('date.timezone', $originalIni);
-
     }
 
 
diff --git a/tests/Core/Generators/TextTest.php b/tests/Core/Generators/TextTest.php
index 4ed723a824..88285bb478 100644
--- a/tests/Core/Generators/TextTest.php
+++ b/tests/Core/Generators/TextTest.php
@@ -48,7 +48,6 @@ public function testDocs($standard, $pathToExpected)
 
         $generator = new Text($ruleset);
         $generator->generate();
-
     }
 
 
@@ -73,7 +72,6 @@ public static function dataDocs()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputStructureDocs.txt',
             ],
         ];
-
     }
 
 
@@ -103,7 +101,6 @@ public function testDocSpecifics($sniffs, $pathToExpected)
 
         $generator = new Text($ruleset);
         $generator->generate();
-
     }
 
 
@@ -228,7 +225,6 @@ public static function dataDocSpecifics()
                 'pathToExpected' => __DIR__ . '/Expectations/ExpectedOutputInvalidStandardNoContent.txt',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Reporter/MagicMethodsTest.php b/tests/Core/Reporter/MagicMethodsTest.php
index 5d209b2734..22e0d6ed26 100644
--- a/tests/Core/Reporter/MagicMethodsTest.php
+++ b/tests/Core/Reporter/MagicMethodsTest.php
@@ -35,7 +35,6 @@ public function testMagicIssetReturnsFalseForUnknownProperty()
         $reporter = new Reporter(new ConfigDouble());
 
         $this->assertFalse(isset($reporter->unknown));
-
     }
 
 
@@ -50,7 +49,6 @@ public function testMagicGetThrowsExceptionForUnsupportedProperty()
         $this->expectExceptionMessage('ERROR: access requested to unknown property "Reporter::$invalid"');
 
         (new Reporter(new ConfigDouble()))->invalid;
-
     }
 
 
@@ -78,7 +76,6 @@ public function testMagicGetReturnsValueForSupportedProperty($propertyName, $set
 
         $this->assertTrue(isset($reporter->$propertyName));
         $this->assertSame($expectedValue, $reporter->$propertyName);
-
     }
 
 
@@ -111,7 +108,6 @@ public static function dataMagicGetReturnsValueForSupportedProperty()
                 'expectedValue' => 4,
             ],
         ];
-
     }
 
 
@@ -127,7 +123,6 @@ public function testMagicSetThrowsException()
 
         $reporter = new Reporter(new ConfigDouble());
         $reporter->totalFixable = 10;
-
     }
 
 
@@ -143,7 +138,6 @@ public function testMagicUnsetThrowsException()
 
         $reporter = new Reporter(new ConfigDouble());
         unset($reporter->totalFixed);
-
     }
 
 
diff --git a/tests/Core/Ruleset/AbstractRulesetTestCase.php b/tests/Core/Ruleset/AbstractRulesetTestCase.php
index c9616321dc..f66c8d2b56 100644
--- a/tests/Core/Ruleset/AbstractRulesetTestCase.php
+++ b/tests/Core/Ruleset/AbstractRulesetTestCase.php
@@ -33,7 +33,6 @@ protected function assertXObjectHasProperty($propertyName, $object, $message = '
             // PHPUnit < 9.6.11.
             $this->assertObjectHasAttribute($propertyName, $object, $message);
         }
-
     }
 
 
@@ -55,7 +54,6 @@ protected function assertXObjectNotHasProperty($propertyName, $object, $message
             // PHPUnit < 9.6.11.
             $this->assertObjectNotHasAttribute($propertyName, $object, $message);
         }
-
     }
 
 
@@ -71,7 +69,6 @@ protected function expectRuntimeExceptionMessage($message)
     {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($message);
-
     }
 
 
@@ -93,7 +90,6 @@ protected function expectRuntimeExceptionRegex($regex)
             $this->expectException(RuntimeException::class);
             $this->expectExceptionMessageRegExp($regex);
         }
-
     }
 
 
diff --git a/tests/Core/Ruleset/ConstructorTest.php b/tests/Core/Ruleset/ConstructorTest.php
index fe88569e16..606af9e040 100644
--- a/tests/Core/Ruleset/ConstructorTest.php
+++ b/tests/Core/Ruleset/ConstructorTest.php
@@ -39,7 +39,6 @@ public function testHandlingStandardsPassedViaCLI($cliArgs, $expected)
         $ruleset = new Ruleset($config);
 
         $this->assertSame($expected, $ruleset->name);
-
     }
 
 
@@ -71,7 +70,6 @@ public static function dataHandlingStandardsPassedViaCLI()
                 'expected' => 'TestStandard',
             ],
         ];
-
     }
 
 
@@ -101,7 +99,6 @@ 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');
         }
-
     }
 
 
@@ -161,7 +158,6 @@ public static function dataStandardsAreRegisteredWithAutoloader()
         ];
 
         return $data;
-
     }
 
 
@@ -189,7 +185,6 @@ public function testCachingVersusRestrictions($cliArgs, $cache, $expected)
         sort($actual);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -267,7 +262,6 @@ public static function dataCachingVersusRestrictions()
              */
 
         ];
-
     }
 
 
@@ -285,7 +279,6 @@ public function testNoSniffsRegisteredException()
         $this->expectRuntimeExceptionMessage($message);
 
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/DisplayCachedMessagesTest.php b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
index c7ee39e14b..3d86ad16d6 100644
--- a/tests/Core/Ruleset/DisplayCachedMessagesTest.php
+++ b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
@@ -44,7 +44,6 @@ public function testDisplayCachedMessagesStaysSilentWithoutErrors()
         $this->invokeDisplayCachedMessages($ruleset);
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -66,7 +65,6 @@ public function testBlockingErrorsAreDisplayedViaAnException($messages, $expecte
         $this->expectRuntimeExceptionMessage($expected);
 
         $this->invokeDisplayCachedMessages($ruleset);
-
     }
 
 
@@ -109,7 +107,6 @@ public static function dataBlockingErrorsAreDisplayedViaAnException()
                 // phpcs:enable
             ],
         ];
-
     }
 
 
@@ -133,7 +130,6 @@ public function testNonBlockingErrorsGenerateOutput($messages, $expected)
         $this->invokeDisplayCachedMessages($ruleset);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -174,7 +170,6 @@ public static function dataNonBlockingErrorsGenerateOutput()
                 // phpcs:enable
             ],
         ];
-
     }
 
 
@@ -199,7 +194,6 @@ public function testBlockingErrorsAlwaysShow($configArgs)
         $this->expectRuntimeExceptionMessage('ERROR: ' . $message . PHP_EOL);
 
         $this->invokeDisplayCachedMessages($ruleset);
-
     }
 
 
@@ -223,7 +217,6 @@ public function testNonBlockingErrorsDoNotShowUnderSpecificCircumstances($config
         $this->invokeDisplayCachedMessages($ruleset);
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -254,7 +247,6 @@ public static function dataSelectiveDisplayOfMessages()
         }
 
         return $data;
-
     }
 
 
@@ -273,7 +265,6 @@ private function getPlainRuleset()
         }
 
         return $ruleset;
-
     }
 
 
@@ -296,7 +287,6 @@ private function mockCachedMessages(Ruleset $ruleset, $messages)
         }
 
         (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false);
-
     }
 
 
@@ -313,7 +303,6 @@ private function invokeDisplayCachedMessages(Ruleset $ruleset)
         (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(true);
         $reflMethod->invoke($ruleset);
         (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(false);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
index 6312453519..0dbd4ff9e3 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
@@ -37,7 +37,6 @@ final class ExpandRulesetReferenceHomePathTest extends AbstractRulesetTestCase
     public static function setUpBeforeClass(): void
     {
         self::$homepath = getenv('HOME');
-
     }
 
 
@@ -54,7 +53,6 @@ public static function tearDownAfterClass(): void
             // Remove the environment variable as it didn't exist before.
             putenv('HOME');
         }
-
     }
 
 
@@ -67,7 +65,6 @@ protected function setUp(): void
     {
         $fakeHomePath = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'FakeHomePath';
         putenv("HOME=$fakeHomePath");
-
     }
 
 
@@ -87,7 +84,6 @@ public function testHomePathRefGetsExpandedAndFindsSniff()
         $expected = ['MyStandard.Category.Valid' => 'FakeHomePath\\MyStandard\\Sniffs\\Category\\ValidSniff'];
 
         $this->assertSame($expected, $ruleset->sniffCodes);
-
     }
 
 
@@ -108,7 +104,6 @@ public function testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid()
         $this->expectRuntimeExceptionMessage($exceptionMessage);
 
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
index d7be439d02..0abdee32ab 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
@@ -37,7 +37,6 @@ public function testInternalRefDoesNotGetExpanded()
         $expected = ['Generic.PHP.BacktickOperator' => 'PHP_CodeSniffer\\Standards\\Generic\\Sniffs\\PHP\\BacktickOperatorSniff'];
 
         $this->assertSame($expected, $ruleset->sniffCodes);
-
     }
 
 
@@ -64,7 +63,6 @@ public function testInternalStandardIsNotSupported()
 
         // This assertion will only take effect for PHPUnit 10+.
         $this->assertSame($expected, $ruleset->sniffCodes);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
index 918ede91ce..3d8af2b974 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
@@ -41,7 +41,6 @@ public function testRulesetRelativePathReferences()
         ];
 
         $this->assertSame($expected, $ruleset->sniffCodes);
-
     }
 
 
@@ -66,7 +65,6 @@ public function testUnresolvableReferenceThrowsException($standard, $replacement
         $this->expectRuntimeExceptionMessage(sprintf($exceptionMessage, $replacement));
 
         new Ruleset($config);
-
     }
 
 
@@ -127,7 +125,6 @@ public static function dataUnresolvableReferenceThrowsException()
         }
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
index 116ac50dbb..7e3d3d7e05 100644
--- a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
+++ b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
@@ -60,7 +60,6 @@ public function testExpandSniffDirectory()
         ksort($actual);
 
         $this->assertSame($expectedSniffCodes, $actual, 'Registered sniffs do not match expectation');
-
     }
 
 
diff --git a/tests/Core/Ruleset/ExplainTest.php b/tests/Core/Ruleset/ExplainTest.php
index e89d69276a..953ffd4cf9 100644
--- a/tests/Core/Ruleset/ExplainTest.php
+++ b/tests/Core/Ruleset/ExplainTest.php
@@ -53,7 +53,6 @@ public function testExplain()
         $this->expectOutputString($expected);
 
         $ruleset->explain();
-
     }
 
 
@@ -88,7 +87,6 @@ public function testExplainAlwaysDisplaysCompleteSniffName()
         $this->expectOutputString($expected);
 
         $ruleset->explain();
-
     }
 
 
@@ -115,7 +113,6 @@ public function testExplainSingleSniff()
         $this->expectOutputString($expected);
 
         $ruleset->explain();
-
     }
 
 
@@ -161,7 +158,6 @@ public function testExplainCustomRuleset()
         $this->expectOutputString($expected);
 
         $ruleset->explain();
-
     }
 
 
@@ -206,7 +202,6 @@ public function testExplainWithDeprecatedSniffs()
         $this->expectOutputString($expected);
 
         $ruleset->explain();
-
     }
 
 
diff --git a/tests/Core/Ruleset/GetIgnorePatternsTest.php b/tests/Core/Ruleset/GetIgnorePatternsTest.php
index 177fb56862..107b960ab9 100644
--- a/tests/Core/Ruleset/GetIgnorePatternsTest.php
+++ b/tests/Core/Ruleset/GetIgnorePatternsTest.php
@@ -40,7 +40,6 @@ public static function setUpBeforeClass(): void
         $standard      = __DIR__ . '/GetIgnorePatternsTest.xml';
         $config        = new ConfigDouble(["--standard=$standard"]);
         self::$ruleset = new Ruleset($config);
-
     }
 
 
@@ -57,7 +56,6 @@ public static function setUpBeforeClass(): void
     public function testGetIgnorePatterns($listener, $expected)
     {
         $this->assertSame($expected, self::$ruleset->getIgnorePatterns($listener));
-
     }
 
 
@@ -102,7 +100,6 @@ public static function dataGetIgnorePatterns()
                 'expected' => [],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/GetIncludePatternsTest.php b/tests/Core/Ruleset/GetIncludePatternsTest.php
index e75e7f0a4a..79df82c7ff 100644
--- a/tests/Core/Ruleset/GetIncludePatternsTest.php
+++ b/tests/Core/Ruleset/GetIncludePatternsTest.php
@@ -40,7 +40,6 @@ public static function setUpBeforeClass(): void
         $standard      = __DIR__ . '/GetIncludePatternsTest.xml';
         $config        = new ConfigDouble(["--standard=$standard"]);
         self::$ruleset = new Ruleset($config);
-
     }
 
 
@@ -57,7 +56,6 @@ public static function setUpBeforeClass(): void
     public function testGetIncludePatterns($listener, $expected)
     {
         $this->assertSame($expected, self::$ruleset->getIncludePatterns($listener));
-
     }
 
 
@@ -99,7 +97,6 @@ public static function dataGetIncludePatterns()
                 'expected' => [],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
index 3cdd27a003..69be173c03 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
@@ -63,7 +63,6 @@ public function testBrokenNamingConventions()
 
         // This assertion will only take effect for PHPUnit 10+.
         $this->assertSame($expectedSniffCodes, $ruleset->sniffCodes, 'Registered sniffs do not match expectation');
-
     }
 
 
diff --git a/tests/Core/Ruleset/PopulateTokenListenersTest.php b/tests/Core/Ruleset/PopulateTokenListenersTest.php
index 9f0c18afde..ea47a16c09 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersTest.php
@@ -45,7 +45,6 @@ protected function setUp(): void
             $config        = new ConfigDouble(["--standard=$standard"]);
             self::$ruleset = new Ruleset($config);
         }
-
     }
 
 
@@ -69,7 +68,6 @@ 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');
-
     }
 
 
@@ -90,7 +88,6 @@ public function testSniffWithRegisterMethodReturningEmptyArrayIsSilentlyIgnored(
                 sprintf('Found the %s sniff registered for token %s', $target, Tokens::tokenName($token))
             );
         }
-
     }
 
 
@@ -115,7 +112,6 @@ public function testRegistersSniffsToListenToTokens($sniffClass, $expectedCount)
         }
 
         $this->assertSame($expectedCount, $counter);
-
     }
 
 
@@ -154,7 +150,6 @@ public static function dataSniffListensToTokenss()
                 'expectedCount' => 0,
             ],
         ];
-
     }
 
 
@@ -174,7 +169,6 @@ public function testRegistersWhenADeprecatedSniffIsLoaded()
         // There are other tests which test the deprecated sniff handling in more detail.
         $this->assertIsArray($actualValue);
         $this->assertCount(1, $actualValue);
-
     }
 
 
@@ -195,7 +189,6 @@ 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");
-
     }
 
 
@@ -219,7 +212,6 @@ public function testTriggersPropertySettingWhenPropertiesProvided($sniffClass, $
 
         // Verify the property has been set.
         $this->assertSame($expected, $sniffObject->$propertyName, "Property on sniff class $sniffClass set to unexpected value");
-
     }
 
 
@@ -249,7 +241,6 @@ public static function dataTriggersPropertySettingWhenPropertiesProvided()
                 'expected'     => '8',
             ],
         ];
-
     }
 
 
@@ -296,7 +287,6 @@ public function testSetsClassAndSourceIndexes()
                 );
             }//end foreach
         }//end foreach
-
     }
 
 
@@ -331,7 +321,6 @@ public function testSetsIncludePatternsToEmptyArrayByDefault()
                 );
             }
         }//end foreach
-
     }
 
 
@@ -366,7 +355,6 @@ public function testSetsIgnorePatternsToEmptyArrayByDefault()
                 );
             }
         }//end foreach
-
     }
 
 
@@ -413,7 +401,6 @@ 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))
         );
-
     }
 
 
@@ -443,7 +430,6 @@ public static function dataSetsIncludeAndIgnorePatterns()
                 'patternType' => 'ignore',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
index f362352dd9..af19a04767 100644
--- a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
+++ b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
@@ -36,7 +36,6 @@ public function testInvalidTypeHandling()
         $this->expectRuntimeExceptionMessage($message);
 
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
index 83989c3bc2..5953c64db6 100644
--- a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
@@ -43,7 +43,6 @@ protected function setUp(): void
             $config        = new ConfigDouble(["--standard=$standard"]);
             self::$ruleset = new Ruleset($config);
         }
-
     }
 
 
@@ -75,7 +74,6 @@ public function testShouldProcessSeverityCsonly()
         // Verify that the CBF-only severity directive is NOT applied.
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
-
     }
 
 
@@ -106,7 +104,6 @@ public function testShouldProcessSeverityCbfonly()
         // Verify that the CBF-only severity directive IS applied.
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertRulesetPropertySame(4, $sniffCode, $key);
-
     }
 
 
@@ -135,7 +132,6 @@ public function testShouldProcessTypeCsonly()
         // Verify that the CBF-only type directive is NOT applied.
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
-
     }
 
 
@@ -166,7 +162,6 @@ public function testShouldProcessTypeCbfonly()
         // Verify that the CBF-only type directive IS applied.
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertRulesetPropertySame('error', $sniffCode, $key);
-
     }
 
 
@@ -195,7 +190,6 @@ public function testShouldProcessMessageCsonly()
         // Verify that the CBF-only message directive is NOT applied.
         $sniffCode = 'PSR2.Namespaces.NamespaceDeclaration';
         $this->assertNotHasRulesetDirective($sniffCode, $key);
-
     }
 
 
@@ -229,7 +223,6 @@ 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);
-
     }
 
 
@@ -260,7 +253,6 @@ 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");
-
     }
 
 
@@ -293,7 +285,6 @@ 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");
-
     }
 
 
@@ -324,7 +315,6 @@ 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");
-
     }
 
 
@@ -357,7 +347,6 @@ 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");
-
     }
 
 
@@ -393,7 +382,6 @@ public function testShouldProcessPropertiesCsonly()
 
         $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName;
         $this->assertSame($propertyDefault, $actualValue, 'cbf-only property change directive was applied');
-
     }
 
 
@@ -431,7 +419,6 @@ public function testShouldProcessPropertiesCbfonly()
 
         $actualValue = self::$ruleset->sniffs[$cbfSniffClass]->$propertyName;
         $this->assertSame($propertyChanged, $actualValue, 'cbf-only property change directive not applied');
-
     }
 
 
@@ -473,7 +460,6 @@ public function testShouldProcessPropertyCsonly()
 
         $this->assertXObjectHasProperty($propertyName, $sniffObject);
         $this->assertSame($expectedDefault, $sniffObject->$propertyName, 'cbf-only property change directive was applied');
-
     }
 
 
@@ -517,7 +503,6 @@ public function testShouldProcessPropertyCbfonly()
 
         $this->assertXObjectHasProperty($propertyName, $sniffObject);
         $this->assertSame($expected, $sniffObject->$propertyName, 'cbf-only property change directive not applied');
-
     }
 
 
@@ -545,7 +530,6 @@ public function testShouldProcessElementCsonly()
         ];
 
         $this->verifyShouldProcessElement($expected);
-
     }
 
 
@@ -575,7 +559,6 @@ public function testShouldProcessElementCbfonly()
         ];
 
         $this->verifyShouldProcessElement($expected);
-
     }
 
 
@@ -601,7 +584,6 @@ private function verifyShouldProcessElement($expected)
         // Verify the value.
         $actualValue = $sniffObject->$propertyName;
         $this->assertSame($expected, $actualValue, 'Selective element directives not applied correctly');
-
     }
 
 
@@ -618,7 +600,6 @@ 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");
-
     }
 
 
@@ -638,7 +619,6 @@ private function assertNotHasRulesetDirective($sniffCode, $key)
         ) {
             $this->fail("Directive $key is registered for sniff $sniffCode");
         }
-
     }
 
 
@@ -657,7 +637,6 @@ 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");
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
index 40e4490ce4..af69eaf861 100644
--- a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
@@ -81,7 +81,6 @@ public function testShouldProcessAutoloadCsonly()
             $diff,
             'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was loaded, while it shouldn\'t have been'
         );
-
     }
 
 
@@ -139,7 +138,6 @@ public function testShouldProcessAutoloadCbfonly()
             $diff,
             'ProcessRulesetAutoloadLoadPhpcbfOnly.php autoload file was not loaded'
         );
-
     }
 
 
@@ -157,7 +155,6 @@ public function testFileNotFoundException()
         $standard = __DIR__ . '/ProcessRulesetAutoloadFileNotFoundTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
index e87d2dc0e7..cbc1540b96 100644
--- a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
@@ -47,7 +47,6 @@ public function testBrokenRulesetEmptyFile()
         $this->expectRuntimeExceptionRegex($regex);
 
         new Ruleset($config);
-
     }
 
 
@@ -67,7 +66,6 @@ public function testBrokenRulesetSingleError()
         $this->expectRuntimeExceptionRegex($regex);
 
         new Ruleset($config);
-
     }
 
 
@@ -89,7 +87,6 @@ public function testBrokenRulesetMultiError()
         $this->expectRuntimeExceptionRegex($regex);
 
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
index 9470b8dd42..4ed78001f6 100644
--- a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
@@ -48,7 +48,6 @@ protected function setUp(): void
             self::$config = new ConfigDouble(["--standard=$standard"]);
             new Ruleset(self::$config);
         }
-
     }
 
 
@@ -66,7 +65,6 @@ public static function tearDownAfterClass(): void
         if (isset(self::$config) === true) {
             self::$config->__destruct();
         }
-
     }
 
 
@@ -88,7 +86,6 @@ public static function tearDownAfterClass(): void
     public function testCliArgs($name, $expected)
     {
         $this->assertSame($expected, self::$config->{$name});
-
     }
 
 
@@ -152,7 +149,6 @@ public static function dataCliArgs()
                 'expected' => 120,
             ],
         ];
-
     }
 
 
@@ -173,7 +169,6 @@ public function testCliArgsWithPaths($name, $expected)
         $actual   = $this->normalizeSlashes(self::$config->{$name});
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -210,7 +205,6 @@ public static function dataCliArgsWithPaths()
         }
 
         return $data;
-
     }
 
 
@@ -232,7 +226,6 @@ private function normalizeSlashes($path)
         }
 
         return str_replace(DIRECTORY_SEPARATOR, '/', $path);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
index 80ca3ccd47..0029afc26d 100644
--- a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
@@ -49,7 +49,6 @@ protected function setUp(): void
             self::$config = new ConfigDouble(["--standard=$standardA,$standardB"]);
             new Ruleset(self::$config);
         }
-
     }
 
 
@@ -67,7 +66,6 @@ public static function tearDownAfterClass(): void
         if (isset(self::$config) === true) {
             self::$config->__destruct();
         }
-
     }
 
 
@@ -89,7 +87,6 @@ public static function tearDownAfterClass(): void
     public function testConfigDirectives($name, $expected)
     {
         $this->assertSame($expected, self::$config->getConfigData($name));
-
     }
 
 
@@ -146,7 +143,6 @@ public static function dataConfigDirectives()
                 'expected' => 'grandchild B',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
index f85d3ef929..bbaf583d87 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
@@ -64,7 +64,6 @@ public static function setUpBeforeClass(): void
                 self::$originalIniValues[$name] = $value;
             }
         }
-
     }
 
 
@@ -83,7 +82,6 @@ protected function setUp(): void
 
             self::$initialized = true;
         }
-
     }
 
 
@@ -101,7 +99,6 @@ public static function tearDownAfterClass(): void
 
             ini_set($name, $value);
         }
-
     }
 
 
@@ -123,7 +120,6 @@ public static function tearDownAfterClass(): void
     public function testIniDirectives($name, $expected)
     {
         $this->assertSame($expected, ini_get($name));
-
     }
 
 
@@ -168,7 +164,6 @@ public static function dataIniDirectives()
                 'expected' => 'grandchild A',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
index 22dff3e068..43d0ef0d50 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
@@ -47,7 +47,6 @@ protected function tearDown(): void
         if (is_string($this->originalValue) === true) {
             @ini_set($this->currentOption, $this->originalValue);
         }
-
     }
 
 
@@ -67,7 +66,6 @@ public function testIniValueIsUpdated()
         new Ruleset(new ConfigDouble(['.', '--standard=' . __DIR__ . '/IniSetSuccessTest.xml']));
 
         $this->assertSame($expected, ini_get($this->currentOption));
-
     }
 
 
@@ -102,7 +100,6 @@ 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');
-
     }
 
 
@@ -132,7 +129,6 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
                 'expected' => '200',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
index 121dd8141b..a0df87cb2c 100644
--- a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
@@ -62,7 +62,6 @@ public static function setUpBeforeClass(): void
                 self::$originalIniValues[$name] = $value;
             }
         }
-
     }
 
 
@@ -79,7 +78,6 @@ protected function setUp(): void
             self::$config  = new ConfigDouble(["--standard=$standard"]);
             self::$ruleset = new Ruleset(self::$config);
         }
-
     }
 
 
@@ -105,7 +103,6 @@ public static function tearDownAfterClass(): void
 
             ini_set($name, $value);
         }
-
     }
 
 
@@ -124,7 +121,6 @@ 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.');
-
     }
 
 
@@ -145,7 +141,6 @@ 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.');
-
     }
 
 
@@ -172,7 +167,6 @@ 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.');
-
     }
 
 
@@ -201,7 +195,6 @@ 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.');
-
     }
 
 
@@ -222,7 +215,6 @@ 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.');
-
     }
 
 
@@ -244,7 +236,6 @@ 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.');
-
     }
 
 
@@ -266,7 +257,6 @@ public function testShouldProcessExcludePatternCsonly()
         ];
 
         $this->assertSame($expected, self::$ruleset->ignorePatterns);
-
     }
 
 
@@ -290,7 +280,6 @@ public function testShouldProcessExcludePatternCbfonly()
         ];
 
         $this->assertSame($expected, self::$ruleset->ignorePatterns);
-
     }
 
 
@@ -309,7 +298,6 @@ 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);
-
     }
 
 
@@ -330,7 +318,6 @@ 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);
-
     }
 
 
@@ -353,7 +340,6 @@ public function testShouldProcessRuleExcludeCsonly()
         ];
 
         $this->assertSame($expected, self::$ruleset->ruleset);
-
     }
 
 
@@ -378,7 +364,6 @@ public function testShouldProcessRuleExcludeCbfonly()
         ];
 
         $this->assertSame($expected, self::$ruleset->ruleset);
-
     }
 
 
diff --git a/tests/Core/Ruleset/ProcessRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetTest.php
index 6b985f737a..44a8da6e37 100644
--- a/tests/Core/Ruleset/ProcessRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetTest.php
@@ -38,7 +38,6 @@ public function testSniffsFileNotDirectory()
         $expected = ['Generic.PHP.BacktickOperator' => 'PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\BacktickOperatorSniff'];
 
         $this->assertSame($expected, $ruleset->sniffCodes);
-
     }
 
 
@@ -84,7 +83,6 @@ public function testAutoExpandSniffsDirectory()
         ksort($actual);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -111,7 +109,6 @@ public function testExcludeSniffGroup()
         ksort($actual);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -139,7 +136,6 @@ public function testIniWithoutValue()
         }
 
         $this->assertSame('1', $actualValue);
-
     }
 
 
@@ -168,7 +164,6 @@ 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");
-
     }
 
 
@@ -202,7 +197,6 @@ 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");
-
     }
 
 
@@ -219,7 +213,6 @@ public function testRuleWithoutRefIsIgnored()
         $sniffCode = 'Generic.Metrics.CyclomaticComplexity';
         $this->assertArrayNotHasKey($sniffCode, $ruleset->sniffCodes, "Sniff $sniffCode registered");
         $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted");
-
     }
 
 
@@ -239,7 +232,6 @@ public function testRuleExcludeWithoutNameIsIgnored()
 
         $sniffCode = 'Generic.PHP.BacktickOperator.Found';
         $this->assertArrayNotHasKey($sniffCode, $ruleset->ruleset, "Sniff $sniffCode adjusted");
-
     }
 
 
@@ -260,7 +252,6 @@ private function getMiscRuleset()
         }
 
         return $ruleset;
-
     }
 
 
diff --git a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
index db7d2a29c2..eeff3fd5ce 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
@@ -47,7 +47,6 @@ public function testUsingOldSchoolArrayFormatThrowsError()
         $standard = __DIR__ . '/PropertyTypeHandlingOldArrayFormatTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/PropertyTypeHandlingTest.php b/tests/Core/Ruleset/PropertyTypeHandlingTest.php
index a11bfcbf9d..db3e5d8a65 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingTest.php
@@ -55,7 +55,6 @@ public function testTypeHandlingWhenSetViaRuleset($propertyName, $expected)
         $sniffObject = $this->getSniffObjectForRuleset();
 
         $this->assertSame($expected, $sniffObject->$propertyName);
-
     }
 
 
@@ -74,7 +73,6 @@ public function testTypeHandlingWhenSetInline($propertyName, $expected)
         $sniffObject = $this->getSniffObjectAfterProcessingFile();
 
         $this->assertSame($expected, $sniffObject->$propertyName);
-
     }
 
 
@@ -189,7 +187,6 @@ public static function dataTypeHandling()
                 'expected'     => [null],
             ],
         ];
-
     }
 
 
@@ -296,7 +293,6 @@ public static function dataArrayPropertyExtending()
                 'expected'     => 'some value',
             ],
         ];
-
     }
 
 
@@ -326,7 +322,6 @@ private function getSniffObjectForRuleset()
         }
 
         return $sniffObject;
-
     }
 
 
@@ -363,7 +358,6 @@ private function getSniffObjectAfterProcessingFile()
         }
 
         return $sniffObject;
-
     }
 
 
diff --git a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
index c095aef43d..7655429e76 100644
--- a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
@@ -36,7 +36,6 @@ public function testNoNoticesForSniffsImplementingInterface()
         $this->expectOutputString('');
 
         new Ruleset($config);
-
     }
 
 
@@ -58,7 +57,6 @@ public function testErrorWhenSniffDoesntImplementInterface()
         $this->expectRuntimeExceptionMessage($expected);
 
         new Ruleset($config);
-
     }
 
 
diff --git a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
index e4d1e7acad..d3b714a370 100644
--- a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
@@ -39,7 +39,6 @@ public static function setUpBeforeClass(): void
         // Set up the ruleset.
         $standard     = __DIR__ . '/RegisterSniffsRemovedTokenizersTest.xml';
         self::$config = new ConfigDouble(["--standard=$standard"]);
-
     }
 
 
@@ -66,7 +65,6 @@ public function testUnsupportedTokenizersTriggerError($expected)
         $this->expectRuntimeExceptionRegex($expected);
 
         new Ruleset(self::$config);
-
     }
 
 
@@ -99,7 +97,6 @@ public static function dataUnsupportedTokenizersTriggerError()
                 'expected' => sprintf($message, 'TestStandard.SupportedTokenizers.ListensForUnrecognizedTokenizers', 'SCSS, TypeScript'),
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/RegisterSniffsTest.php b/tests/Core/Ruleset/RegisterSniffsTest.php
index 6c7cb8d250..22351bb1a9 100644
--- a/tests/Core/Ruleset/RegisterSniffsTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsTest.php
@@ -82,7 +82,6 @@ public static function setUpBeforeClass(): void
         $standardsDir .= 'src' . DIRECTORY_SEPARATOR . 'Standards' . DIRECTORY_SEPARATOR;
 
         self::$psr1SniffAbsolutePaths = self::relativeToAbsoluteSniffFiles($standardsDir, self::$psr1SniffFiles);
-
     }
 
 
@@ -104,7 +103,6 @@ public static function relativeToAbsoluteSniffFiles($baseDir, $relativePaths)
         }
 
         return $fileList;
-
     }
 
 
@@ -117,7 +115,6 @@ protected function setUp(): void
     {
         // Clear out the Ruleset::$sniffs property.
         self::$ruleset->sniffs = [];
-
     }
 
 
@@ -133,7 +130,6 @@ 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));
-
     }
 
 
@@ -162,7 +158,6 @@ public function testRegisteredSniffsWithRestrictions()
         sort($actual);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -193,7 +188,6 @@ public function testRegisteredSniffsWithExclusions()
         sort($actual);
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -226,7 +220,6 @@ public function testRegisteredSniffsBothRestrictionsAndExclusions()
         self::$ruleset->registerSniffs(self::$psr1SniffAbsolutePaths, $restrictions, $exclusions);
 
         $this->assertSame($expected, array_keys(self::$ruleset->sniffs));
-
     }
 
 
@@ -254,7 +247,6 @@ 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));
-
     }
 
 
@@ -282,7 +274,6 @@ 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));
-
     }
 
 
diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
index 2eff690833..6fbc2e8d46 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
@@ -71,7 +71,6 @@ protected function setUp(): void
         // Initialize the config and ruleset objects for the test.
         $config        = new ConfigDouble(["--standard={$this->standard}"]);
         $this->ruleset = new Ruleset($config);
-
     }
 
 
@@ -83,7 +82,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         file_put_contents($this->standard, $this->contents);
-
     }
 
 
@@ -108,7 +106,6 @@ public function testLinuxStylePathRuleInclusion()
             '10',
             $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff']->spacing
         );
-
     }
 
 
diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
index ed7bca10d9..91f11f6076 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
@@ -68,7 +68,6 @@ protected function setUp(): void
         // Initialize the config and ruleset objects for the test.
         $config        = new ConfigDouble(["--standard={$this->standard}"]);
         $this->ruleset = new Ruleset($config);
-
     }
 
 
@@ -80,7 +79,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         file_put_contents($this->standard, $this->contents);
-
     }
 
 
@@ -105,7 +103,6 @@ public function testWindowsStylePathRuleInclusion()
             '10',
             $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterCastSniff']->spacing
         );
-
     }
 
 
diff --git a/tests/Core/Ruleset/RuleInclusionTest.php b/tests/Core/Ruleset/RuleInclusionTest.php
index d18416f3d1..c5c90545a9 100644
--- a/tests/Core/Ruleset/RuleInclusionTest.php
+++ b/tests/Core/Ruleset/RuleInclusionTest.php
@@ -75,7 +75,6 @@ protected function setUp(): void
             $config        = new ConfigDouble(["--standard=$standard"]);
             self::$ruleset = new Ruleset($config);
         }//end if
-
     }
 
 
@@ -87,7 +86,6 @@ protected function setUp(): void
     public function tearDown(): void
     {
         file_put_contents(self::$standard, self::$contents);
-
     }
 
 
@@ -99,7 +97,6 @@ public function tearDown(): void
     public function testHasSniffCodes()
     {
         $this->assertCount(49, self::$ruleset->sniffCodes);
-
     }
 
 
@@ -117,7 +114,6 @@ public function testRegisteredSniffCodes($key, $value)
     {
         $this->assertArrayHasKey($key, self::$ruleset->sniffCodes);
         $this->assertSame($value, self::$ruleset->sniffCodes[$key]);
-
     }
 
 
@@ -328,7 +324,6 @@ public static function dataRegisteredSniffCodes()
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
             ],
         ];
-
     }
 
 
@@ -351,7 +346,6 @@ public function testSettingProperties($sniffClass, $propertyName, $expectedValue
 
         $actualValue = self::$ruleset->sniffs[$sniffClass]->$propertyName;
         $this->assertSame($expectedValue, $actualValue);
-
     }
 
 
@@ -418,7 +412,6 @@ public static function dataSettingProperties()
                 'expectedValue' => 10,
             ],
         ];
-
     }
 
 
@@ -437,7 +430,6 @@ public function testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFail
     {
         $this->assertArrayHasKey($sniffClass, self::$ruleset->sniffs, 'Sniff class ' . $sniffClass . ' not listed in registered sniffs');
         $this->assertXObjectNotHasProperty($propertyName, self::$ruleset->sniffs[$sniffClass]);
-
     }
 
 
@@ -468,7 +460,6 @@ public static function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilen
                 'propertyName' => 'setforsquizfilessniffs',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Ruleset/SetSniffPropertyTest.php b/tests/Core/Ruleset/SetSniffPropertyTest.php
index 3565c75b9a..78e2319303 100644
--- a/tests/Core/Ruleset/SetSniffPropertyTest.php
+++ b/tests/Core/Ruleset/SetSniffPropertyTest.php
@@ -63,7 +63,6 @@ public function testSniffPropertiesGetSetWhenAllowed($name)
         foreach ($properties as $name => $expectedValue) {
             $this->assertSame($expectedValue, $sniffObject->$name, 'Property value not set to expected value');
         }
-
     }
 
 
@@ -81,7 +80,6 @@ public static function dataSniffPropertiesGetSetWhenAllowed()
             'Property allowed as sniff extends stdClass'         => ['AllowedViaStdClass'],
             'Property allowed as sniff has magic __set() method' => ['AllowedViaMagicMethod'],
         ];
-
     }
 
 
@@ -123,7 +121,6 @@ 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);
-
     }
 
 
@@ -142,7 +139,6 @@ public function testSetPropertyThrowsErrorOnInvalidProperty()
         $standard = __DIR__ . '/SetPropertyThrowsErrorOnInvalidPropertyTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
@@ -162,7 +158,6 @@ public function testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
         $standard = __DIR__ . '/SetPropertyNotAllowedViaAttributeTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
@@ -180,7 +175,6 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStand
         $standard = __DIR__ . '/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandardTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
@@ -198,7 +192,6 @@ public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCateg
         $standard = __DIR__ . '/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategoryTest.xml';
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
-
     }
 
 
@@ -231,7 +224,6 @@ 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');
-
     }
 
 
@@ -276,7 +268,6 @@ public function testDirectCallWithNewArrayFormatSetsProperty()
 
         $sniffObject = $ruleset->sniffs[$sniffClass];
         $this->assertSame($propertyValue, $sniffObject->$propertyName, 'Property value not set to expected value');
-
     }
 
 
diff --git a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
index a22d09d5fb..a3f5e2400a 100644
--- a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
+++ b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
@@ -41,7 +41,6 @@ public function testHasSniffDeprecations($standard, $expected)
         $ruleset = new Ruleset($config);
 
         $this->assertSame($expected, $ruleset->hasSniffDeprecations());
-
     }
 
 
@@ -64,7 +63,6 @@ public static function dataHasSniffDeprecations()
                 'expected' => true,
             ],
         ];
-
     }
 
 
@@ -92,7 +90,6 @@ public function testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs =
         $ruleset->showSniffDeprecations();
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -118,7 +115,6 @@ public static function dataDeprecatedSniffsListDoesNotShow()
                 'additionalArgs' => ['-q'],
             ],
         ];
-
     }
 
 
@@ -141,7 +137,6 @@ public function testDeprecatedSniffsListDoesNotShowNeedsCsMode($standard, $addit
         }
 
         $this->testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs);
-
     }
 
 
@@ -160,7 +155,6 @@ public static function dataDeprecatedSniffsListDoesNotShowNeedsCsMode()
                 'additionalArgs' => ['--generator=text'],
             ],
         ];
-
     }
 
 
@@ -186,7 +180,6 @@ public function testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDepre
         $ruleset->showSniffDeprecations();
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -219,7 +212,6 @@ public function testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExc
         $ruleset->showSniffDeprecations();
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -286,7 +278,6 @@ public function testDeprecatedSniffsWarning()
         $ruleset->showSniffDeprecations();
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -318,7 +309,6 @@ public function testReportWidthIsRespected($reportWidth, $expectedOutput)
         $ruleset->showSniffDeprecations();
 
         $this->assertStderrOutputSameString($expectedOutput);
-
     }
 
 
@@ -401,7 +391,6 @@ public static function dataReportWidthIsRespected()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -447,7 +436,6 @@ public function testDeprecatedSniffsAreListedAlphabetically()
             $ruleset->sniffCodes,
             'WithReplacement sniff not registered'
         );
-
     }
 
 
@@ -472,7 +460,6 @@ public function testExceptionIsThrownOnIncorrectlyImplementedInterface($standard
         $ruleset  = new Ruleset($config);
 
         $ruleset->showSniffDeprecations();
-
     }
 
 
@@ -507,7 +494,6 @@ public static function dataExceptionIsThrownOnIncorrectlyImplementedInterface()
                 'exceptionMessage' => 'ERROR: The Fixtures\TestStandard\Sniffs\DeprecatedInvalid\EmptyRemovalVersionSniff::getRemovalVersion() method must return a non-empty string, received ""',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Runner/PrintProgressDotsTest.php b/tests/Core/Runner/PrintProgressDotsTest.php
index f498a96058..3c4509bd22 100644
--- a/tests/Core/Runner/PrintProgressDotsTest.php
+++ b/tests/Core/Runner/PrintProgressDotsTest.php
@@ -44,7 +44,6 @@ public function testProgressDotCs($colors, $code, $sniffs, $expected)
         }
 
         $this->checkProgressDot($colors, $code, $sniffs, $expected);
-
     }
 
 
@@ -106,7 +105,6 @@ public static function dataProgressDotCs()
                 'expected' => "\033[32m" . 'W' . "\033[0m",
             ],
         ];
-
     }
 
 
@@ -131,7 +129,6 @@ public function testProgressDotCbf($colors, $code, $sniffs, $expected)
         }
 
         $this->checkProgressDot($colors, $code, $sniffs, $expected, true);
-
     }
 
 
@@ -181,7 +178,6 @@ public static function dataProgressDotCbf()
                 'expected' => "\033[31m" . 'E' . "\033[0m",
             ],
         ];
-
     }
 
 
@@ -219,7 +215,6 @@ private function checkProgressDot($colors, $code, $sniffs, $expected, $enableFix
         $runner->printProgress($file, 2, 1);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
diff --git a/tests/Core/Runner/PrintProgressTest.php b/tests/Core/Runner/PrintProgressTest.php
index aeae376ae2..cf313e4965 100644
--- a/tests/Core/Runner/PrintProgressTest.php
+++ b/tests/Core/Runner/PrintProgressTest.php
@@ -72,7 +72,6 @@ public static function setUpBeforeClass(): void
         $content = '<?php' . "\n" . '$var = false;' . "\n";
         self::$fileWithoutErrorsOrWarnings = new DummyFile($content, self::$ruleset, self::$config);
         self::$fileWithoutErrorsOrWarnings->process();
-
     }
 
 
@@ -88,7 +87,6 @@ protected function tearDown(): void
 
         // Reset all static properties on the StatusWriter class.
         $this->resetStatusWriterProperties();
-
     }
 
 
@@ -104,7 +102,6 @@ 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();
-
     }
 
 
@@ -124,7 +121,6 @@ public function testNoProgressIsShownWhenDisabled()
         }
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -149,7 +145,6 @@ public function testProgressDotSkippedFiles()
         }
 
         $this->assertStderrOutputSameString('.S.S.S.S.S 10 / 10 (100%)' . PHP_EOL);
-
     }
 
 
@@ -172,7 +167,6 @@ public function testEndOfLineSummary($nrOfFiles, $expected)
         }
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -233,7 +227,6 @@ public static function dataEndOfLineSummary()
             ],
         ];
         // phpcs:enable
-
     }
 
 
diff --git a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
index f666b43c7c..e65dea871a 100644
--- a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
+++ b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
@@ -44,7 +44,6 @@ public function testPhpcs($sourceDir, $extraArgs)
         $runner->runPHPCS();
 
         $this->verifyOutput();
-
     }
 
 
@@ -71,7 +70,6 @@ public function testPhpcbf($sourceDir, $extraArgs)
         $runner->runPHPCBF();
 
         $this->verifyOutput();
-
     }
 
 
@@ -92,7 +90,6 @@ public static function data()
                 'extraArgs' => ['--ignore=/place*\.php'],
             ],
         ];
-
     }
 
 
@@ -118,7 +115,6 @@ private function setupTest($sourceDir, $extraArgs)
         }
 
         $this->expectNoStdoutOutput();
-
     }
 
 
@@ -133,7 +129,6 @@ private function verifyOutput()
         $expected .= 'All specified files were excluded or did not match filtering rules.' . PHP_EOL . PHP_EOL;
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
diff --git a/tests/Core/Runner/RunPHPCSExplainTest.php b/tests/Core/Runner/RunPHPCSExplainTest.php
index 482e1a85fd..66f44122cc 100644
--- a/tests/Core/Runner/RunPHPCSExplainTest.php
+++ b/tests/Core/Runner/RunPHPCSExplainTest.php
@@ -66,7 +66,6 @@ public function testExplainWillExplainEachStandardSeparately()
 
         $runner = new Runner();
         $runner->runPHPCS();
-
     }
 
 
diff --git a/tests/Core/Runner/RunPHPCSGeneratorTest.php b/tests/Core/Runner/RunPHPCSGeneratorTest.php
index e94ee28efe..a3b55b4b32 100644
--- a/tests/Core/Runner/RunPHPCSGeneratorTest.php
+++ b/tests/Core/Runner/RunPHPCSGeneratorTest.php
@@ -65,7 +65,6 @@ public function testGeneratorWillShowEachStandardSeparately()
 
         $runner = new Runner();
         $runner->runPHPCS();
-
     }
 
 
diff --git a/tests/Core/Sniffs/AbstractArraySniffTest.php b/tests/Core/Sniffs/AbstractArraySniffTest.php
index 2e7580f970..e2aa27d4a0 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTest.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTest.php
@@ -42,7 +42,6 @@ public static function setUpBeforeClass(): void
     {
         self::$sniff = new AbstractArraySniffTestable();
         parent::setUpBeforeClass();
-
     }
 
 
@@ -63,7 +62,6 @@ public function testSimpleValues()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -99,7 +97,6 @@ public function testSimpleKeyValues()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -132,7 +129,6 @@ public function testMissingKeys()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -162,7 +158,6 @@ public function testMultiTokenKeys()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -192,7 +187,6 @@ public function testMissingKeysCoalesceTernary()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -228,7 +222,6 @@ public function testTernaryValues()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -252,7 +245,6 @@ public function testHeredocValues()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
@@ -288,7 +280,6 @@ public function testArrowFunctionValue()
         ];
 
         $this->assertSame($expected, self::$sniff->indicies);
-
     }
 
 
diff --git a/tests/Core/Sniffs/AbstractArraySniffTestable.php b/tests/Core/Sniffs/AbstractArraySniffTestable.php
index 0a15290018..a1cbc66590 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTestable.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTestable.php
@@ -39,7 +39,6 @@ class AbstractArraySniffTestable extends AbstractArraySniff
     public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $arrayStart, int $arrayEnd, array $indices)
     {
         $this->indicies = $indices;
-
     }
 
 
@@ -59,7 +58,6 @@ 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;
-
     }
 
 
diff --git a/tests/Core/Standards/StandardRulesetsQATest.php b/tests/Core/Standards/StandardRulesetsQATest.php
index 124aefb035..f5880e9860 100644
--- a/tests/Core/Standards/StandardRulesetsQATest.php
+++ b/tests/Core/Standards/StandardRulesetsQATest.php
@@ -48,7 +48,6 @@ public function testBuildInStandardsDoNotContainErrors($standard)
 
         // Make sure sniffs were registered.
         $this->assertGreaterThanOrEqual(1, count($ruleset->sniffCodes));
-
     }
 
 
@@ -75,7 +74,6 @@ public static function dataBuildInStandards()
         }
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/StatusWriterTestHelper.php b/tests/Core/StatusWriterTestHelper.php
index 7644ecafaf..b40e62bc26 100644
--- a/tests/Core/StatusWriterTestHelper.php
+++ b/tests/Core/StatusWriterTestHelper.php
@@ -32,7 +32,6 @@ trait StatusWriterTestHelper
     protected function setUp(): void
     {
         $this->redirectStatusWriterOutputToStream();
-
     }
 
 
@@ -46,7 +45,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->resetStatusWriterProperties();
-
     }
 
 
@@ -71,7 +69,6 @@ protected function redirectStatusWriterOutputToStream(): void
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(true);
         $streamProperty->setValue(null, $this->stream);
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false);
-
     }
 
 
@@ -89,7 +86,6 @@ protected function resetStatusWriterStream(): void
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(true);
         $streamProperty->setValue(null, STDERR);
         (PHP_VERSION_ID < 80100) && $streamProperty->setAccessible(false);
-
     }
 
 
@@ -105,7 +101,6 @@ protected function resetStatusWriterProperties(): void
         }
 
         $this->resetStatusWriterStream();
-
     }
 
 
@@ -117,7 +112,6 @@ protected function resetStatusWriterProperties(): void
     public function expectNoStdoutOutput()
     {
         $this->expectOutputString('');
-
     }
 
 
@@ -135,7 +129,6 @@ public function assertStderrOutputSameString($expected)
 
         $this->assertIsString($output);
         $this->assertSame($expected, $output);
-
     }
 
 
@@ -159,7 +152,6 @@ public function assertStderrOutputMatchesRegex($regex)
             // PHPUnit < 9.1.0.
             $this->assertRegExp($regex, $output);
         }
-
     }
 
 
diff --git a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
index 832986e8f9..ab664dbcad 100644
--- a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
+++ b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
@@ -67,7 +67,6 @@ protected function setUp(): void
             $this->phpcsFile = new LocalFile($pathToTestFile, $ruleset, $config);
             $this->phpcsFile->parse();
         }//end if
-
     }
 
 
@@ -88,7 +87,6 @@ protected function setUp(): void
     public function testTestMarkersAreUnique()
     {
         AbstractMethodTestCase::assertTestMarkersAreUnique($this->phpcsFile);
-
     }
 
 
@@ -107,7 +105,6 @@ public function testTestMarkersAreUnique()
     protected function getTargetToken($commentString, $tokenType, $tokenContent = null)
     {
         return AbstractMethodTestCase::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent);
-
     }
 
 
@@ -125,7 +122,6 @@ public static function clearResolvedTokensCache()
         (PHP_VERSION_ID < 80100) && $property->setAccessible(true);
         $property->setValue(null, []);
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/CommentTestCase.php b/tests/Core/Tokenizers/Comment/CommentTestCase.php
index aec228025e..6d0f50afb4 100644
--- a/tests/Core/Tokenizers/Comment/CommentTestCase.php
+++ b/tests/Core/Tokenizers/Comment/CommentTestCase.php
@@ -67,7 +67,6 @@ public function testDocblockOpenerCloser($marker, $closerOffset, $expectedTags)
                 'Comment_closer not set to the expected stack pointer (for stackPtr ' . $i . ')'
             );
         }
-
     }
 
 
@@ -121,7 +120,6 @@ protected function checkTokenSequence($startPtr, array $expectedSequence)
                 'Token content did not match expectations' . $errorMsgSuffix
             );
         }//end for
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
index 54be9721d3..9c446138bf 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
@@ -34,7 +34,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -62,7 +61,6 @@ public function testLiveCoding()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
index dcdecaf9a4..c41145c94f 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
@@ -34,7 +34,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -61,7 +60,6 @@ public function testLiveCoding()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
index a19f7ce523..154932c8b5 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
@@ -34,7 +34,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -55,7 +54,6 @@ public function testLiveCoding()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
index 84fd74bc6f..d8fcc1b24b 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
@@ -34,7 +34,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -69,7 +68,6 @@ public function testLiveCoding()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
index 657f8ac8f7..268efd1ebd 100644
--- a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
@@ -67,7 +67,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -90,7 +89,6 @@ public function testEmptyDocblock()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -203,7 +201,6 @@ public function testMultilineDocblock()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -253,7 +250,6 @@ public function testMultilineDocblockNoStars()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -331,7 +327,6 @@ public function testMultilineDocblockIndented()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -359,7 +354,6 @@ public function testMultilineDocblockOpenerNotOnOwnLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -388,7 +382,6 @@ public function testMultilineDocblockCloserNotOnOwnLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -432,7 +425,6 @@ public function testMultilineDocblockStarsNotAligned()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
index c27da175cf..e9259e5dd5 100644
--- a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
@@ -112,7 +112,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [],
             ],
         ];
-
     }
 
 
@@ -135,7 +134,6 @@ public function testSingleLineDocIgnoreFileAnnotation()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -156,7 +154,6 @@ public function testSingleLineDocIgnoreAnnotation()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -177,7 +174,6 @@ public function testSingleLineDocDisableAnnotation()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -197,7 +193,6 @@ public function testSingleLineDocEnableAnnotationNoWhitespace()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -228,7 +223,6 @@ public function testMultiLineDocIgnoreFileAnnotationAtStart()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -259,7 +253,6 @@ public function testMultiLineDocIgnoreAnnotationAtStart()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -290,7 +283,6 @@ public function testMultiLineDocDisableAnnotationAtStart()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -326,7 +318,6 @@ public function testMultiLineDocEnableAnnotationAtStart()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -365,7 +356,6 @@ public function testMultiLineDocIgnoreFileAnnotationInMiddle()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -406,7 +396,6 @@ public function testMultiLineDocIgnoreAnnotationInMiddle()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -450,7 +439,6 @@ public function testMultiLineDocDisableAnnotationInMiddle()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -492,7 +480,6 @@ public function testMultiLineDocEnableAnnotationInMiddle()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -526,7 +513,6 @@ public function testMultiLineDocIgnoreFileAnnotationAtEnd()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -560,7 +546,6 @@ public function testMultiLineDocIgnoreAnnotationAtEnd()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -596,7 +581,6 @@ public function testMultiLineDocDisableAnnotationAtEnd()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -630,7 +614,6 @@ public function testMultiLineDocEnableAnnotationAtEnd()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
index d52ce6c7bd..c06711d4b5 100644
--- a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
@@ -59,7 +59,6 @@ public static function dataDocblockOpenerCloser()
                 'expectedTags' => [2],
             ],
         ];
-
     }
 
 
@@ -79,7 +78,6 @@ public function testEmptyBlockCommentNoWhiteSpace()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', [T_COMMENT, T_DOC_COMMENT_OPEN_TAG]);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -100,7 +98,6 @@ public function testEmptyDocblockNoWhiteSpace()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -120,7 +117,6 @@ public function testEmptyDocblockWithWhiteSpace()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -141,7 +137,6 @@ public function testSingleLineDocblockNoTag()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -164,7 +159,6 @@ public function testSingleLineDocblockWithTag1()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -187,7 +181,6 @@ public function testSingleLineDocblockWithTag2()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -210,7 +203,6 @@ public function testSingleLineDocblockWithTag3()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_DOC_COMMENT_OPEN_TAG);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
index 78468096c2..30f2b164a4 100644
--- a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
+++ b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
@@ -33,7 +33,6 @@ public function testAnonClassNoParentheses($testMarker)
         $this->assertArrayNotHasKey('parenthesis_owner', $tokens[$anonClass]);
         $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$anonClass]);
         $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$anonClass]);
-
     }
 
 
@@ -60,7 +59,6 @@ public function testAnonClassNoParenthesesNextOpenClose($testMarker)
         $closer = $this->getTargetToken($testMarker, T_CLOSE_PARENTHESIS);
         $this->assertArrayHasKey('parenthesis_owner', $tokens[$closer]);
         $this->assertSame($function, $tokens[$closer]['parenthesis_owner']);
-
     }
 
 
@@ -85,7 +83,6 @@ public static function dataAnonClassNoParentheses()
                 'testMarker' => '/* testNoParenthesesAndEmptyTokens */',
             ],
         ];
-
     }
 
 
@@ -127,7 +124,6 @@ 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']);
-
     }
 
 
@@ -151,7 +147,6 @@ public static function dataAnonClassWithParentheses()
                 'testMarker' => '/* testWithParenthesesAndEmptyTokens */',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
index 0fe0f5a290..37b89afb60 100644
--- a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
@@ -35,7 +35,6 @@ 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)');
-
     }
 
 
@@ -69,7 +68,6 @@ public static function dataArrayKeyword()
                 'testMarker' => '/* testOOConstDefault */',
             ],
         ];
-
     }
 
 
@@ -93,7 +91,6 @@ 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)');
-
     }
 
 
@@ -142,7 +139,6 @@ public static function dataArrayType()
                 'testContent' => 'Array',
             ],
         ];
-
     }
 
 
@@ -167,7 +163,6 @@ 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)');
-
     }
 
 
@@ -193,7 +188,6 @@ public static function dataNotArrayKeyword()
                 'testContent' => 'ARRAY',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/AttributesTest.php b/tests/Core/Tokenizers/PHP/AttributesTest.php
index 5cc84deb35..5c8b219e42 100644
--- a/tests/Core/Tokenizers/PHP/AttributesTest.php
+++ b/tests/Core/Tokenizers/PHP/AttributesTest.php
@@ -57,7 +57,6 @@ function ($token) use ($attribute, $length) {
         );
 
         $this->assertSame($tokenCodes, $map);
-
     }
 
 
@@ -266,7 +265,6 @@ public static function dataAttribute()
                 ],
             ],
         ];
-
     }
 
 
@@ -290,7 +288,6 @@ 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)]);
-
     }
 
 
@@ -313,7 +310,6 @@ public function testAttributeAndLineComment()
         $closer = $tokens[$attribute]['attribute_closer'];
         $this->assertSame(T_WHITESPACE, $tokens[($closer + 1)]['code']);
         $this->assertSame(T_COMMENT, $tokens[($closer + 2)]['code']);
-
     }
 
 
@@ -366,7 +362,6 @@ function ($token) use ($attribute, $length) {
         );
 
         $this->assertSame($tokenCodes, $map);
-
     }
 
 
@@ -421,7 +416,6 @@ public static function dataAttributeOnParameters()
                 ],
             ],
         ];
-
     }
 
 
@@ -473,7 +467,6 @@ public function testAttributeContainingTextLookingLikeCloseTag($testMarker, arra
             $this->assertSame($expectedCode, $tokens[$i]['code']);
             ++$i;
         }
-
     }
 
 
@@ -572,7 +565,6 @@ public static function dataAttributeOnTextLookingLikeCloseTag()
                 ],
             ],
         ];
-
     }
 
 
@@ -593,7 +585,6 @@ public function testInvalidAttribute()
 
         $this->assertArrayHasKey('attribute_closer', $tokens[$attribute]);
         $this->assertNull($tokens[$attribute]['attribute_closer']);
-
     }
 
 
@@ -687,7 +678,6 @@ static function ($token) {
         );
 
         $this->assertSame($tokenCodes, $map);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
index 7cb592d612..470518b98a 100644
--- a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
@@ -59,7 +59,6 @@ public function testAsymmetricVisibility($testMarker, $testType, $testContent)
             $tokenArray['content'],
             'Token tokenized as ' . $tokenArray['type'] . ' (content)'
         );
-
     }
 
 
@@ -197,7 +196,6 @@ public static function dataAsymmetricVisibility()
                 'testContent' => 'PRIVATE(SET)',
             ],
         ];
-
     }
 
 
@@ -233,7 +231,6 @@ public function testNotAsymmetricVisibility($testMarker, $testType, $testContent
             $tokenArray['code'],
             'Token tokenized as ' . $tokenArray['type'] . ' (code)'
         );
-
     }
 
 
@@ -324,7 +321,6 @@ public static function dataNotAsymmetricVisibility()
                 'testContent' => 'private',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
index 8003bb6138..42cdcbc630 100644
--- a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
@@ -65,7 +65,6 @@ 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']);
-
     }
 
 
@@ -122,7 +121,6 @@ public static function dataEnums()
                 'closerOffset' => 14,
             ],
         ];
-
     }
 
 
@@ -150,7 +148,6 @@ 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)');
-
     }
 
 
@@ -227,7 +224,6 @@ public static function dataNotEnums()
                 'testContent' => 'enum',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
index 18d6a1a942..12f09b4028 100644
--- a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
@@ -38,7 +38,6 @@ 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');
-
     }
 
 
@@ -113,7 +112,6 @@ public static function dataExplicitOctalNotation()
                 'nextContent' => 'o',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
index be1e352f54..b256d55f48 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
@@ -37,7 +37,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
index c769502844..4bfc6895c8 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
@@ -31,7 +31,6 @@ public function testSimple($testMarker)
         $token = $this->getTargetToken($testMarker, T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 12);
-
     }
 
 
@@ -52,7 +51,6 @@ public static function dataSimple()
                 'testMarker' => '/* testMixedCase */',
             ],
         ];
-
     }
 
 
@@ -68,7 +66,6 @@ public function testWhitespace()
         $token = $this->getTargetToken('/* testWhitespace */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 6, 13);
-
     }
 
 
@@ -84,7 +81,6 @@ public function testComment()
         $token = $this->getTargetToken('/* testComment */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 15);
-
     }
 
 
@@ -100,7 +96,6 @@ public function testHeredoc()
         $token = $this->getTargetToken('/* testHeredoc */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 9);
-
     }
 
 
@@ -116,7 +111,6 @@ public function testNestedOuter()
         $token = $this->getTargetToken('/* testNestedOuter */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 25);
-
     }
 
 
@@ -147,7 +141,6 @@ 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');
-
     }
 
 
@@ -182,7 +175,6 @@ 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');
-
     }
 
 
@@ -198,7 +190,6 @@ public function testFunctionCall()
         $token = $this->getTargetToken('/* testFunctionCall */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 17);
-
     }
 
 
@@ -214,7 +205,6 @@ public function testChainedFunctionCall()
         $token = $this->getTargetToken('/* testChainedFunctionCall */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 12, 'bracket');
-
     }
 
 
@@ -230,7 +220,6 @@ public function testFunctionArgument()
         $token = $this->getTargetToken('/* testFunctionArgument */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 15, 'comma');
-
     }
 
 
@@ -246,7 +235,6 @@ public function testClosure()
         $token = $this->getTargetToken('/* testClosure */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 60, 'comma');
-
     }
 
 
@@ -262,7 +250,6 @@ public function testArrayIndex()
         $token = $this->getTargetToken('/* testArrayIndex */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 8, 17, 'comma');
-
     }
 
 
@@ -278,7 +265,6 @@ public function testReturnType()
         $token = $this->getTargetToken('/* testReturnType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18, 'comma');
-
     }
 
 
@@ -294,7 +280,6 @@ public function testReference()
         $token = $this->getTargetToken('/* testReference */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 6, 9);
-
     }
 
 
@@ -310,7 +295,6 @@ public function testGrouped()
         $token = $this->getTargetToken('/* testGrouped */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 8);
-
     }
 
 
@@ -326,7 +310,6 @@ public function testArrayValue()
         $token = $this->getTargetToken('/* testArrayValue */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 9, 'comma');
-
     }
 
 
@@ -342,7 +325,6 @@ public function testArrayValueNoTrailingComma()
         $token = $this->getTargetToken('/* testArrayValueNoTrailingComma */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 4, 8, 'closing parenthesis');
-
     }
 
 
@@ -358,7 +340,6 @@ public function testYield()
         $token = $this->getTargetToken('/* testYield */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 14);
-
     }
 
 
@@ -374,7 +355,6 @@ public function testReturnTypeNullableFullyQualifiedClassName()
         $token = $this->getTargetToken('/* testReturnTypeNullableFullyQualifiedClassName */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 10, 13);
-
     }
 
 
@@ -390,7 +370,6 @@ public function testReturnTypeNullablePartiallyQualifiedClassName()
         $token = $this->getTargetToken('/* testReturnTypeNullablePartiallyQualifiedClassName */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 10, 13);
-
     }
 
 
@@ -406,7 +385,6 @@ public function testNullableUnqualifiedClassName()
         $token = $this->getTargetToken('/* testNullableUnqualifiedClassName */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 16);
-
     }
 
 
@@ -422,7 +400,6 @@ public function testNamespaceRelativeClassNameInTypes()
         $token = $this->getTargetToken('/* testNamespaceRelativeClassNameInTypes */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 12, 15);
-
     }
 
 
@@ -441,7 +418,6 @@ public function testKeywordReturnTypes($testMarker)
         $token = $this->getTargetToken($testMarker, T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 14);
-
     }
 
 
@@ -489,7 +465,6 @@ public static function dataKeywordReturnTypes()
                 'testMarker' => '/* testFQNNullReturnType */',
             ],
         ];
-
     }
 
 
@@ -505,7 +480,6 @@ public function testUnionParamType()
         $token = $this->getTargetToken('/* testUnionParamType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 21);
-
     }
 
 
@@ -521,7 +495,6 @@ public function testUnionReturnType()
         $token = $this->getTargetToken('/* testUnionReturnType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
-
     }
 
 
@@ -537,7 +510,6 @@ public function testUnionReturnTypeWithTrue()
         $token = $this->getTargetToken('/* testUnionReturnTypeWithTrue */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
-
     }
 
 
@@ -553,7 +525,6 @@ public function testUnionReturnTypeWithFalse()
         $token = $this->getTargetToken('/* testUnionReturnTypeWithFalse */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 18);
-
     }
 
 
@@ -569,7 +540,6 @@ public function testIntersectionParamType()
         $token = $this->getTargetToken('/* testIntersectionParamType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 13, 27);
-
     }
 
 
@@ -585,7 +555,6 @@ public function testIntersectionReturnType()
         $token = $this->getTargetToken('/* testIntersectionReturnType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 11, 19);
-
     }
 
 
@@ -601,7 +570,6 @@ public function testDNFParamType()
         $token = $this->getTargetToken('/* testDNFParamType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 17, 29);
-
     }
 
 
@@ -617,7 +585,6 @@ public function testDNFReturnType()
         $token = $this->getTargetToken('/* testDNFReturnType */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 27);
-
     }
 
 
@@ -633,7 +600,6 @@ public function testDNFParamTypeWithReturnByRef()
         $token = $this->getTargetToken('/* testDNFParamTypeWithReturnByRef */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 22);
-
     }
 
 
@@ -685,7 +651,6 @@ 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');
-
     }
 
 
@@ -701,7 +666,6 @@ public function testTernaryWithTypes()
         $token = $this->getTargetToken('/* testTernaryWithTypes */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 15, 27);
-
     }
 
 
@@ -717,7 +681,6 @@ public function testWithMatchValue()
         $token = $this->getTargetToken('/* testWithMatchValue */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 44);
-
     }
 
 
@@ -733,7 +696,6 @@ public function testWithMatchValueAndMore()
         $token = $this->getTargetToken('/* testWithMatchValueAndMore */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 48);
-
     }
 
 
@@ -761,7 +723,6 @@ public function testInMatchValue($testMarker, $openerOffset, $closerOffset, $exp
         $this->scopePositionTestHelper($token, $openerOffset, $closerOffset, $expectedCloserFriendlyName);
 
         $this->assertSame($expectedCloserType, $tokens[($token + $closerOffset)]['type'], 'Mismatched scope closer type');
-
     }
 
 
@@ -804,7 +765,6 @@ public static function dataInMatchValue()
                 'expectedCloserFriendlyName' => '$y variable',
             ],
         ];
-
     }
 
 
@@ -820,7 +780,6 @@ public function testNestedInMethod()
         $token = $this->getTargetToken('/* testNestedInMethod */', T_FN);
         $this->backfillHelper($token);
         $this->scopePositionTestHelper($token, 5, 17);
-
     }
 
 
@@ -856,7 +815,6 @@ 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');
-
     }
 
 
@@ -926,7 +884,6 @@ public static function dataNotAnArrowFunction()
                 'testMarker' => '/* testLiveCoding */',
             ],
         ];
-
     }
 
 
@@ -978,7 +935,6 @@ 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');
-
     }
 
 
@@ -1010,7 +966,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
index e1b31fbd68..3c04bc2ca1 100644
--- a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
@@ -42,7 +42,6 @@ public function testMatchExpression($testMarker, $openerOffset, $closerOffset, $
 
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
         $this->parenthesisTestHelper($token);
-
     }
 
 
@@ -194,7 +193,6 @@ public static function dataMatchExpression()
                 'closerOffset' => 40,
             ],
         ];
-
     }
 
 
@@ -236,7 +234,6 @@ 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');
         }
-
     }
 
 
@@ -347,7 +344,6 @@ public static function dataNotAMatchStructure()
                 'testMarker' => '/* testLiveCoding */',
             ],
         ];
-
     }
 
 
@@ -370,7 +366,6 @@ public function testSwitchExpression($testMarker, $openerOffset, $closerOffset)
 
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
         $this->parenthesisTestHelper($token);
-
     }
 
 
@@ -400,7 +395,6 @@ public static function dataSwitchExpression()
                 'closerOffset' => 63,
             ],
         ];
-
     }
 
 
@@ -423,7 +417,6 @@ public function testSwitchCaseVersusMatch($testMarker, $openerOffset, $closerOff
         $token = $this->getTargetToken($testMarker, [T_CASE, T_DEFAULT]);
 
         $this->scopeTestHelper($token, $openerOffset, $closerOffset);
-
     }
 
 
@@ -463,7 +456,6 @@ public static function dataSwitchCaseVersusMatch()
                 'closerOffset' => 20,
             ],
         ];
-
     }
 
 
@@ -527,7 +519,6 @@ private function scopeTestHelper($token, $openerOffset, $closerOffset, $skipScop
                 );
             }
         }
-
     }
 
 
@@ -557,7 +548,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
index 9ef8eef5cd..cc24db2de1 100644
--- a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
@@ -37,7 +37,6 @@ 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']);
-
     }
 
 
@@ -132,7 +131,6 @@ public static function dataTestBackfill()
                 'value'  => '10_223_372_036_854_775_807',
             ],
         ];
-
     }
 
 
@@ -162,7 +160,6 @@ public function testNoBackfill($testMarker, $expectedTokens)
             );
             $this->assertSame($expectedToken['content'], $tokens[$i]['content']);
         }
-
     }
 
 
@@ -395,7 +392,6 @@ public static function dataNoBackfill()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
index 19da12e422..8865f06913 100644
--- a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
@@ -36,7 +36,6 @@ 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)');
-
     }
 
 
@@ -169,7 +168,6 @@ public static function dataReadonly()
                 'testMarker' => '/* testParseErrorLiveCoding */',
             ],
         ];
-
     }
 
 
@@ -198,7 +196,6 @@ 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)');
-
     }
 
 
@@ -274,7 +271,6 @@ public static function dataNotReadonly()
                 'testMarker' => '/* testReadonlyUsedAsMethodNameWithDNFParam */',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
index 0c9f8ec47f..66b7e9053b 100644
--- a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
+++ b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
@@ -33,7 +33,6 @@ 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)');
-
     }
 
 
@@ -67,7 +66,6 @@ public static function dataBitwiseOr()
             'in parameter in function call'              => ['/* testBitwiseOrNonArrowFnFunctionCall */'],
             'live coding / undetermined'                 => ['/* testLiveCoding */'],
         ];
-
     }
 
 
@@ -89,7 +87,6 @@ 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)');
-
     }
 
 
@@ -166,7 +163,6 @@ public static function dataTypeUnion()
             'return type for function with FQN false'                  => ['/* testTypeUnionFQNFalse */'],
             'return type for closure with FQN null'                    => ['/* testTypeUnionFQNNull */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
index 75f23b4155..3473d3beb1 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
@@ -37,7 +37,6 @@ 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)');
-
     }
 
 
@@ -123,7 +122,6 @@ public static function dataStrings()
             'or'           => ['/* testOr */'],
             'xor'          => ['/* testXor */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
index 8417ac2612..01cbfebd5b 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
@@ -34,7 +34,6 @@ 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)');
-
     }
 
 
@@ -138,7 +137,6 @@ public static function dataStrings()
             'method call: static'                             => ['/* testKeywordAsMethodCallNameShouldBeStringStatic */'],
             'method call: static with dnf look a like param'  => ['/* testKeywordAsFunctionCallNameShouldBeStringStaticDNFLookaLike */'],
         ];
-
     }
 
 
@@ -177,7 +175,6 @@ public function testKeywords($testMarker, $expectedTokenType)
             $tokenArray['type'],
             'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)'
         );
-
     }
 
 
@@ -565,7 +562,6 @@ public static function dataKeywords()
                 'expectedTokenType' => 'T_STATIC',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
index 8405db3a3b..b886cafa30 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
@@ -43,7 +43,6 @@ 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)');
-
     }
 
 
@@ -62,7 +61,6 @@ public static function dataBrokenDNFTypeCantEndOnOpenParenthesis()
             'Parameter type'   => ['/* testBrokenParamDNFTypeEndOnOpenParenthesis */'],
             'Return type'      => ['/* testBrokenReturnDNFTypeEndOnOpenParenthesis */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
index 925e21b9a2..d541b5fdbe 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
@@ -52,7 +52,6 @@ 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)');
-
     }
 
 
@@ -71,7 +70,6 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingClosePar
             'Parameter type'   => ['/* testBrokenParamDNFTypeParensMissingClose */'],
             'Return type'      => ['/* testBrokenReturnDNFTypeParensMissingClose */'],
         ];
-
     }
 
 
@@ -111,7 +109,6 @@ 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)');
-
     }
 
 
@@ -130,7 +127,6 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenPare
             'Parameter type'   => ['/* testBrokenParamDNFTypeParensMissingOpen */'],
             'Return type'      => ['/* testBrokenReturnDNFTypeParensMissingOpen */'],
         ];
-
     }
 
 
@@ -192,7 +188,6 @@ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched($t
                 break;
             }//end switch
         }//end for
-
     }
 
 
@@ -211,7 +206,6 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmat
             'Parameter type - missing one close parenthesis'  => ['/* testBrokenParamDNFTypeParensMissingOneClose */'],
             'Return type - missing one open parenthesis'      => ['/* testBrokenReturnDNFTypeParensMissingOneOpen */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesTest.php b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
index 8c6849bfe5..c10eb63eea 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesTest.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
@@ -89,7 +89,6 @@ public function testNormalParentheses($testMarker, $skipCheckInside = false)
                 'Token after tokenized as ' . $tokens[$after]['type'] . ', not T_BITWISE_OR (type)'
             );
         }
-
     }
 
 
@@ -266,7 +265,6 @@ public static function dataNormalParentheses()
                 'testMarker' => '/* testParensNoOwnerInArrowReturnExpression */',
             ],
         ];
-
     }
 
 
@@ -371,7 +369,6 @@ public function testDNFTypeParentheses($testMarker)
                 'Token after tokenized as ' . $tokens[$after]['type'] . ', not T_TYPE_UNION (type)'
             );
         }
-
     }
 
 
@@ -559,7 +556,6 @@ public static function dataDNFTypeParentheses()
                 'testMarker' => '/* testDNFTypeParamIllegalNestedParens */',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
index 792d5064b7..489fac67f3 100644
--- a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
@@ -40,7 +40,6 @@ 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)');
-
     }
 
 
@@ -95,7 +94,6 @@ public static function dataMatchDefault()
                 'testContent' => 'DEFAULT',
             ],
         ];
-
     }
 
 
@@ -120,7 +118,6 @@ 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)');
-
     }
 
 
@@ -150,7 +147,6 @@ public static function dataSwitchDefault()
                 'testMarker' => '/* testSwitchDefaultNestedInMatchDefault */',
             ],
         ];
-
     }
 
 
@@ -183,7 +179,6 @@ 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)');
-
     }
 
 
@@ -264,7 +259,6 @@ public static function dataNotDefaultKeyword()
                 'testContent' => 'default',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
index f22e33b916..5a85089d5e 100644
--- a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
@@ -36,7 +36,6 @@ 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)');
-
     }
 
 
@@ -97,7 +96,6 @@ public static function dataDoubleArrow()
             'long_array_with_default_in_key_with_match'  => ['/* testLongArrayArrowWithClassConstantKeyWithNestedMatch */'],
             'short_array_with_default_in_key_with_match' => ['/* testShortArrayArrowWithClassConstantKeyWithNestedMatch */'],
         ];
-
     }
 
 
@@ -121,7 +119,6 @@ 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)');
-
     }
 
 
@@ -184,7 +181,6 @@ public static function dataMatchArrow()
             'in_long_array_value_with_default_key'    => ['/* testMatchArrowNestedInLongArrayWithClassConstantKey */'],
             'in_short_array_value_with_default_key'   => ['/* testMatchArrowNestedInShortArrayWithClassConstantKey */'],
         ];
-
     }
 
 
@@ -208,7 +204,6 @@ 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)');
-
     }
 
 
@@ -230,7 +225,6 @@ public static function dataFnArrow()
 
             'in_complex_match_value_in_short_array' => ['/* testFnArrowInComplexMatchValueInShortArrayValue */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
index 4262a09630..835849e547 100644
--- a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
@@ -33,7 +33,6 @@ public function testDoubleQuotedString($testMarker, $expectedContent)
 
         $target = $this->getTargetToken($testMarker, T_DOUBLE_QUOTED_STRING);
         $this->assertSame($expectedContent, $tokens[$target]['content']);
-
     }
 
 
@@ -137,7 +136,6 @@ public static function dataDoubleQuotedString()
 ',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/EnumCaseTest.php b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
index 7d906f8217..c2de0be68d 100644
--- a/tests/Core/Tokenizers/PHP/EnumCaseTest.php
+++ b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
@@ -33,7 +33,6 @@ 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)');
-
     }
 
 
@@ -55,7 +54,6 @@ public static function dataEnumCases()
             'enum case, after switch statement'                          => ['/* testEnumCaseAfterSwitch */'],
             'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'],
         ];
-
     }
 
 
@@ -77,7 +75,6 @@ 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)');
-
     }
 
 
@@ -99,7 +96,6 @@ public static function dataNotEnumCases()
             'switch case, body in curlies declares enum'         => ['/* testCaseInSwitchWhenCreatingEnumInSwitch1 */'],
             'switch case, body after semicolon declares enum'    => ['/* testCaseInSwitchWhenCreatingEnumInSwitch2 */'],
         ];
-
     }
 
 
@@ -121,7 +117,6 @@ 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)');
-
     }
 
 
@@ -144,7 +139,6 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"array" as case name'     => ['/* testKeywordAsEnumCaseNameShouldBeString7 */'],
             '"exit" as case name'      => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
index cdff29fa79..84a2bcda4a 100644
--- a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
@@ -35,7 +35,6 @@ 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)');
-
     }
 
 
@@ -106,7 +105,6 @@ public static function dataExitIsKeyword()
                 'testContent' => '\die',
             ],
         ];
-
     }
 
 
@@ -133,7 +131,6 @@ 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)');
-
     }
 
 
@@ -242,7 +239,6 @@ public static function dataNotExitKeyword()
                 'expected'    => 'T_GOTO_LABEL',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/FinallyTest.php b/tests/Core/Tokenizers/PHP/FinallyTest.php
index 1b4ed8c19a..94df6243e2 100644
--- a/tests/Core/Tokenizers/PHP/FinallyTest.php
+++ b/tests/Core/Tokenizers/PHP/FinallyTest.php
@@ -33,7 +33,6 @@ 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)');
-
     }
 
 
@@ -51,7 +50,6 @@ public static function dataFinallyNonKeyword()
             'finally used as method name'         => ['/* testFinallyUsedAsMethodName */'],
             'finally used as property name'       => ['/* testFinallyUsedAsPropertyName */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/GotoLabelTest.php b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
index f0f91a0571..bc8b88f74a 100644
--- a/tests/Core/Tokenizers/PHP/GotoLabelTest.php
+++ b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
@@ -39,7 +39,6 @@ public function testGotoStatement($testMarker, $testContent)
 
         $this->assertIsInt($label);
         $this->assertSame($testContent, $tokens[$label]['content']);
-
     }
 
 
@@ -91,7 +90,6 @@ public static function dataGotoStatement()
                 'testContent' => 'null',
             ],
         ];
-
     }
 
 
@@ -121,7 +119,6 @@ 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']);
-
     }
 
 
@@ -173,7 +170,6 @@ public static function dataGotoDeclaration()
                 'testContent' => 'null',
             ],
         ];
-
     }
 
 
@@ -207,7 +203,6 @@ 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)');
-
     }
 
 
@@ -274,7 +269,6 @@ public static function dataNotAGotoDeclaration()
                 'testContent' => 'Suit',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
index 90aa0d3a0d..3ccec4c4a3 100644
--- a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
@@ -44,7 +44,6 @@ public function testHeredocSingleLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -66,7 +65,6 @@ public function testNowdocSingleLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -90,7 +88,6 @@ public function testHeredocMultiLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -114,7 +111,6 @@ public function testNowdocMultiLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -138,7 +134,6 @@ public function testHeredocEndsOnBlankLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_HEREDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -162,7 +157,6 @@ public function testNowdocEndsOnBlankLine()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_START_NOWDOC);
 
         $this->checkTokenSequence($target, $expectedSequence);
-
     }
 
 
@@ -206,7 +200,6 @@ private function checkTokenSequence($startPtr, array $expectedSequence)
                 'Token content did not match expectations' . $errorMsgSuffix
             );
         }//end for
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
index 94ebc91e0c..a79ce7af71 100644
--- a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
@@ -34,7 +34,6 @@ 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)');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/HeredocStringTest.php b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
index 75630bf13a..92e8084e92 100644
--- a/tests/Core/Tokenizers/PHP/HeredocStringTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
@@ -33,7 +33,6 @@ public function testHeredocString($testMarker, $expectedContent)
 
         $target = $this->getTargetToken($testMarker, T_HEREDOC);
         $this->assertSame($expectedContent . "\n", $tokens[$target]['content']);
-
     }
 
 
@@ -55,7 +54,6 @@ 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']);
-
     }
 
 
@@ -154,7 +152,6 @@ public static function dataHeredocString()
                 'expectedContent' => '${foo->{"${\'a\'}"}}',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
index 8590e90c74..0f1379832e 100644
--- a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
+++ b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
@@ -65,7 +65,6 @@ public function testNamedFunctionCallArguments($testMarker, $parameters)
                 'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
             );
         }//end foreach
-
     }
 
 
@@ -296,7 +295,6 @@ public static function dataNamedFunctionCallArguments()
                 ],
             ],
         ];
-
     }
 
 
@@ -327,7 +325,6 @@ public function testOtherTstringInFunctionCall($testMarker, $content)
             $tokens[$label]['type'],
             'Token tokenized as ' . $tokens[$label]['type'] . ', not T_STRING (type)'
         );
-
     }
 
 
@@ -358,7 +355,6 @@ public static function dataOtherTstringInFunctionCall()
                 'content'    => 'count',
             ],
         ];
-
     }
 
 
@@ -410,7 +406,6 @@ public function testMixedPositionalAndNamedArgsWithTernary()
             $tokens[$colon]['type'],
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
-
     }
 
 
@@ -507,7 +502,6 @@ public function testNamedArgWithTernary()
             $tokens[$colon]['type'],
             'Second arg ternary: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)'
         );
-
     }
 
 
@@ -588,7 +582,6 @@ public function testTernaryWithFunctionCallsInThenElse()
             $tokens[$colon]['type'],
             'Function in else: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
-
     }
 
 
@@ -618,7 +611,6 @@ public function testTernaryWithConstantsInThenElse()
             $tokens[$colon]['type'],
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_INLINE_ELSE (type)'
         );
-
     }
 
 
@@ -680,7 +672,6 @@ public function testSwitchStatement()
             $tokens[$colon]['type'],
             'Default case: Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
-
     }
 
 
@@ -726,7 +717,6 @@ public function testParseErrorVariableLabel()
             $tokens[$colon]['type'],
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
-
     }
 
 
@@ -770,7 +760,6 @@ public function testOtherColonsInTernary($testMarker)
                 }
             }
         }
-
     }
 
 
@@ -791,7 +780,6 @@ public static function dataOtherColonsInTernary()
                 'testMarker' => '/* testTernaryWithArrowFunctionsAndReturnTypes */',
             ],
         ];
-
     }
 
 
@@ -842,7 +830,6 @@ public function testReservedKeywordsAsName($testMarker, $tokenTypes, $tokenConte
             $tokens[$colon]['type'],
             'Token tokenized as ' . $tokens[$colon]['type'] . ', not T_COLON (type)'
         );
-
     }
 
 
@@ -985,7 +972,6 @@ public static function dataReservedKeywordsAsName()
         }//end foreach
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
index 4e362c3794..5ce46360ef 100644
--- a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
@@ -56,7 +56,6 @@ public function testIdentifierTokenization($testMarker, $expectedTokens)
 
             ++$identifier;
         }
-
     }
 
 
@@ -1285,7 +1284,6 @@ public static function dataIdentifierTokenization()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
index a02c8c50ad..3bea6be6fd 100644
--- a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
+++ b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
@@ -36,7 +36,6 @@ 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)');
-
     }
 
 
@@ -61,7 +60,6 @@ public static function dataNullable()
             'closure return type, nullable int'              => ['/* testClosureReturnTypeNullableInt */'],
             'function return type, nullable callable'        => ['/* testFunctionReturnTypeNullableCallable */'],
         ];
-
     }
 
 
@@ -82,7 +80,6 @@ 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)');
-
     }
 
 
@@ -116,7 +113,6 @@ public static function dataInlineThen()
             'ternary ? followed by namespace relative function call'       => ['/* testInlineThenWithNamespaceRelativeNameAndParens */'],
             'ternary ? followed by namespace relative static method call'  => ['/* testInlineThenWithNamespaceRelativeNameAndDoubleColon */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
index e4e34fee5b..6253b59037 100644
--- a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
+++ b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
@@ -41,7 +41,6 @@ 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');
-
     }
 
 
@@ -62,7 +61,6 @@ 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');
-
     }
 
 
@@ -79,7 +77,6 @@ public static function dataNullsafeObjectOperator()
             'nullsafe operator'                         => ['/* testNullsafeObjectOperator */'],
             'illegal nullsafe operator (write context)' => ['/* testNullsafeObjectOperatorWriteContext */'],
         ];
-
     }
 
 
@@ -108,7 +105,6 @@ 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');
         }
-
     }
 
 
@@ -137,7 +133,6 @@ public static function dataTernaryThen()
                 'testMarker' => '/* testLiveCoding */',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
index 38dbf7035b..6d197b3b61 100644
--- a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
@@ -30,7 +30,6 @@ final class OtherContextSensitiveKeywordsTest extends AbstractTokenizerTestCase
     public static function setUpBeforeClass(): void
     {
         parent::clearResolvedTokensCache();
-
     }
 
 
@@ -51,7 +50,6 @@ 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)');
-
     }
 
 
@@ -93,7 +91,6 @@ public static function dataStrings()
             'constant declaration: self as name after type'                     => ['/* testSelfIsNameForTypedConstant */'],
             'constant declaration: parent as name after type'                   => ['/* testParentIsNameForTypedConstant */'],
         ];
-
     }
 
 
@@ -123,7 +120,6 @@ public function testKeywords($testMarker, $expectedTokenType)
             $tokenArray['type'],
             'Token tokenized as ' . $tokenArray['type'] . ', not ' . $expectedTokenType . ' (type)'
         );
-
     }
 
 
@@ -736,7 +732,6 @@ public static function dataKeywords()
                 'expectedTokenType' => 'T_NULL',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
index c2b66d0ce8..450e5de890 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
@@ -55,7 +55,6 @@ 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);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
index 2c9b507d3d..1a3d099df2 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
@@ -47,7 +47,6 @@ 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);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
index 2401539382..7419129820 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
@@ -47,7 +47,6 @@ 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);
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
index 41f157d819..a776bc0173 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
@@ -33,7 +33,6 @@ final class PHPOpenTagTest extends AbstractTokenizerTestCase
     public function testLongOpenTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
-
     }
 
 
@@ -131,7 +130,6 @@ public static function dataLongOpenTag()
         ];
 
         return $data;
-
     }
 
 
@@ -149,7 +147,6 @@ public static function dataLongOpenTag()
     public function testCaseLongOpenTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
-
     }
 
 
@@ -173,7 +170,6 @@ public static function dataCaseLongOpenTag()
         $data['open tag, multi space']['expectedTokens'][0]['content'] = '<?phP';
 
         return $data;
-
     }
 
 
@@ -190,7 +186,6 @@ public static function dataCaseLongOpenTag()
     public function testShortOpenEchoTag($testMarker, array $expectedTokens)
     {
         $this->checkTokenSequence($testMarker, $expectedTokens);
-
     }
 
 
@@ -202,7 +197,6 @@ public function testShortOpenEchoTag($testMarker, array $expectedTokens)
     public static function dataShortOpenEchoTag()
     {
         return self::getOpenTagTokenizationProvider('ShortOpenEcho', 'T_OPEN_TAG_WITH_ECHO', '<?=');
-
     }
 
 
@@ -223,7 +217,6 @@ public function testShortOpenTag($testMarker, array $expectedTokens)
         }
 
         $this->checkTokenSequence($testMarker, $expectedTokens);
-
     }
 
 
@@ -235,7 +228,6 @@ public function testShortOpenTag($testMarker, array $expectedTokens)
     public static function dataShortOpenTag()
     {
         return self::getOpenTagTokenizationProvider('ShortOpen', 'T_OPEN_TAG', '<?');
-
     }
 
 
@@ -281,7 +273,6 @@ private function checkTokenSequence($testMarker, array $expectedTokens)
 
             ++$stackPtr;
         }//end foreach
-
     }
 
 
@@ -412,7 +403,6 @@ private static function getOpenTagTokenizationProvider($tagtype, $tokenType, $to
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
index fb71c10965..1dfef0b065 100644
--- a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
@@ -30,7 +30,6 @@ final class ResolveSimpleTokenTest extends AbstractTokenizerTestCase
     public static function setUpBeforeClass(): void
     {
         parent::clearResolvedTokensCache();
-
     }
 
 
@@ -60,7 +59,6 @@ public function testBracesAndColon()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_SWITCH);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -83,7 +81,6 @@ public function testNamedParamColon()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_STRING);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -109,7 +106,6 @@ public function testReturnTypeColon()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -129,7 +125,6 @@ public function testConcat()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_CONSTANT_ENCAPSED_STRING);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -159,7 +154,6 @@ public function testSimpleMathTokens()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -183,7 +177,6 @@ public function testUnaryPlusMinus()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -211,7 +204,6 @@ public function testBitwiseTokens()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -236,7 +228,6 @@ public function testBitwiseOrInCatch()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_CATCH);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -256,7 +247,6 @@ public function testLessThan()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_LNUMBER);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -276,7 +266,6 @@ public function testGreaterThan()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_LNUMBER);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -296,7 +285,6 @@ public function testBooleanNot()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -318,7 +306,6 @@ public function testComma()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_VARIABLE);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -340,7 +327,6 @@ public function testAsperand()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -362,7 +348,6 @@ public function testDollarAndCurlies()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_ECHO);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -383,7 +368,6 @@ public function testBacktick()
         $target = $this->getTargetToken('/* ' . __FUNCTION__ . ' */', T_EQUAL);
 
         $this->checkTokenSequence(($target + 1), $expectedSequence);
-
     }
 
 
@@ -424,7 +408,6 @@ private function checkTokenSequence($startPtr, array $expectedSequence)
 
             ++$sequenceKey;
         }//end for
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/ShortArrayTest.php b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
index 623a24e262..86de877bf5 100644
--- a/tests/Core/Tokenizers/PHP/ShortArrayTest.php
+++ b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
@@ -41,7 +41,6 @@ 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)');
         }
-
     }
 
 
@@ -86,7 +85,6 @@ public static function dataSquareBrackets()
             'new anonymous class expression dereferencing 4' => ['/* testNewAnonClassImplementsExpressionDereferencing */'],
             'live coding'                                    => ['/* testLiveCoding */'],
         ];
-
     }
 
 
@@ -116,7 +114,6 @@ 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)');
         }
-
     }
 
 
@@ -142,7 +139,6 @@ public static function dataShortArrays()
             'short list after alternative control structure' => ['/* testShortListDeclarationAfterAlternativeControlStructure */'],
             'short list after class declaration'             => ['/* testShortListDeclarationAfterClassDeclaration */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
index bcf5796abf..1823e40f38 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
@@ -53,7 +53,6 @@ public function testCommentTokenization($testMarker, $expectedTokens)
 
             ++$comment;
         }
-
     }
 
 
@@ -1057,7 +1056,6 @@ public static function dataCommentTokenization()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
index ad0811b4af..fa7494cc03 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
@@ -50,7 +50,6 @@ public function testCommentTokenization($testMarker, $expectedTokens)
 
             ++$comment;
         }
-
     }
 
 
@@ -368,7 +367,6 @@ public static function dataCommentTokenization()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
index 119d34259b..2636e74baa 100644
--- a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
+++ b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
@@ -34,7 +34,6 @@ 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)');
-
     }
 
 
@@ -70,7 +69,6 @@ public static function dataBitwiseAnd()
             'function return by reference'               => ['/* testBitwiseAnd6 */'],
             'live coding / undetermined'                 => ['/* testLiveCoding */'],
         ];
-
     }
 
 
@@ -92,7 +90,6 @@ 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)');
-
     }
 
 
@@ -161,7 +158,6 @@ public static function dataTypeIntersection()
             'return type for method, includes (invalid) FQN false'        => ['/* testTypeIntersectionInvalidFQNFalse */'],
             'return type for closure, includes (invalid) FQN null'        => ['/* testTypeIntersectionInvalidFQNNull */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
index 096689b14c..bc21fe1628 100644
--- a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
+++ b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
@@ -43,7 +43,6 @@ public function testTernaryIsInlineThen()
             $tokens[$target]['type'],
             'Token tokenized as ' . $tokens[$target]['type'] . ', not T_INLINE_THEN (type)'
         );
-
     }
 
 
@@ -79,7 +78,6 @@ public function testUntypedConstant($testMarker)
                 'Token tokenized as ' . $tokens[$i]['type'] . ', not T_STRING (type)'
             );
         }
-
     }
 
 
@@ -103,7 +101,6 @@ public static function dataUntypedConstant()
                 'testMarker' => '/* testClassConstVisibilityUntyped */',
             ],
         ];
-
     }
 
 
@@ -143,7 +140,6 @@ public function testTypedConstant($testMarker, array $sequence)
 
             ++$current;
         }
-
     }
 
 
@@ -257,7 +253,6 @@ public static function dataTypedConstant()
         }
 
         return $data;
-
     }
 
 
@@ -367,7 +362,6 @@ public static function dataNullableTypedConstant()
         }
 
         return $data;
-
     }
 
 
@@ -449,7 +443,6 @@ public static function dataUnionTypedConstant()
         }
 
         return $data;
-
     }
 
 
@@ -487,7 +480,6 @@ public static function dataIntersectionTypedConstant()
         }
 
         return $data;
-
     }
 
 
@@ -632,7 +624,6 @@ public static function dataDNFTypedConstant()
         }
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/Tokenizers/PHP/YieldTest.php b/tests/Core/Tokenizers/PHP/YieldTest.php
index 8c4922ac13..5852dcbf14 100644
--- a/tests/Core/Tokenizers/PHP/YieldTest.php
+++ b/tests/Core/Tokenizers/PHP/YieldTest.php
@@ -41,7 +41,6 @@ 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');
-
     }
 
 
@@ -60,7 +59,6 @@ public static function dataYieldKeyword()
                 'expectedContent' => 'yield',
             ],
         ];
-
     }
 
 
@@ -89,7 +87,6 @@ public function testYieldFromKeywordSingleToken($testMarker, $expectedContent)
         } else {
             $this->assertSame($expectedContent, $tokenArray['content'], 'Token content does not match expectation');
         }
-
     }
 
 
@@ -116,7 +113,6 @@ public static function dataYieldFromKeywordSingleToken()
                 'expectedContent' => 'yield	from',
             ],
         ];
-
     }
 
 
@@ -155,7 +151,6 @@ public function testYieldFromKeywordMultiToken($testMarker, $expectedTokens)
 
             ++$target;
         }
-
     }
 
 
@@ -381,7 +376,6 @@ public static function dataYieldFromKeywordMultiToken()
                 ],
             ],
         ];
-
     }
 
 
@@ -402,7 +396,6 @@ 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)');
-
     }
 
 
@@ -425,7 +418,6 @@ public static function dataYieldNonKeyword()
             'from used as class constant access'  => ['/* testFromUsedForClassConstantAccess1 */'],
             'yield used as method name with ref'  => ['/* testYieldUsedAsMethodNameReturnByRef */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
index 8d8d4667eb..c082c370a2 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
@@ -69,7 +69,6 @@ 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');
         }
-
     }
 
 
@@ -174,7 +173,6 @@ public static function dataNormalParentheses()
                 'testMarker' => '/* testParensNoOwnerInArrowReturnExpression */',
             ],
         ];
-
     }
 
 
@@ -223,7 +221,6 @@ 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
-
     }
 
 
@@ -367,7 +364,6 @@ public static function dataDNFTypeParentheses()
                 'testMarker' => '/* testDNFTypeParamIllegalNestedParens */',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
index a07744e806..97d561cc89 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
@@ -47,7 +47,6 @@ 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.");
         }
-
     }
 
 
@@ -110,7 +109,6 @@ public static function dataHeredocNowdocCloserTabReplacement()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
index 25b6f9c389..4c97ea6bd8 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
@@ -44,7 +44,6 @@ 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.");
         }
-
     }
 
 
@@ -115,7 +114,6 @@ public static function dataHeredocNowdocOpenerTabReplacement()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
index 38dd896893..dc8ffd7386 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
@@ -100,7 +100,6 @@ public static function getTabReplacementExpected()
                 'orig_content' => null,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
index fbc09038d9..7644133ec7 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
@@ -46,7 +46,6 @@ 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.");
         }
-
     }
 
 
@@ -93,7 +92,6 @@ public static function dataYieldFromTabReplacement()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
index 520efdb11f..f7d4bb7bd4 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
@@ -39,7 +39,6 @@ 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');
-
     }
 
 
@@ -73,7 +72,6 @@ public static function dataArrayKeyword()
                 'testMarker' => '/* testOOConstDefault */',
             ],
         ];
-
     }
 
 
@@ -101,7 +99,6 @@ 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');
-
     }
 
 
@@ -150,7 +147,6 @@ public static function dataArrayType()
                 'testContent' => 'Array',
             ],
         ];
-
     }
 
 
@@ -179,7 +175,6 @@ 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');
-
     }
 
 
@@ -205,7 +200,6 @@ public static function dataNotArrayKeyword()
                 'testContent' => 'ARRAY',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
index 27ffd2ca57..0039f47575 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
@@ -33,7 +33,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
index 3b00e6e15e..4cddee5956 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
@@ -36,7 +36,6 @@ 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');
-
     }
 
 
@@ -61,7 +60,6 @@ public static function dataUseNotClosure()
                 'testMarker' => '/* testUseTraitInNestedAnonClass */',
             ],
         ];
-
     }
 
 
@@ -115,7 +113,6 @@ public function testUseNotClosureNextOpenClose($testMarker, $expectedOwnerCode =
                 'Closer "parenthesis_owner" key set to unexpected owner'
             );
         }
-
     }
 
 
@@ -132,7 +129,6 @@ public static function dataUseNotClosureNextOpenClose()
         $data['Trait use statement']['expectedOwnerCode'] = T_FUNCTION;
 
         return $data;
-
     }
 
 
@@ -173,7 +169,6 @@ 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');
-
     }
 
 
@@ -188,7 +183,6 @@ public static function dataClosureUse()
             'Plain closure use'           => ['/* testClosureUse */'],
             'Closure use nested in class' => ['/* testClosureUseNestedInClass */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
index 578cf27883..fff59cf8ce 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
@@ -63,7 +63,6 @@ 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');
-
     }
 
 
@@ -225,7 +224,6 @@ public static function dataParenthesesWithOwner()
                 'tokenCode'  => T_ANON_CLASS,
             ],
         ];
-
     }
 
 
@@ -259,7 +257,6 @@ 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');
-
     }
 
 
@@ -287,7 +284,6 @@ public static function dataParenthesesWithoutOwner()
                 'testMarker' => '/* testNestedFunctionCallCParenthesesOpener */',
             ],
         ];
-
     }
 
 
@@ -312,7 +308,6 @@ 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');
-
     }
 
 
@@ -337,7 +332,6 @@ public static function dataParenthesesOwnerWithoutParentheses()
                 'tokenCode'  => T_EXIT,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
index 22b941d06e..bf1beb277f 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
@@ -37,7 +37,6 @@ 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');
-
     }
 
 
@@ -59,7 +58,6 @@ public static function dataEnumCases()
             'enum case, after switch statement'                          => ['/* testEnumCaseAfterSwitch */'],
             'enum case, after switch statement using alternative syntax' => ['/* testEnumCaseAfterSwitchWithEndSwitch */'],
         ];
-
     }
 
 
@@ -125,7 +123,6 @@ public function testNotEnumCases($testMarker, $expectedTokens, $testCloserMarker
                 $tokens[$tokenArray['scope_closer']]['type']
             )
         );
-
     }
 
 
@@ -216,7 +213,6 @@ public static function dataNotEnumCases()
                 ],
             ],
         ];
-
     }
 
 
@@ -242,7 +238,6 @@ 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');
-
     }
 
 
@@ -265,7 +260,6 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"array" as case name'     => ['/* testKeywordAsEnumCaseNameShouldBeString7 */'],
             '"exit" as case name'      => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
index fbc9fa0cc5..7d1de1cee7 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
@@ -73,7 +73,6 @@ public function testMatchDefault($testMarker, $testContent = 'default')
             $tokenArray,
             sprintf('Scope closer is set. Marker: %s.', $testMarker)
         );
-
     }
 
 
@@ -128,7 +127,6 @@ public static function dataMatchDefault()
                 'testContent' => 'DEFAULT',
             ],
         ];
-
     }
 
 
@@ -283,7 +281,6 @@ public function testSwitchDefault($testMarker, $openerMarker, $closerMarker, $co
                 );
             }
         }//end if
-
     }
 
 
@@ -341,7 +338,6 @@ public static function dataSwitchDefault()
                 'closerMarker' => '/* testSwitchDefaultNestedIfWithAndWithoutBracesScopeCloser */',
             ],
         ];
-
     }
 
 
@@ -390,7 +386,6 @@ public function testNotDefaultKeyword($testMarker, $testContent = 'DEFAULT')
             $tokenArray,
             sprintf('Scope closer is set. Marker: %s.', $testMarker)
         );
-
     }
 
 
@@ -467,7 +462,6 @@ public static function dataNotDefaultKeyword()
                 'testContent' => 'default',
             ],
         ];
-
     }
 
 
@@ -490,7 +484,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
index 489c540bce..025fcfe2f1 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
@@ -69,7 +69,6 @@ public function testIfElseWithNestedCaseMissingBreakSharedClosers()
                 $tokens[$tokenArray['scope_closer']]['type']
             )
         );
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
index b82ee9ab25..766ceecb42 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
@@ -83,7 +83,6 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker
                 $tokens[$tokenArray['scope_closer']]['type']
             )
         );
-
     }
 
 
@@ -153,7 +152,6 @@ public static function dataSwitchScope()
             ],
 
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
index 692ed376ab..d082453fc2 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
@@ -50,7 +50,6 @@ 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');
-
     }
 
 
@@ -91,7 +90,6 @@ public static function dataScopeSetting()
                 'close'      => [T_SEMICOLON],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
index 937a594b25..a10efaffa9 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
@@ -54,7 +54,6 @@ 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.");
-
     }
 
 
@@ -86,7 +85,6 @@ 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');
-
     }
 
 
@@ -116,7 +114,6 @@ 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.");
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
index 938093bb6e..5e8bf33e96 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
@@ -104,7 +104,6 @@ public static function getTabReplacementExpected()
 ',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
index 1151f0f92c..e18e77f0c8 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
@@ -104,7 +104,6 @@ public static function getTabReplacementExpected()
 ',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
index a071cf1d41..ff0d8c49e9 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
@@ -104,7 +104,6 @@ public static function getTabReplacementExpected()
 ',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
index ae6bac3284..d8d7bd9c1f 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
@@ -104,7 +104,6 @@ public static function getTabReplacementExpected()
 ',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
index d452082612..1b47becd78 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
@@ -48,7 +48,6 @@ 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));
         }
-
     }
 
 
@@ -60,7 +59,6 @@ public static function setUpBeforeClass(): void
     public static function tearDownAfterClass(): void
     {
         @unlink(self::$caseFileName);
-
     }
 
 
@@ -93,7 +91,6 @@ 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.");
         }
-
     }
 
 
@@ -128,7 +125,6 @@ public static function dataNoReplacementsAreMadeWhenNoTabsAreFound()
                 ],
             ],
         ];
-
     }
 
 
@@ -160,7 +156,6 @@ 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.");
         }
-
     }
 
 
@@ -251,7 +246,6 @@ public static function dataTabReplacement()
         $data['Mixed tab/space indentation']['offset'] = 1;
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/Util/Common/EscapeshellcmdTest.php b/tests/Core/Util/Common/EscapeshellcmdTest.php
index 6be2e61473..ea74814528 100644
--- a/tests/Core/Util/Common/EscapeshellcmdTest.php
+++ b/tests/Core/Util/Common/EscapeshellcmdTest.php
@@ -41,7 +41,6 @@ public function testEscapeshellcmd($command, $expected, $expectedWin = null)
         }
 
         $this->assertSame($expected, Common::escapeshellcmd($command));
-
     }
 
 
@@ -84,7 +83,6 @@ public static function dataEscapeshellcmd()
                 'expectedWin' => 'php^ -f^ ./^~home/path^ to/file.php',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Common/GetSniffCodeTest.php b/tests/Core/Util/Common/GetSniffCodeTest.php
index 9db672cff2..773b10cc67 100644
--- a/tests/Core/Util/Common/GetSniffCodeTest.php
+++ b/tests/Core/Util/Common/GetSniffCodeTest.php
@@ -39,7 +39,6 @@ public function testGetSniffCodeThrowsExceptionOnInvalidInput($input)
         $this->expectExceptionMessage($message);
 
         Common::getSniffCode($input);
-
     }
 
 
@@ -56,7 +55,6 @@ public static function dataGetSniffCodeThrowsExceptionOnInvalidInput()
             'Class name is not a string' => [true],
             'Class name is empty'        => [''],
         ];
-
     }
 
 
@@ -78,7 +76,6 @@ public function testGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTestClass(
         $this->expectExceptionMessage($message);
 
         Common::getSniffCode($input);
-
     }
 
 
@@ -103,7 +100,6 @@ 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'],
         ];
-
     }
 
 
@@ -120,7 +116,6 @@ public static function dataGetSniffCodeThrowsExceptionOnInputWhichIsNotASniffTes
     public function testGetSniffCode($fqnClass, $expected)
     {
         $this->assertSame($expected, Common::getSniffCode($fqnClass));
-
     }
 
 
@@ -159,7 +154,6 @@ public static function dataGetSniffCode()
                 'expected' => 'MyStandard.Category.AnalyzeMe',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Common/IsCamelCapsTest.php b/tests/Core/Util/Common/IsCamelCapsTest.php
index 4f0bff2695..29b6a0d1f8 100644
--- a/tests/Core/Util/Common/IsCamelCapsTest.php
+++ b/tests/Core/Util/Common/IsCamelCapsTest.php
@@ -34,7 +34,6 @@ final class IsCamelCapsTest extends TestCase
     public function testValidNotClassFormatPublic($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, false, true, $strict));
-
     }
 
 
@@ -61,7 +60,6 @@ public static function dataValidNotClassFormatPublic()
                 'strict' => false,
             ],
         ];
-
     }
 
 
@@ -77,7 +75,6 @@ public static function dataValidNotClassFormatPublic()
     public function testInvalidNotClassFormatPublic($name)
     {
         $this->assertFalse(Common::isCamelCaps($name, false, true, true));
-
     }
 
 
@@ -135,7 +132,6 @@ public static function dataInvalidNotClassFormatPublic()
                 'name' => '',
             ],
         ];
-
     }
 
 
@@ -152,7 +148,6 @@ public static function dataInvalidNotClassFormatPublic()
     public function testValidNotClassFormatPrivate($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, false, false, $strict));
-
     }
 
 
@@ -187,7 +182,6 @@ public static function dataValidNotClassFormatPrivate()
                 'strict' => true,
             ],
         ];
-
     }
 
 
@@ -204,7 +198,6 @@ public static function dataValidNotClassFormatPrivate()
     public function testInvalidNotClassFormatPrivate($name, $strict)
     {
         $this->assertFalse(Common::isCamelCaps($name, false, false, $strict));
-
     }
 
 
@@ -267,7 +260,6 @@ public static function dataInvalidNotClassFormatPrivate()
                 'strict' => true,
             ],
         ];
-
     }
 
 
@@ -284,7 +276,6 @@ public static function dataInvalidNotClassFormatPrivate()
     public function testValidClassFormatPublic($name, $strict)
     {
         $this->assertTrue(Common::isCamelCaps($name, true, true, $strict));
-
     }
 
 
@@ -331,7 +322,6 @@ public static function dataValidClassFormatPublic()
                 'strict' => false,
             ],
         ];
-
     }
 
 
@@ -347,7 +337,6 @@ public static function dataValidClassFormatPublic()
     public function testInvalidClassFormat($name)
     {
         $this->assertFalse(Common::isCamelCaps($name, true));
-
     }
 
 
@@ -374,7 +363,6 @@ public static function dataInvalidClassFormat()
                 'name' => '',
             ],
         ];
-
     }
 
 
@@ -394,7 +382,6 @@ public static function dataInvalidClassFormat()
     public function testInvalidClassFormatWithVisibilityPublicFlag($name, $visibilityPublic)
     {
         $this->assertFalse(Common::isCamelCaps($name, true, $visibilityPublic));
-
     }
 
 
@@ -425,7 +412,6 @@ public static function dataInvalidClassFormatWithVisibilityPublicFlag()
                 'visibilityPublic' => false,
             ],
         ];
-
     }
 
 
@@ -441,7 +427,6 @@ public static function dataInvalidClassFormatWithVisibilityPublicFlag()
     public function testValidDefaultArguments($name)
     {
         $this->assertTrue(Common::isCamelCaps($name));
-
     }
 
 
@@ -462,7 +447,6 @@ public static function dataValidDefaultArguments()
                 'name' => 'this3IsCamelCaps',
             ],
         ];
-
     }
 
 
@@ -478,7 +462,6 @@ public static function dataValidDefaultArguments()
     public function testInvalidDefaultArguments($name)
     {
         $this->assertFalse(Common::isCamelCaps($name));
-
     }
 
 
@@ -505,7 +488,6 @@ public static function dataInvalidDefaultArguments()
                 'name' => 'thisISCamelCaps',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Common/PrepareForOutputTest.php b/tests/Core/Util/Common/PrepareForOutputTest.php
index ef60b1cfdf..78e0480a8d 100644
--- a/tests/Core/Util/Common/PrepareForOutputTest.php
+++ b/tests/Core/Util/Common/PrepareForOutputTest.php
@@ -37,7 +37,6 @@ final class PrepareForOutputTest extends TestCase
     public function testPrepareForOutput($content, $exclude, $expected, $expectedWin)
     {
         $this->assertSame($expected, Common::prepareForOutput($content, $exclude));
-
     }
 
 
@@ -57,7 +56,6 @@ public function testPrepareForOutput($content, $exclude, $expected, $expectedWin
     public function testPrepareForOutputWindows($content, $exclude, $expected, $expectedWin)
     {
         $this->assertSame($expectedWin, Common::prepareForOutput($content, $exclude));
-
     }
 
 
@@ -106,7 +104,6 @@ public static function dataPrepareForOutput()
                 'expectedWin' => "\r\n\\t ",
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Common/StripColorsTest.php b/tests/Core/Util/Common/StripColorsTest.php
index bdc4805068..a27547bc2c 100644
--- a/tests/Core/Util/Common/StripColorsTest.php
+++ b/tests/Core/Util/Common/StripColorsTest.php
@@ -34,7 +34,6 @@ final class StripColorsTest extends TestCase
     public function testStripColors($text, $expected)
     {
         $this->assertSame($expected, Common::stripColors($text));
-
     }
 
 
@@ -89,7 +88,6 @@ public static function dataStripColors()
 Next line Last',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Common/SuggestTypeTest.php b/tests/Core/Util/Common/SuggestTypeTest.php
index a307287ebf..1e995cfa8e 100644
--- a/tests/Core/Util/Common/SuggestTypeTest.php
+++ b/tests/Core/Util/Common/SuggestTypeTest.php
@@ -29,7 +29,6 @@ final class SuggestTypeTest extends TestCase
     public function testSuggestTypeEmpty()
     {
         $this->assertSame('', Common::suggestType(''));
-
     }
 
 
@@ -46,7 +45,6 @@ public function testSuggestTypeAllowedType($varType)
     {
         $result = Common::suggestType($varType);
         $this->assertSame($varType, $result);
-
     }
 
 
@@ -65,7 +63,6 @@ public static function dataSuggestTypeAllowedType()
         }
 
         return $data;
-
     }
 
 
@@ -83,7 +80,6 @@ public function testSuggestTypeAllowedTypeWrongCase($varType, $expected)
     {
         $result = Common::suggestType($varType);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -109,7 +105,6 @@ public static function dataSuggestTypeAllowedTypeWrongCase()
         }
 
         return $data;
-
     }
 
 
@@ -127,7 +122,6 @@ public function testSuggestTypeOther($varType, $expected)
     {
         $result = Common::suggestType($varType);
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -217,7 +211,6 @@ public static function dataSuggestTypeOther()
                 'expected' => '\DateTime',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/ExitCode/ExitCodeTest.php b/tests/Core/Util/ExitCode/ExitCodeTest.php
index fac1cfd270..156f084981 100644
--- a/tests/Core/Util/ExitCode/ExitCodeTest.php
+++ b/tests/Core/Util/ExitCode/ExitCodeTest.php
@@ -49,7 +49,6 @@ protected function setUp(): void
 
         // Reset static properties on the Config class.
         AbstractRunnerTestCase::setUp();
-
     }
 
 
@@ -68,7 +67,6 @@ 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);
-
     }
 
 
@@ -91,7 +89,6 @@ public static function tearDownAfterClass(): void
         }
 
         AbstractRunnerTestCase::tearDownAfterClass();
-
     }
 
 
@@ -110,7 +107,6 @@ public function testPhpcsNoParallel($extraArgs, $expected)
         $extraArgs[] = self::SOURCE_DIR . 'mix-errors-warnings.inc';
 
         $this->runPhpcsAndCheckExitCode($extraArgs, $expected);
-
     }
 
 
@@ -136,7 +132,6 @@ public function testPhpcsParallel($extraArgs, $expected)
         $extraArgs[] = '--parallel=3';
 
         $this->runPhpcsAndCheckExitCode($extraArgs, $expected);
-
     }
 
 
@@ -171,7 +166,6 @@ 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);
-
     }
 
 
@@ -198,7 +192,6 @@ private function runPhpcsAndCheckExitCode($extraArgs, $expected)
         ob_end_clean();
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -368,7 +361,6 @@ public static function dataPhpcs()
                 'expected'  => 1,
             ],
         ];
-
     }
 
 
@@ -388,7 +380,6 @@ public function testPhpcbfNoParallel($extraArgs, $expected)
         $extraArgs[] = self::SOURCE_DIR . 'mix-errors-warnings.inc';
 
         $this->runPhpcbfAndCheckExitCode($extraArgs, $expected);
-
     }
 
 
@@ -415,7 +406,6 @@ public function testPhpcbfParallel($extraArgs, $expected)
         $extraArgs[] = '--parallel=3';
 
         $this->runPhpcbfAndCheckExitCode($extraArgs, $expected);
-
     }
 
 
@@ -442,7 +432,6 @@ private function runPhpcbfAndCheckExitCode($extraArgs, $expected)
         ob_end_clean();
 
         $this->assertSame($expected, $actual);
-
     }
 
 
@@ -640,7 +629,6 @@ public static function dataPhpcbf()
                 'expected'  => 0,
             ],
         ];
-
     }
 
 
@@ -666,7 +654,6 @@ private function setServerArgs($cmd, $extraArgs)
         foreach ($extraArgs as $arg) {
             $_SERVER['argv'][] = $arg;
         }
-
     }
 
 
diff --git a/tests/Core/Util/Help/HelpTest.php b/tests/Core/Util/Help/HelpTest.php
index 55548ac099..20d8219b29 100644
--- a/tests/Core/Util/Help/HelpTest.php
+++ b/tests/Core/Util/Help/HelpTest.php
@@ -65,7 +65,6 @@ public function testQaArgumentNamesAreWithinAcceptableBounds()
                 );
             }
         }
-
     }
 
 
@@ -129,7 +128,6 @@ public function testQaValidCategoryOptionDefinitions()
                 }
             }//end foreach
         }//end foreach
-
     }
 
 
@@ -143,7 +141,6 @@ public function testConstructorTypeError()
         $this->expectException(TypeError::class);
 
         new Help(new ConfigDouble(), [], []);
-
     }
 
 
@@ -176,7 +173,6 @@ public function testOptionFiltering($longOptions, $shortOptions, $expected)
         }
 
         $this->assertSame($expected, $activeOptions, 'Option count per category does not match');
-
     }
 
 
@@ -282,7 +278,6 @@ public static function dataOptionFiltering()
                 ],
             ],
         ];
-
     }
 
 
@@ -321,7 +316,6 @@ public function testOptionFilteringSpacerHandling($longOptions, $shortOptions)
                 $previousWasSpacer = isset($option['spacer']);
             }
         }
-
     }
 
 
@@ -358,7 +352,6 @@ public static function dataOptionFilteringSpacerHandling()
                 'shortOptions' => 'spqm',
             ],
         ];
-
     }
 
 
@@ -380,7 +373,6 @@ public function testDisplayUsageCS($cliArgs, $expectedRegex)
 
         $expectedRegex = str_replace('phpc(bf|s)', 'phpcs', $expectedRegex);
         $this->verifyDisplayUsage($cliArgs, $expectedRegex);
-
     }
 
 
@@ -403,7 +395,6 @@ public function testDisplayUsageCBF($cliArgs, $expectedRegex)
 
         $expectedRegex = str_replace('phpc(bf|s)', 'phpcbf', $expectedRegex);
         $this->verifyDisplayUsage($cliArgs, $expectedRegex);
-
     }
 
 
@@ -423,7 +414,6 @@ private function verifyDisplayUsage($cliArgs, $expectedRegex)
         $this->expectOutputRegex($expectedRegex);
 
         $help->display();
-
     }
 
 
@@ -444,7 +434,6 @@ public static function dataDisplayUsage()
                 'expectedRegex' => '`^\s*\\033\[33mUsage:\\033\[0m\s+phpc(bf|s) \[options\] \<file\|directory\>\s+$`',
             ],
         ];
-
     }
 
 
@@ -473,7 +462,6 @@ public function testReportWidthCalculations($reportWidth, $longOptions, $expecte
         $this->invokeReflectionMethod($help, 'printCategories');
 
         $this->expectOutputString($expectedOutput);
-
     }
 
 
@@ -530,7 +518,6 @@ public static function dataReportWidthCalculations()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -550,7 +537,6 @@ public function testColorizeVariableInput($input, $expected)
         $result = $this->invokeReflectionMethod($help, 'colorizeVariableInput', $input);
 
         $this->assertSame($expected, $result);
-
     }
 
 
@@ -591,7 +577,6 @@ public static function dataColorizeVariableInput()
                 'expected' => "Start \033[36m<This <is> text>\033[32m end",
             ],
         ];
-
     }
 
 
@@ -615,7 +600,6 @@ public function testPrintCategoryOptionsNoColor($input, $expectedRegex)
         $this->invokeReflectionMethod($help, 'printCategoryOptions', $input);
 
         $this->expectOutputRegex($expectedRegex['no-color']);
-
     }
 
 
@@ -639,7 +623,6 @@ public function testPrintCategoryOptionsColor($input, $expectedRegex)
         $this->invokeReflectionMethod($help, 'printCategoryOptions', $input);
 
         $this->expectOutputRegex($expectedRegex['color']);
-
     }
 
 
@@ -710,7 +693,6 @@ public static function dataPrintCategoryOptions()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -737,7 +719,6 @@ private function invokeReflectionMethod(Help $help, $methodName, $params = null)
         (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(false);
 
         return $returnValue;
-
     }
 
 
@@ -757,7 +738,6 @@ private function getReflectionProperty(Help $help, $properyName)
         (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false);
 
         return $returnValue;
-
     }
 
 
@@ -776,7 +756,6 @@ 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);
-
     }
 
 
diff --git a/tests/Core/Util/IgnoreList/CheckAndSetTest.php b/tests/Core/Util/IgnoreList/CheckAndSetTest.php
index 226774b426..4f9ff0caa5 100644
--- a/tests/Core/Util/IgnoreList/CheckAndSetTest.php
+++ b/tests/Core/Util/IgnoreList/CheckAndSetTest.php
@@ -41,7 +41,6 @@ public function testCheckAndSet($toSet, $toCheck)
         foreach ($toCheck as $code => $expect) {
             $this->assertSame($expect, $ignoreList->isIgnored($code), "$code is ignored");
         }
-
     }
 
 
@@ -138,7 +137,6 @@ public static function dataCheckAndSet()
                 ],
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
index c382c03361..50fefec1a4 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
@@ -30,7 +30,6 @@ public function testGetInstanceIgnoringAllWorks()
         $ignoreList = IgnoreList::getInstanceIgnoringAll();
         $this->assertInstanceOf(IgnoreList::class, $ignoreList);
         $this->assertTrue($ignoreList->isIgnored('Anything'));
-
     }
 
 
diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
index 77f8484c72..7359572126 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
@@ -30,7 +30,6 @@ public function testGetInstanceIgnoringNothingWorks()
         $ignoreList = IgnoreList::getInstanceIgnoringNothing();
         $this->assertInstanceOf(IgnoreList::class, $ignoreList);
         $this->assertFalse($ignoreList->isIgnored('Anything'));
-
     }
 
 
diff --git a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
index ff975520a6..d67107e81a 100644
--- a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
+++ b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
@@ -35,7 +35,6 @@ 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');
-
     }
 
 
diff --git a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
index 970c57a3b3..010499b973 100644
--- a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
+++ b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
@@ -36,7 +36,6 @@ public function testIgnoresNothingAndEverything($ignoreList, $expectIgnoresNothi
     {
         $this->assertSame($expectIgnoresNothing, $ignoreList->ignoresNothing(), 'Ignores nothing');
         $this->assertSame($expectIgnoresEverything, $ignoreList->ignoresEverything(), 'Ignores everything');
-
     }
 
 
@@ -96,7 +95,6 @@ public static function dataIgnoresNothingAndEverything()
                 'expectIgnoresEverything' => true,
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/MessageCollector/MessageCollectorTest.php b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
index d106e5a8fc..385c08a28a 100644
--- a/tests/Core/Util/MessageCollector/MessageCollectorTest.php
+++ b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
@@ -40,7 +40,6 @@ public function testAddingNonStringMessageResultsInException($message)
 
         $msgCollector = new MessageCollector();
         $msgCollector->add($message);
-
     }
 
 
@@ -59,7 +58,6 @@ public static function dataAddingNonStringMessageResultsInException()
             'integer' => [10],
             'array'   => [['something' => 'incorrect']],
         ];
-
     }
 
 
@@ -81,7 +79,6 @@ public function testAddingMessageWithUnsupportedMessageTypeResultsInException($t
 
         $msgCollector = new MessageCollector();
         $msgCollector->add('Message', $type);
-
     }
 
 
@@ -105,7 +102,6 @@ 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],
         ];
-
     }
 
 
@@ -128,7 +124,6 @@ public function testContainsBlockingErrors($messages, $expected)
         $this->createErrorCache($msgCollector, $messages);
 
         $this->assertSame($expected, $msgCollector->containsBlockingErrors());
-
     }
 
 
@@ -171,7 +166,6 @@ public static function dataContainsBlockingErrors()
                 'expected' => true,
             ],
         ];
-
     }
 
 
@@ -201,7 +195,6 @@ public function testDisplayingNonBlockingMessages($messages, $expected)
         $msgCollector->display();
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -278,7 +271,6 @@ public static function dataDisplayingNonBlockingMessages()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -306,7 +298,6 @@ public function testDisplayingBlockingErrors($messages, $expected)
         $msgCollector = new MessageCollector();
         $this->createErrorCache($msgCollector, $messages);
         $msgCollector->display();
-
     }
 
 
@@ -355,7 +346,6 @@ public static function dataDisplayingBlockingErrors()
             ],
         ];
         // phpcs:enable
-
     }
 
 
@@ -382,7 +372,6 @@ public function testNonUniqueMessagesWithDifferentErrorLevelAreAccepted()
         $msgCollector->display();
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -409,7 +398,6 @@ public function testNonUniqueMessagesWithSameErrorLevelAreAccepted()
         $msgCollector->display();
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -441,7 +429,6 @@ public function testCallingDisplayTwiceWillNotShowMessagesTwice()
         $msgCollector->display();
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -472,7 +459,6 @@ public function testDisplayOrderHandling($order, $expected)
         $msgCollector->display($order);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -509,7 +495,6 @@ public static function dataDisplayOrderHandling()
                 'expected' => $expectedForSeverity,
             ],
         ];
-
     }
 
 
@@ -527,7 +512,6 @@ private function createErrorCache(MessageCollector $collector, $messages)
         foreach ($messages as $msg => $type) {
             $collector->add($msg, $type);
         }
-
     }
 
 
diff --git a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
index cbe4053a3f..59351c01e7 100644
--- a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
+++ b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
@@ -34,7 +34,6 @@ final class GetHumanReadableDurationTest extends TestCase
     public function testGetHumanReadableDuration($duration, $expected)
     {
         $this->assertSame($expected, Timing::getHumanReadableDuration($duration));
-
     }
 
 
@@ -107,7 +106,6 @@ public static function dataGetHumanReadableDuration()
                 'expected' => '89 mins, 24 secs',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Timing/TimingTest.php b/tests/Core/Util/Timing/TimingTest.php
index 736a8da27b..a9ebcd4baf 100644
--- a/tests/Core/Util/Timing/TimingTest.php
+++ b/tests/Core/Util/Timing/TimingTest.php
@@ -38,7 +38,6 @@ final class TimingTest extends TestCase
     public function testGetDurationWithoutStartReturnsZero()
     {
         $this->assertSame(0, Timing::getDuration());
-
     }
 
 
@@ -54,7 +53,6 @@ public function testGetDurationWithStartReturnsMilliseconds()
         $duration = Timing::getDuration();
 
         $this->assertIsFloat($duration);
-
     }
 
 
@@ -70,7 +68,6 @@ public function testGetDurationSinceReturnsMilliseconds()
         $duration = Timing::getDurationSince($startTime);
 
         $this->assertIsFloat($duration);
-
     }
 
 
@@ -86,7 +83,6 @@ public function testTimeIsNotPrintedIfTimerWasNeverStarted()
         Timing::printRunTime();
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -102,7 +98,6 @@ public function testTimeIsNotPrintedIfTimerWasNeverStartedEvenWhenForced()
         Timing::printRunTime(true);
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -123,7 +118,6 @@ public function testTimeIsPrintedOnlyOnce()
 
         $regex = '`^Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '$`';
         $this->assertStderrOutputMatchesRegex($regex);
-
     }
 
 
@@ -144,7 +138,6 @@ public function testTimeIsPrintedMultipleTimesOnlyIfForced()
 
         $regex = '`^(Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '){3}$`';
         $this->assertStderrOutputMatchesRegex($regex);
-
     }
 
 
diff --git a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
index a5d269d130..e8e4c516b0 100644
--- a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
+++ b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
@@ -34,7 +34,6 @@ final class GetHighestWeightedTokenTest extends TestCase
     public function testGetHighestWeightedToken($tokens, $expected)
     {
         $this->assertSame($expected, Tokens::getHighestWeightedToken($tokens));
-
     }
 
 
@@ -155,7 +154,6 @@ public static function dataGetHighestWeightedToken()
         ];
 
         return $data;
-
     }
 
 
diff --git a/tests/Core/Util/Tokens/TokenNameTest.php b/tests/Core/Util/Tokens/TokenNameTest.php
index bf97b51dae..2a3be30421 100644
--- a/tests/Core/Util/Tokens/TokenNameTest.php
+++ b/tests/Core/Util/Tokens/TokenNameTest.php
@@ -35,7 +35,6 @@ final class TokenNameTest extends TestCase
     public function testTokenName($tokenCode, $expected)
     {
         $this->assertSame($expected, Tokens::tokenName($tokenCode));
-
     }
 
 
@@ -75,7 +74,6 @@ public static function dataTokenName()
                 'expected'  => 'ing',
             ],
         ];
-
     }
 
 
@@ -155,7 +153,6 @@ public static function dataPolyfilledPHPNativeTokens()
                 'expected'  => 'T_PRIVATE_SET',
             ],
         ];
-
     }
 
 
diff --git a/tests/Core/Util/Writers/StatusWriterTest.php b/tests/Core/Util/Writers/StatusWriterTest.php
index b8a0bf2e64..20f6a5a442 100644
--- a/tests/Core/Util/Writers/StatusWriterTest.php
+++ b/tests/Core/Util/Writers/StatusWriterTest.php
@@ -37,7 +37,6 @@ public function testStatusSentToStdErr($message, $expected)
         StatusWriter::write($message);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -58,7 +57,6 @@ public static function dataStatusSentToStdErr()
                 'expected' => PHP_EOL,
             ],
         ];
-
     }
 
 
@@ -81,7 +79,6 @@ public function testStatusSentToStdErrIndentNewlines($message, $indent, $newline
         StatusWriter::write($message, $indent, $newlines);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -130,7 +127,6 @@ public static function dataStatusSentToStdErrIndentNewlines()
                 'expected' => 'This message should end up in stdErr with no tab indent and no new line',
             ],
         ];
-
     }
 
 
@@ -153,7 +149,6 @@ public function testStatusDoesNotGetPrintedWhenPaused()
         StatusWriter::write($message);
 
         $this->assertStderrOutputSameString('');
-
     }
 
 
@@ -184,7 +179,6 @@ public function testStatusDoesGetPrintedWhenPausedAndResumed()
         StatusWriter::write($message);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -208,7 +202,6 @@ public function testStatusDoesGetForcePrintedWhenPaused()
         StatusWriter::forceWrite($message);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -244,7 +237,6 @@ public function testStatusDoesGetForcePrintedWhenPausedAndResumed()
         StatusWriter::forceWrite($messageC);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -270,7 +262,6 @@ public function testWriteNewline()
         StatusWriter::forceWriteNewline();
 
         $this->assertStderrOutputSameString(PHP_EOL . PHP_EOL);
-
     }
 
 
@@ -326,7 +317,6 @@ public function testNestedPausing()
         StatusWriter::write($message);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
@@ -382,7 +372,6 @@ public function testResumingMoreOftenThanPaused()
         StatusWriter::write($messageA);
 
         $this->assertStderrOutputSameString($expected);
-
     }
 
 
diff --git a/tests/Standards/AbstractSniffTestCase.php b/tests/Standards/AbstractSniffTestCase.php
index 697fb57da9..96bfd57ed4 100644
--- a/tests/Standards/AbstractSniffTestCase.php
+++ b/tests/Standards/AbstractSniffTestCase.php
@@ -86,7 +86,6 @@ abstract class AbstractSniffTestCase extends TestCase
     public static function tearDownAfterClass(): void
     {
         @unlink(self::RULESET_FILENAME);
-
     }
 
 
@@ -121,7 +120,6 @@ protected function getTestFiles(string $testFileBase)
         sort($testFiles, SORT_NATURAL);
 
         return $testFiles;
-
     }
 
 
@@ -133,7 +131,6 @@ protected function getTestFiles(string $testFileBase)
     protected function shouldSkipTest()
     {
         return false;
-
     }
 
 
@@ -244,7 +241,6 @@ final public function testSniff()
         if (empty($failureMessages) === false) {
             $this->fail(implode(PHP_EOL, $failureMessages));
         }
-
     }
 
 
@@ -434,7 +430,6 @@ public function generateFailureMessages(LocalFile $file)
         }//end foreach
 
         return $failureMessages;
-
     }
 
 
@@ -448,7 +443,6 @@ public function generateFailureMessages(LocalFile $file)
      */
     public function setCliValues(string $testFile, Config $config)
     {
-
     }
 
 

From 484b89b3f0ec27d40811c3342bfbb8425b15d5be Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Tue, 9 Sep 2025 05:53:23 +0200
Subject: [PATCH 3/3] CS: remove blank lines at end of classes

Includes adjusting the rule from the PHPCS native ruleset to enforce no blank lines at the end of a class (well, no blank lines after the last function in an OO structure).
---
 autoload.php                                                | 2 --
 phpcs.xml.dist                                              | 6 +++++-
 scripts/BuildRequirementsCheckMatrix.php                    | 2 --
 src/Config.php                                              | 2 --
 src/Files/DummyFile.php                                     | 2 --
 src/Files/File.php                                          | 2 --
 src/Files/FileList.php                                      | 2 --
 src/Files/LocalFile.php                                     | 2 --
 src/Filters/ExactMatch.php                                  | 2 --
 src/Filters/Filter.php                                      | 2 --
 src/Filters/GitModified.php                                 | 2 --
 src/Filters/GitStaged.php                                   | 2 --
 src/Fixer.php                                               | 2 --
 src/Generators/Generator.php                                | 2 --
 src/Generators/HTML.php                                     | 2 --
 src/Generators/Markdown.php                                 | 2 --
 src/Generators/Text.php                                     | 2 --
 src/Reporter.php                                            | 2 --
 src/Reports/Cbf.php                                         | 4 ----
 src/Reports/Checkstyle.php                                  | 2 --
 src/Reports/Code.php                                        | 2 --
 src/Reports/Csv.php                                         | 2 --
 src/Reports/Diff.php                                        | 2 --
 src/Reports/Emacs.php                                       | 2 --
 src/Reports/Full.php                                        | 2 --
 src/Reports/Gitblame.php                                    | 2 --
 src/Reports/Hgblame.php                                     | 2 --
 src/Reports/Info.php                                        | 2 --
 src/Reports/Json.php                                        | 2 --
 src/Reports/Junit.php                                       | 2 --
 src/Reports/Notifysend.php                                  | 2 --
 src/Reports/Performance.php                                 | 2 --
 src/Reports/Report.php                                      | 2 --
 src/Reports/Source.php                                      | 2 --
 src/Reports/Summary.php                                     | 2 --
 src/Reports/Svnblame.php                                    | 2 --
 src/Reports/VersionControl.php                              | 2 --
 src/Reports/Xml.php                                         | 2 --
 src/Ruleset.php                                             | 2 --
 src/Runner.php                                              | 2 --
 src/Sniffs/AbstractArraySniff.php                           | 2 --
 src/Sniffs/AbstractPatternSniff.php                         | 2 --
 src/Sniffs/AbstractScopeSniff.php                           | 2 --
 src/Sniffs/AbstractVariableSniff.php                        | 2 --
 src/Sniffs/DeprecatedSniff.php                              | 2 --
 src/Sniffs/Sniff.php                                        | 2 --
 src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php    | 2 --
 .../Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php  | 2 --
 .../Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php | 2 --
 .../Generic/Sniffs/Classes/DuplicateClassNameSniff.php      | 2 --
 .../Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php    | 2 --
 .../Sniffs/CodeAnalysis/AssignmentInConditionSniff.php      | 2 --
 .../Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php  | 2 --
 .../Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php     | 2 --
 .../Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php   | 2 --
 .../CodeAnalysis/ForLoopWithTestFunctionCallSniff.php       | 2 --
 .../Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php | 2 --
 .../RequireExplicitBooleanOperatorPrecedenceSniff.php       | 2 --
 .../Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php   | 2 --
 .../Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php   | 2 --
 .../Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php    | 2 --
 .../Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php    | 2 --
 src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php | 2 --
 src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php      | 2 --
 src/Standards/Generic/Sniffs/Commenting/TodoSniff.php       | 2 --
 .../ControlStructures/DisallowYodaConditionsSniff.php       | 2 --
 .../ControlStructures/InlineControlStructureSniff.php       | 2 --
 src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php   | 2 --
 src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php  | 2 --
 .../Generic/Sniffs/Files/EndFileNoNewlineSniff.php          | 2 --
 src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php  | 2 --
 src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php      | 2 --
 src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php     | 2 --
 src/Standards/Generic/Sniffs/Files/LineLengthSniff.php      | 2 --
 .../Generic/Sniffs/Files/LowercasedFilenameSniff.php        | 2 --
 src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php | 2 --
 .../Generic/Sniffs/Files/OneInterfacePerFileSniff.php       | 2 --
 .../Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php | 2 --
 src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php | 2 --
 .../Sniffs/Formatting/DisallowMultipleStatementsSniff.php   | 2 --
 .../Sniffs/Formatting/MultipleStatementAlignmentSniff.php   | 2 --
 .../Generic/Sniffs/Formatting/SpaceAfterCastSniff.php       | 2 --
 .../Generic/Sniffs/Formatting/SpaceAfterNotSniff.php        | 2 --
 .../Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php      | 2 --
 .../Sniffs/Functions/FunctionCallArgumentSpacingSniff.php   | 2 --
 .../Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php | 2 --
 .../Functions/OpeningFunctionBraceKernighanRitchieSniff.php | 2 --
 .../Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php    | 2 --
 src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php  | 2 --
 .../NamingConventions/AbstractClassNamePrefixSniff.php      | 2 --
 .../Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php | 2 --
 .../Sniffs/NamingConventions/ConstructorNameSniff.php       | 2 --
 .../Sniffs/NamingConventions/InterfaceNameSuffixSniff.php   | 2 --
 .../Sniffs/NamingConventions/TraitNameSuffixSniff.php       | 2 --
 .../Sniffs/NamingConventions/UpperCaseConstantNameSniff.php | 2 --
 src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php  | 2 --
 .../Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php        | 2 --
 src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php     | 2 --
 .../Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php         | 2 --
 .../Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php  | 2 --
 .../Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php  | 2 --
 .../Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php        | 2 --
 src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php    | 2 --
 .../Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php          | 2 --
 src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php | 2 --
 src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php  | 2 --
 src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php     | 2 --
 src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php  | 2 --
 .../Generic/Sniffs/PHP/RequireStrictTypesSniff.php          | 2 --
 src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php         | 2 --
 src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php            | 2 --
 src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php | 2 --
 .../Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php      | 2 --
 .../Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php | 2 --
 .../Generic/Sniffs/VersionControl/GitMergeConflictSniff.php | 2 --
 .../Sniffs/VersionControl/SubversionPropertiesSniff.php     | 2 --
 .../Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php  | 2 --
 .../Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php  | 2 --
 .../Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php    | 2 --
 .../Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php    | 2 --
 .../Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php  | 2 --
 .../Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php    | 2 --
 .../Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php     | 2 --
 .../Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php          | 2 --
 .../Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php   | 2 --
 src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php  | 2 --
 .../Tests/Arrays/DisallowLongArraySyntaxUnitTest.php        | 2 --
 .../Tests/Arrays/DisallowShortArraySyntaxUnitTest.php       | 2 --
 .../Generic/Tests/Classes/DuplicateClassNameUnitTest.php    | 2 --
 .../Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php  | 2 --
 .../Tests/CodeAnalysis/AssignmentInConditionUnitTest.php    | 2 --
 .../Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php        | 2 --
 .../Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php   | 2 --
 .../Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php | 2 --
 .../CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php    | 2 --
 .../Tests/CodeAnalysis/JumbledIncrementerUnitTest.php       | 2 --
 .../RequireExplicitBooleanOperatorPrecedenceUnitTest.php    | 2 --
 .../Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php | 2 --
 .../Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php | 2 --
 .../Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php  | 2 --
 .../Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php  | 2 --
 .../Generic/Tests/Commenting/DocCommentUnitTest.php         | 2 --
 src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php    | 2 --
 src/Standards/Generic/Tests/Commenting/TodoUnitTest.php     | 2 --
 .../ControlStructures/DisallowYodaConditionsUnitTest.php    | 2 --
 .../ControlStructures/InlineControlStructureUnitTest.php    | 2 --
 src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php | 2 --
 .../Generic/Tests/Files/EndFileNewlineUnitTest.php          | 2 --
 .../Generic/Tests/Files/EndFileNoNewlineUnitTest.php        | 2 --
 .../Generic/Tests/Files/ExecutableFileUnitTest.php          | 2 --
 src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php    | 2 --
 src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php   | 2 --
 src/Standards/Generic/Tests/Files/LineLengthUnitTest.php    | 2 --
 .../Generic/Tests/Files/LowercasedFilenameUnitTest.php      | 2 --
 .../Generic/Tests/Files/OneClassPerFileUnitTest.php         | 2 --
 .../Generic/Tests/Files/OneInterfacePerFileUnitTest.php     | 2 --
 .../Tests/Files/OneObjectStructurePerFileUnitTest.php       | 2 --
 .../Generic/Tests/Files/OneTraitPerFileUnitTest.php         | 2 --
 .../Tests/Formatting/DisallowMultipleStatementsUnitTest.php | 2 --
 .../Tests/Formatting/MultipleStatementAlignmentUnitTest.php | 2 --
 .../Generic/Tests/Formatting/SpaceAfterCastUnitTest.php     | 2 --
 .../Generic/Tests/Formatting/SpaceAfterNotUnitTest.php      | 2 --
 .../Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php    | 2 --
 .../Tests/Functions/FunctionCallArgumentSpacingUnitTest.php | 2 --
 .../Functions/OpeningFunctionBraceBsdAllmanUnitTest.php     | 2 --
 .../OpeningFunctionBraceKernighanRitchieUnitTest.php        | 2 --
 .../Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php  | 2 --
 .../Generic/Tests/Metrics/NestingLevelUnitTest.php          | 2 --
 .../NamingConventions/AbstractClassNamePrefixUnitTest.php   | 2 --
 .../NamingConventions/CamelCapsFunctionNameUnitTest.php     | 2 --
 .../Tests/NamingConventions/ConstructorNameUnitTest.php     | 2 --
 .../Tests/NamingConventions/InterfaceNameSuffixUnitTest.php | 2 --
 .../Tests/NamingConventions/TraitNameSuffixUnitTest.php     | 2 --
 .../NamingConventions/UpperCaseConstantNameUnitTest.php     | 2 --
 .../Generic/Tests/PHP/BacktickOperatorUnitTest.php          | 2 --
 .../Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php      | 2 --
 src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php   | 2 --
 .../Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php       | 2 --
 .../Tests/PHP/DisallowAlternativePHPTagsUnitTest.php        | 2 --
 .../Tests/PHP/DisallowRequestSuperglobalUnitTest.php        | 2 --
 .../Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php      | 2 --
 src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php  | 2 --
 .../Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php        | 2 --
 .../Generic/Tests/PHP/LowerCaseConstantUnitTest.php         | 2 --
 .../Generic/Tests/PHP/LowerCaseKeywordUnitTest.php          | 2 --
 src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php   | 2 --
 .../Generic/Tests/PHP/NoSilencedErrorsUnitTest.php          | 2 --
 .../Generic/Tests/PHP/RequireStrictTypesUnitTest.php        | 2 --
 src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php       | 2 --
 src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php          | 2 --
 .../Generic/Tests/PHP/UpperCaseConstantUnitTest.php         | 2 --
 .../Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php    | 2 --
 .../Tests/Strings/UnnecessaryStringConcatUnitTest.php       | 2 --
 .../Tests/VersionControl/GitMergeConflictUnitTest.php       | 2 --
 .../Tests/VersionControl/SubversionPropertiesUnitTest.php   | 2 --
 .../WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php      | 2 --
 .../Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php        | 2 --
 .../Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php  | 2 --
 .../Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php  | 2 --
 .../WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php      | 2 --
 .../Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php  | 2 --
 .../Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php   | 2 --
 .../Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php        | 2 --
 .../Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php | 2 --
 src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php | 2 --
 src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php  | 2 --
 src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php   | 2 --
 .../PEAR/Sniffs/Commenting/FunctionCommentSniff.php         | 2 --
 src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php | 2 --
 .../PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php | 2 --
 .../Sniffs/ControlStructures/MultiLineConditionSniff.php    | 2 --
 src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php      | 2 --
 .../PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php     | 2 --
 .../PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php    | 2 --
 .../PEAR/Sniffs/Functions/FunctionDeclarationSniff.php      | 2 --
 .../PEAR/Sniffs/Functions/ValidDefaultValueSniff.php        | 2 --
 .../PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php   | 2 --
 .../Sniffs/NamingConventions/ValidFunctionNameSniff.php     | 2 --
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 --
 .../PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php    | 2 --
 .../PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php       | 2 --
 .../PEAR/Tests/Classes/ClassDeclarationUnitTest.php         | 2 --
 .../PEAR/Tests/Commenting/ClassCommentUnitTest.php          | 2 --
 src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php | 2 --
 .../PEAR/Tests/Commenting/FunctionCommentUnitTest.php       | 2 --
 .../PEAR/Tests/Commenting/InlineCommentUnitTest.php         | 2 --
 .../Tests/ControlStructures/ControlSignatureUnitTest.php    | 2 --
 .../Tests/ControlStructures/MultiLineConditionUnitTest.php  | 2 --
 src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php    | 2 --
 .../PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php   | 2 --
 .../PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php  | 2 --
 .../PEAR/Tests/Functions/FunctionDeclarationUnitTest.php    | 2 --
 .../PEAR/Tests/Functions/ValidDefaultValueUnitTest.php      | 2 --
 .../PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php | 2 --
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.php   | 2 --
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php   | 2 --
 .../PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php  | 2 --
 .../PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php     | 2 --
 src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php | 2 --
 src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php | 2 --
 src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php        | 2 --
 .../PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php        | 2 --
 .../PSR1/Tests/Classes/ClassDeclarationUnitTest.php         | 2 --
 src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php      | 2 --
 .../PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php      | 2 --
 .../PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php      | 2 --
 .../PSR12/Sniffs/Classes/ClassInstantiationSniff.php        | 2 --
 src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php    | 2 --
 .../PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php         | 2 --
 .../ControlStructures/BooleanOperatorPlacementSniff.php     | 2 --
 .../ControlStructures/ControlStructureSpacingSniff.php      | 2 --
 src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php  | 2 --
 src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php        | 2 --
 src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php   | 2 --
 src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php           | 2 --
 .../PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php | 2 --
 .../PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php   | 2 --
 .../PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php    | 2 --
 .../PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php | 2 --
 .../PSR12/Sniffs/Operators/OperatorSpacingSniff.php         | 2 --
 .../PSR12/Sniffs/Properties/ConstantVisibilitySniff.php     | 2 --
 src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php   | 2 --
 .../PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php    | 2 --
 .../PSR12/Tests/Classes/ClassInstantiationUnitTest.php      | 2 --
 src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php  | 2 --
 .../PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php       | 2 --
 .../ControlStructures/BooleanOperatorPlacementUnitTest.php  | 2 --
 .../ControlStructures/ControlStructureSpacingUnitTest.php   | 2 --
 .../PSR12/Tests/Files/DeclareStatementUnitTest.php          | 2 --
 src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php      | 2 --
 src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php | 2 --
 src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php         | 2 --
 .../Tests/Functions/NullableTypeDeclarationUnitTest.php     | 2 --
 .../PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php | 2 --
 .../PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php  | 2 --
 .../Tests/Namespaces/CompoundNamespaceDepthUnitTest.php     | 2 --
 .../PSR12/Tests/Operators/OperatorSpacingUnitTest.php       | 2 --
 .../PSR12/Tests/Properties/ConstantVisibilityUnitTest.php   | 2 --
 src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php | 2 --
 src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php | 2 --
 .../PSR2/Sniffs/Classes/PropertyDeclarationSniff.php        | 2 --
 .../ControlStructures/ControlStructureSpacingSniff.php      | 2 --
 .../Sniffs/ControlStructures/ElseIfDeclarationSniff.php     | 2 --
 .../Sniffs/ControlStructures/SwitchDeclarationSniff.php     | 2 --
 src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php         | 2 --
 src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php     | 2 --
 .../PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php      | 2 --
 .../PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php       | 2 --
 .../PSR2/Sniffs/Methods/MethodDeclarationSniff.php          | 2 --
 .../PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php    | 2 --
 .../PSR2/Sniffs/Namespaces/UseDeclarationSniff.php          | 2 --
 .../PSR2/Tests/Classes/ClassDeclarationUnitTest.php         | 2 --
 .../PSR2/Tests/Classes/PropertyDeclarationUnitTest.php      | 2 --
 .../ControlStructures/ControlStructureSpacingUnitTest.php   | 2 --
 .../Tests/ControlStructures/ElseIfDeclarationUnitTest.php   | 2 --
 .../Tests/ControlStructures/SwitchDeclarationUnitTest.php   | 2 --
 src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php       | 2 --
 src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php   | 2 --
 .../PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php    | 2 --
 .../PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php     | 2 --
 .../PSR2/Tests/Methods/MethodDeclarationUnitTest.php        | 2 --
 .../PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php  | 2 --
 .../PSR2/Tests/Namespaces/UseDeclarationUnitTest.php        | 2 --
 .../Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php        | 2 --
 src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php | 2 --
 .../Squiz/Sniffs/Classes/ClassDeclarationSniff.php          | 2 --
 src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php   | 2 --
 .../Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php    | 2 --
 .../Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php       | 2 --
 src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php  | 2 --
 src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php | 2 --
 src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php | 2 --
 .../Sniffs/Commenting/ClosingDeclarationCommentSniff.php    | 2 --
 .../Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php    | 2 --
 .../Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php      | 2 --
 src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php  | 2 --
 .../Squiz/Sniffs/Commenting/FunctionCommentSniff.php        | 2 --
 .../Sniffs/Commenting/FunctionCommentThrowTagSniff.php      | 2 --
 .../Squiz/Sniffs/Commenting/InlineCommentSniff.php          | 2 --
 .../Sniffs/Commenting/LongConditionClosingCommentSniff.php  | 2 --
 .../Squiz/Sniffs/Commenting/PostStatementCommentSniff.php   | 2 --
 .../Squiz/Sniffs/Commenting/VariableCommentSniff.php        | 2 --
 .../Sniffs/ControlStructures/ControlSignatureSniff.php      | 2 --
 .../Sniffs/ControlStructures/ElseIfDeclarationSniff.php     | 2 --
 .../ControlStructures/ForEachLoopDeclarationSniff.php       | 2 --
 .../Sniffs/ControlStructures/ForLoopDeclarationSniff.php    | 2 --
 .../Sniffs/ControlStructures/InlineIfDeclarationSniff.php   | 2 --
 .../Sniffs/ControlStructures/LowercaseDeclarationSniff.php  | 2 --
 .../Sniffs/ControlStructures/SwitchDeclarationSniff.php     | 2 --
 src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php     | 2 --
 .../Squiz/Sniffs/Formatting/OperatorBracketSniff.php        | 2 --
 .../Functions/FunctionDeclarationArgumentSpacingSniff.php   | 2 --
 .../Squiz/Sniffs/Functions/FunctionDeclarationSniff.php     | 2 --
 .../Sniffs/Functions/FunctionDuplicateArgumentSniff.php     | 2 --
 .../Squiz/Sniffs/Functions/GlobalFunctionSniff.php          | 2 --
 .../Sniffs/Functions/LowercaseFunctionKeywordsSniff.php     | 2 --
 .../Sniffs/Functions/MultiLineFunctionDeclarationSniff.php  | 2 --
 .../Sniffs/NamingConventions/ValidFunctionNameSniff.php     | 2 --
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 --
 .../Squiz/Sniffs/Objects/ObjectInstantiationSniff.php       | 2 --
 .../Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php | 2 --
 .../Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php | 2 --
 .../Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php   | 2 --
 src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php    | 2 --
 .../Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php      | 2 --
 .../Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php  | 2 --
 src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php    | 2 --
 .../Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php   | 2 --
 .../Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php  | 2 --
 src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php         | 2 --
 src/Standards/Squiz/Sniffs/PHP/EvalSniff.php                | 2 --
 src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php       | 2 --
 src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php             | 2 --
 src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php      | 2 --
 .../Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php         | 2 --
 src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php   | 2 --
 src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php    | 2 --
 src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php       | 2 --
 src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php   | 2 --
 .../Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php      | 2 --
 .../Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php          | 2 --
 src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php   | 2 --
 src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php  | 2 --
 .../Sniffs/WhiteSpace/ControlStructureSpacingSniff.php      | 2 --
 .../Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php    | 2 --
 .../Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php    | 2 --
 .../Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php        | 2 --
 .../Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php | 2 --
 .../Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php       | 2 --
 .../Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php  | 2 --
 .../Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php        | 2 --
 .../Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php      | 2 --
 .../Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php    | 2 --
 .../Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php       | 2 --
 .../Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php  | 2 --
 .../Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php      | 2 --
 .../Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php         | 2 --
 .../Squiz/Tests/Classes/ClassDeclarationUnitTest.php        | 2 --
 src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php | 2 --
 .../Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php  | 2 --
 .../Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php     | 2 --
 .../Squiz/Tests/Classes/ValidClassNameUnitTest.php          | 2 --
 .../Squiz/Tests/Commenting/BlockCommentUnitTest.php         | 2 --
 .../Squiz/Tests/Commenting/ClassCommentUnitTest.php         | 2 --
 .../Tests/Commenting/ClosingDeclarationCommentUnitTest.php  | 2 --
 .../Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php  | 2 --
 .../Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php    | 2 --
 .../Squiz/Tests/Commenting/FileCommentUnitTest.php          | 2 --
 .../Tests/Commenting/FunctionCommentThrowTagUnitTest.php    | 2 --
 .../Squiz/Tests/Commenting/FunctionCommentUnitTest.php      | 2 --
 .../Squiz/Tests/Commenting/InlineCommentUnitTest.php        | 2 --
 .../Commenting/LongConditionClosingCommentUnitTest.php      | 2 --
 .../Squiz/Tests/Commenting/PostStatementCommentUnitTest.php | 2 --
 .../Squiz/Tests/Commenting/VariableCommentUnitTest.php      | 2 --
 .../Tests/ControlStructures/ControlSignatureUnitTest.php    | 2 --
 .../Tests/ControlStructures/ElseIfDeclarationUnitTest.php   | 2 --
 .../ControlStructures/ForEachLoopDeclarationUnitTest.php    | 2 --
 .../Tests/ControlStructures/ForLoopDeclarationUnitTest.php  | 2 --
 .../Tests/ControlStructures/InlineIfDeclarationUnitTest.php | 2 --
 .../ControlStructures/LowercaseDeclarationUnitTest.php      | 2 --
 .../Tests/ControlStructures/SwitchDeclarationUnitTest.php   | 2 --
 src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php   | 2 --
 .../Squiz/Tests/Formatting/OperatorBracketUnitTest.php      | 2 --
 .../FunctionDeclarationArgumentSpacingUnitTest.php          | 2 --
 .../Squiz/Tests/Functions/FunctionDeclarationUnitTest.php   | 2 --
 .../Tests/Functions/FunctionDuplicateArgumentUnitTest.php   | 2 --
 .../Squiz/Tests/Functions/GlobalFunctionUnitTest.php        | 2 --
 .../Tests/Functions/LowercaseFunctionKeywordsUnitTest.php   | 2 --
 .../Functions/MultiLineFunctionDeclarationUnitTest.php      | 2 --
 .../Tests/NamingConventions/ValidFunctionNameUnitTest.php   | 2 --
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php   | 2 --
 .../Squiz/Tests/Objects/ObjectInstantiationUnitTest.php     | 2 --
 .../Tests/Operators/ComparisonOperatorUsageUnitTest.php     | 2 --
 .../Tests/Operators/IncrementDecrementUsageUnitTest.php     | 2 --
 .../Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php | 2 --
 src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php  | 2 --
 .../Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php    | 2 --
 .../Tests/PHP/DisallowComparisonAssignmentUnitTest.php      | 2 --
 src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php  | 2 --
 .../Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php | 2 --
 .../Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php      | 2 --
 .../Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php        | 2 --
 src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php       | 2 --
 src/Standards/Squiz/Tests/PHP/EvalUnitTest.php              | 2 --
 src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php     | 2 --
 src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php           | 2 --
 src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php    | 2 --
 .../Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php       | 2 --
 src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php | 2 --
 src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php  | 2 --
 src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php     | 2 --
 src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php | 2 --
 .../Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php    | 2 --
 .../Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php        | 2 --
 src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php | 2 --
 .../Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php          | 2 --
 .../Tests/WhiteSpace/ControlStructureSpacingUnitTest.php    | 2 --
 .../Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php  | 2 --
 .../Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php  | 2 --
 .../Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php      | 2 --
 .../Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php     | 2 --
 .../Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php     | 2 --
 .../Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php      | 2 --
 .../Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php      | 2 --
 .../Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php    | 2 --
 .../Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php  | 2 --
 .../Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php     | 2 --
 .../Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php      | 2 --
 src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php         | 2 --
 .../Sniffs/NamingConventions/ValidVariableNameSniff.php     | 2 --
 src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php       | 2 --
 .../Tests/NamingConventions/ValidVariableNameUnitTest.php   | 2 --
 src/Tokenizers/Comment.php                                  | 2 --
 src/Tokenizers/PHP.php                                      | 2 --
 src/Tokenizers/Tokenizer.php                                | 2 --
 src/Util/Cache.php                                          | 2 --
 src/Util/Common.php                                         | 2 --
 src/Util/ExitCode.php                                       | 2 --
 src/Util/Help.php                                           | 2 --
 src/Util/IgnoreList.php                                     | 2 --
 src/Util/MessageCollector.php                               | 2 --
 src/Util/Standards.php                                      | 2 --
 src/Util/Timing.php                                         | 2 --
 src/Util/Tokens.php                                         | 2 --
 src/Util/Writers/StatusWriter.php                           | 2 --
 tests/ConfigDouble.php                                      | 2 --
 tests/Core/AbstractMethodTestCase.php                       | 2 --
 tests/Core/Autoloader/DetermineLoadedClassTest.php          | 2 --
 tests/Core/Config/AbstractRealConfigTestCase.php            | 2 --
 tests/Core/Config/ExtensionsArgTest.php                     | 2 --
 tests/Core/Config/GeneratorArgTest.php                      | 2 --
 tests/Core/Config/IniSetTest.php                            | 2 --
 tests/Core/Config/IssueSquiz2675Test.php                    | 2 --
 tests/Core/Config/PrepareConfigDataForDisplayTest.php       | 2 --
 tests/Core/Config/ReportArgsTest.php                        | 2 --
 tests/Core/Config/ReportWidthTest.php                       | 2 --
 tests/Core/Config/SniffsExcludeArgsTest.php                 | 2 --
 tests/Core/ErrorSuppressionTest.php                         | 2 --
 .../Files/File/AddMessageSelectiveInternalHandlingTest.php  | 2 --
 tests/Core/Files/File/FindEndOfStatementTest.php            | 2 --
 tests/Core/Files/File/FindExtendedClassNameTest.php         | 2 --
 tests/Core/Files/File/FindImplementedInterfaceNamesTest.php | 2 --
 tests/Core/Files/File/FindStartOfStatementTest.php          | 2 --
 tests/Core/Files/File/GetClassPropertiesTest.php            | 2 --
 tests/Core/Files/File/GetConditionTest.php                  | 2 --
 tests/Core/Files/File/GetDeclarationNameParseError1Test.php | 2 --
 tests/Core/Files/File/GetDeclarationNameParseError2Test.php | 2 --
 tests/Core/Files/File/GetDeclarationNameTest.php            | 2 --
 tests/Core/Files/File/GetMemberPropertiesTest.php           | 2 --
 .../Core/Files/File/GetMethodParametersParseError1Test.php  | 2 --
 .../Core/Files/File/GetMethodParametersParseError2Test.php  | 2 --
 .../Core/Files/File/GetMethodParametersParseError3Test.php  | 2 --
 .../Core/Files/File/GetMethodParametersParseError4Test.php  | 2 --
 tests/Core/Files/File/GetMethodParametersTest.php           | 2 --
 tests/Core/Files/File/GetMethodPropertiesTest.php           | 2 --
 tests/Core/Files/File/GetTokensAsStringTest.php             | 2 --
 tests/Core/Files/File/IsReferenceTest.php                   | 2 --
 tests/Core/Files/FileList/AbstractFileListTestCase.php      | 2 --
 tests/Core/Files/FileList/AddFileTest.php                   | 2 --
 tests/Core/Files/FileList/ConstructTest.php                 | 2 --
 tests/Core/Files/FileList/FilterDouble.php                  | 2 --
 tests/Core/Filters/AbstractFilterTestCase.php               | 2 --
 tests/Core/Filters/Filter/AcceptTest.php                    | 2 --
 .../Filter/ShouldProcessFileWithoutExtensionTest.php        | 2 --
 tests/Core/Filters/GitModifiedTest.php                      | 2 --
 tests/Core/Filters/GitStagedTest.php                        | 2 --
 tests/Core/Fixer/FixFileReturnValueTest.php                 | 2 --
 tests/Core/Fixer/GenerateDiffTest.php                       | 2 --
 tests/Core/Generators/GeneratorTest.php                     | 2 --
 tests/Core/Generators/HTMLTest.php                          | 2 --
 tests/Core/Generators/MarkdownTest.php                      | 2 --
 tests/Core/Generators/TextTest.php                          | 2 --
 tests/Core/Reporter/MagicMethodsTest.php                    | 2 --
 tests/Core/Ruleset/AbstractRulesetTestCase.php              | 2 --
 tests/Core/Ruleset/ConstructorTest.php                      | 2 --
 tests/Core/Ruleset/DisplayCachedMessagesTest.php            | 2 --
 tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php   | 2 --
 tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php   | 2 --
 tests/Core/Ruleset/ExpandRulesetReferenceTest.php           | 2 --
 tests/Core/Ruleset/ExpandSniffDirectoryTest.php             | 2 --
 tests/Core/Ruleset/ExplainTest.php                          | 2 --
 tests/Core/Ruleset/GetIgnorePatternsTest.php                | 2 --
 tests/Core/Ruleset/GetIncludePatternsTest.php               | 2 --
 .../Ruleset/PopulateTokenListenersNamingConventionsTest.php | 2 --
 tests/Core/Ruleset/PopulateTokenListenersTest.php           | 2 --
 tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php           | 2 --
 tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php  | 2 --
 tests/Core/Ruleset/ProcessRulesetAutoloadTest.php           | 2 --
 tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php      | 2 --
 tests/Core/Ruleset/ProcessRulesetCliArgsTest.php            | 2 --
 tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php   | 2 --
 tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php      | 2 --
 tests/Core/Ruleset/ProcessRulesetIniSetTest.php             | 2 --
 .../Core/Ruleset/ProcessRulesetShouldProcessElementTest.php | 2 --
 tests/Core/Ruleset/ProcessRulesetTest.php                   | 2 --
 .../Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php | 2 --
 tests/Core/Ruleset/PropertyTypeHandlingTest.php             | 2 --
 tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php   | 2 --
 tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php  | 2 --
 tests/Core/Ruleset/RegisterSniffsTest.php                   | 2 --
 tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php       | 2 --
 tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php     | 2 --
 tests/Core/Ruleset/RuleInclusionTest.php                    | 2 --
 tests/Core/Ruleset/SetSniffPropertyTest.php                 | 2 --
 tests/Core/Ruleset/ShowSniffDeprecationsTest.php            | 2 --
 tests/Core/Runner/PrintProgressDotsTest.php                 | 2 --
 tests/Core/Runner/PrintProgressTest.php                     | 2 --
 tests/Core/Runner/RunAllFilesExcludedErrorTest.php          | 2 --
 tests/Core/Runner/RunPHPCSExplainTest.php                   | 2 --
 tests/Core/Runner/RunPHPCSGeneratorTest.php                 | 2 --
 tests/Core/Sniffs/AbstractArraySniffTest.php                | 2 --
 tests/Core/Sniffs/AbstractArraySniffTestable.php            | 2 --
 tests/Core/Standards/StandardRulesetsQATest.php             | 2 --
 tests/Core/StatusWriterTestHelper.php                       | 2 --
 tests/Core/Tokenizers/AbstractTokenizerTestCase.php         | 2 --
 tests/Core/Tokenizers/Comment/CommentTestCase.php           | 2 --
 tests/Core/Tokenizers/Comment/LiveCoding1Test.php           | 2 --
 tests/Core/Tokenizers/Comment/LiveCoding2Test.php           | 2 --
 tests/Core/Tokenizers/Comment/LiveCoding3Test.php           | 2 --
 tests/Core/Tokenizers/Comment/LiveCoding4Test.php           | 2 --
 tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php     | 2 --
 .../Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php   | 2 --
 tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php    | 2 --
 tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php | 2 --
 tests/Core/Tokenizers/PHP/ArrayKeywordTest.php              | 2 --
 tests/Core/Tokenizers/PHP/AttributesTest.php                | 2 --
 .../Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php     | 2 --
 tests/Core/Tokenizers/PHP/BackfillEnumTest.php              | 2 --
 .../Tokenizers/PHP/BackfillExplicitOctalNotationTest.php    | 2 --
 tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php | 2 --
 tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php           | 2 --
 tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php        | 2 --
 tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php  | 2 --
 tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php          | 2 --
 tests/Core/Tokenizers/PHP/BitwiseOrTest.php                 | 2 --
 .../Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php     | 2 --
 tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php  | 2 --
 tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php       | 2 --
 tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php       | 2 --
 tests/Core/Tokenizers/PHP/DNFTypesTest.php                  | 2 --
 tests/Core/Tokenizers/PHP/DefaultKeywordTest.php            | 2 --
 tests/Core/Tokenizers/PHP/DoubleArrowTest.php               | 2 --
 tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php        | 2 --
 tests/Core/Tokenizers/PHP/EnumCaseTest.php                  | 2 --
 tests/Core/Tokenizers/PHP/ExitKeywordTest.php               | 2 --
 tests/Core/Tokenizers/PHP/FinallyTest.php                   | 2 --
 tests/Core/Tokenizers/PHP/GotoLabelTest.php                 | 2 --
 tests/Core/Tokenizers/PHP/HeredocNowdocTest.php             | 2 --
 tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php         | 2 --
 tests/Core/Tokenizers/PHP/HeredocStringTest.php             | 2 --
 .../Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php  | 2 --
 tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php | 2 --
 tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php      | 2 --
 tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php    | 2 --
 .../Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php    | 2 --
 tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php            | 2 --
 tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php            | 2 --
 tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php            | 2 --
 tests/Core/Tokenizers/PHP/PHPOpenTagTest.php                | 2 --
 tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php        | 2 --
 tests/Core/Tokenizers/PHP/ShortArrayTest.php                | 2 --
 tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php   | 2 --
 .../Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php  | 2 --
 tests/Core/Tokenizers/PHP/TypeIntersectionTest.php          | 2 --
 tests/Core/Tokenizers/PHP/TypedConstantsTest.php            | 2 --
 tests/Core/Tokenizers/PHP/YieldTest.php                     | 2 --
 .../Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php   | 2 --
 .../Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php  | 2 --
 .../Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php  | 2 --
 .../Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php | 2 --
 .../Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php | 2 --
 .../Tokenizer/CreateTokenMapArrayParenthesesTest.php        | 2 --
 .../CreateTokenMapClosureUseParenthesesParseErrorTest.php   | 2 --
 .../Tokenizer/CreateTokenMapClosureUseParenthesesTest.php   | 2 --
 .../Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php  | 2 --
 .../Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php  | 2 --
 .../RecurseScopeMapDefaultKeywordConditionsTest.php         | 2 --
 .../Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php    | 2 --
 .../Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php       | 2 --
 .../Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php  | 2 --
 .../Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php     | 2 --
 .../Tokenizer/ReplaceTabsInTokenTabWidth1Test.php           | 2 --
 .../Tokenizer/ReplaceTabsInTokenTabWidth2Test.php           | 2 --
 .../Tokenizer/ReplaceTabsInTokenTabWidth4Test.php           | 2 --
 .../Tokenizer/ReplaceTabsInTokenTabWidth5Test.php           | 2 --
 .../Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php     | 2 --
 tests/Core/Util/Common/EscapeshellcmdTest.php               | 2 --
 tests/Core/Util/Common/GetSniffCodeTest.php                 | 2 --
 tests/Core/Util/Common/IsCamelCapsTest.php                  | 2 --
 tests/Core/Util/Common/PrepareForOutputTest.php             | 2 --
 tests/Core/Util/Common/StripColorsTest.php                  | 2 --
 tests/Core/Util/Common/SuggestTypeTest.php                  | 2 --
 tests/Core/Util/ExitCode/ExitCodeTest.php                   | 2 --
 tests/Core/Util/Help/HelpTest.php                           | 2 --
 tests/Core/Util/IgnoreList/CheckAndSetTest.php              | 2 --
 tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php   | 2 --
 .../Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php | 2 --
 tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php       | 2 --
 .../Util/IgnoreList/IgnoresNothingAndEverythingTest.php     | 2 --
 tests/Core/Util/MessageCollector/MessageCollectorTest.php   | 2 --
 tests/Core/Util/Timing/GetHumanReadableDurationTest.php     | 2 --
 tests/Core/Util/Timing/TimingTest.php                       | 2 --
 tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php      | 2 --
 tests/Core/Util/Tokens/TokenNameTest.php                    | 2 --
 tests/Core/Util/Writers/StatusWriterTest.php                | 2 --
 tests/Standards/AbstractSniffTestCase.php                   | 2 --
 646 files changed, 5 insertions(+), 1293 deletions(-)

diff --git a/autoload.php b/autoload.php
index 4bf0a10e89..3ad938ffd8 100644
--- a/autoload.php
+++ b/autoload.php
@@ -326,8 +326,6 @@ public static function getLoadedFiles()
         {
             return self::$loadedFiles;
         }
-
-
     }
 
     // Register the autoloader before any existing autoloaders to ensure
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index b98627ea6a..d16d85f967 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -68,7 +68,11 @@
         <exclude name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose"/>
     </rule>
     <rule ref="PSR2.Methods.FunctionClosingBrace"/>
-    <rule ref="Squiz.WhiteSpace.FunctionSpacing"/>
+    <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+        <properties>
+            <property name="spacingAfterLast" value="0"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.MemberVarSpacing"/>
     <rule ref="PSR12.Operators.OperatorSpacing"/>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
diff --git a/scripts/BuildRequirementsCheckMatrix.php b/scripts/BuildRequirementsCheckMatrix.php
index 2e2ae48f1d..d86294160e 100644
--- a/scripts/BuildRequirementsCheckMatrix.php
+++ b/scripts/BuildRequirementsCheckMatrix.php
@@ -179,6 +179,4 @@ private function getMissingExtensionsBuilds()
 
         return $builds;
     }
-
-
 }
diff --git a/src/Config.php b/src/Config.php
index 0a5248c800..13a108612f 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1767,6 +1767,4 @@ public function printConfigData(array $data)
     {
         echo $this->prepareConfigDataForDisplay($data);
     }
-
-
 }
diff --git a/src/Files/DummyFile.php b/src/Files/DummyFile.php
index f5e1e135ab..666b75f900 100644
--- a/src/Files/DummyFile.php
+++ b/src/Files/DummyFile.php
@@ -85,6 +85,4 @@ public function setErrorCounts(
         $this->fixedErrorCount     = $fixedErrorCount;
         $this->fixedWarningCount   = $fixedWarningCount;
     }
-
-
 }
diff --git a/src/Files/File.php b/src/Files/File.php
index 9a0ffa828c..e9ea5f2bfd 100644
--- a/src/Files/File.php
+++ b/src/Files/File.php
@@ -2941,6 +2941,4 @@ public function findImplementedInterfaceNames(int $stackPtr)
             return $names;
         }
     }
-
-
 }
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
index 4468b4400b..32c5a9ecd0 100644
--- a/src/Files/FileList.php
+++ b/src/Files/FileList.php
@@ -254,6 +254,4 @@ public function count()
     {
         return $this->numFiles;
     }
-
-
 }
diff --git a/src/Files/LocalFile.php b/src/Files/LocalFile.php
index 73412acc93..e1bf7d7ae4 100644
--- a/src/Files/LocalFile.php
+++ b/src/Files/LocalFile.php
@@ -212,6 +212,4 @@ private function replayErrors(array $errors, array $warnings)
 
         $this->replayingErrors = false;
     }
-
-
 }
diff --git a/src/Filters/ExactMatch.php b/src/Filters/ExactMatch.php
index 628df6ab14..c9305b6447 100644
--- a/src/Filters/ExactMatch.php
+++ b/src/Filters/ExactMatch.php
@@ -105,6 +105,4 @@ abstract protected function getDisallowedFiles();
      * @return array
      */
     abstract protected function getAllowedFiles();
-
-
 }
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
index bb6b38cb04..5985bf8648 100644
--- a/src/Filters/Filter.php
+++ b/src/Filters/Filter.php
@@ -295,6 +295,4 @@ protected function shouldIgnorePath(string $path)
 
         return false;
     }
-
-
 }
diff --git a/src/Filters/GitModified.php b/src/Filters/GitModified.php
index 648786b484..6465f5cd13 100644
--- a/src/Filters/GitModified.php
+++ b/src/Filters/GitModified.php
@@ -84,6 +84,4 @@ protected function exec(string $cmd)
 
         return $output;
     }
-
-
 }
diff --git a/src/Filters/GitStaged.php b/src/Filters/GitStaged.php
index b1ce9f6afb..27d133cc6d 100644
--- a/src/Filters/GitStaged.php
+++ b/src/Filters/GitStaged.php
@@ -86,6 +86,4 @@ protected function exec(string $cmd)
 
         return $output;
     }
-
-
 }
diff --git a/src/Fixer.php b/src/Fixer.php
index 52241dc512..74cdb05359 100644
--- a/src/Fixer.php
+++ b/src/Fixer.php
@@ -828,6 +828,4 @@ private function getSniffCodeForDebug(string $className)
             return $className;
         }
     }
-
-
 }
diff --git a/src/Generators/Generator.php b/src/Generators/Generator.php
index 39badf3feb..d8200f730b 100644
--- a/src/Generators/Generator.php
+++ b/src/Generators/Generator.php
@@ -146,6 +146,4 @@ public function generate()
      * @see    generate()
      */
     abstract protected function processSniff(DOMElement $doc);
-
-
 }
diff --git a/src/Generators/HTML.php b/src/Generators/HTML.php
index 61ecc55297..14b2c69fa3 100644
--- a/src/Generators/HTML.php
+++ b/src/Generators/HTML.php
@@ -457,6 +457,4 @@ private function formatCodeSample(DOMElement $codeElm)
 
         return $code;
     }
-
-
 }
diff --git a/src/Generators/Markdown.php b/src/Generators/Markdown.php
index a1690d8e98..4a82910743 100644
--- a/src/Generators/Markdown.php
+++ b/src/Generators/Markdown.php
@@ -265,6 +265,4 @@ private function formatCodeSample(DOMElement $codeElm)
 
         return $code;
     }
-
-
 }
diff --git a/src/Generators/Text.php b/src/Generators/Text.php
index a6f371a8aa..9ed32c3e0d 100644
--- a/src/Generators/Text.php
+++ b/src/Generators/Text.php
@@ -226,6 +226,4 @@ private function linesToTableRows(array $column1Lines, array $column2Lines)
 
         return $rows;
     }
-
-
 }
diff --git a/src/Reporter.php b/src/Reporter.php
index eb81515abe..c219a582f7 100644
--- a/src/Reporter.php
+++ b/src/Reporter.php
@@ -518,6 +518,4 @@ public function prepareFileReport(File $phpcsFile)
         $report['messages'] = $errors;
         return $report;
     }
-
-
 }
diff --git a/src/Reports/Cbf.php b/src/Reports/Cbf.php
index dd423c0b92..1468bd2018 100644
--- a/src/Reports/Cbf.php
+++ b/src/Reports/Cbf.php
@@ -269,8 +269,6 @@ private function createReporterInstance(File $phpcsFile)
             public function __construct()
             {
             }
-
-
         };
 
         $reporter->totalFiles           = 1;
@@ -283,6 +281,4 @@ public function __construct()
 
         return $reporter;
     }
-
-
 }
diff --git a/src/Reports/Checkstyle.php b/src/Reports/Checkstyle.php
index fd82d053a0..33926eb703 100644
--- a/src/Reports/Checkstyle.php
+++ b/src/Reports/Checkstyle.php
@@ -104,6 +104,4 @@ public function generate(
         echo $cachedData;
         echo '</checkstyle>' . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Code.php b/src/Reports/Code.php
index d1f4ad384b..a1e1c9b018 100644
--- a/src/Reports/Code.php
+++ b/src/Reports/Code.php
@@ -350,6 +350,4 @@ public function generate(
 
         echo $cachedData;
     }
-
-
 }
diff --git a/src/Reports/Csv.php b/src/Reports/Csv.php
index 11eeb23314..8086356eca 100644
--- a/src/Reports/Csv.php
+++ b/src/Reports/Csv.php
@@ -85,6 +85,4 @@ public function generate(
         echo 'File,Line,Column,Type,Message,Source,Severity,Fixable' . PHP_EOL;
         echo $cachedData;
     }
-
-
 }
diff --git a/src/Reports/Diff.php b/src/Reports/Diff.php
index 56b476a9ea..862b39f5ec 100644
--- a/src/Reports/Diff.php
+++ b/src/Reports/Diff.php
@@ -115,6 +115,4 @@ public function generate(
             echo PHP_EOL;
         }
     }
-
-
 }
diff --git a/src/Reports/Emacs.php b/src/Reports/Emacs.php
index 87ac89a99c..64ebf3d980 100644
--- a/src/Reports/Emacs.php
+++ b/src/Reports/Emacs.php
@@ -84,6 +84,4 @@ public function generate(
     ) {
         echo $cachedData;
     }
-
-
 }
diff --git a/src/Reports/Full.php b/src/Reports/Full.php
index b03a0df85e..bd5f6becf5 100644
--- a/src/Reports/Full.php
+++ b/src/Reports/Full.php
@@ -248,6 +248,4 @@ public function generate(
 
         echo $cachedData;
     }
-
-
 }
diff --git a/src/Reports/Gitblame.php b/src/Reports/Gitblame.php
index ae77623f17..46d80308e9 100644
--- a/src/Reports/Gitblame.php
+++ b/src/Reports/Gitblame.php
@@ -85,6 +85,4 @@ protected function getBlameContent(string $filename)
 
         return $blames;
     }
-
-
 }
diff --git a/src/Reports/Hgblame.php b/src/Reports/Hgblame.php
index 64b32b76d2..841d05e3e4 100644
--- a/src/Reports/Hgblame.php
+++ b/src/Reports/Hgblame.php
@@ -104,6 +104,4 @@ protected function getBlameContent(string $filename)
 
         return $blames;
     }
-
-
 }
diff --git a/src/Reports/Info.php b/src/Reports/Info.php
index 2d4dd73e35..104b15cd9b 100644
--- a/src/Reports/Info.php
+++ b/src/Reports/Info.php
@@ -161,6 +161,4 @@ public function generate(
 
         echo str_repeat('-', 70) . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Json.php b/src/Reports/Json.php
index b9f85b8841..9c954278a4 100644
--- a/src/Reports/Json.php
+++ b/src/Reports/Json.php
@@ -100,6 +100,4 @@ public function generate(
         echo rtrim($cachedData, ',');
         echo '}}' . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Junit.php b/src/Reports/Junit.php
index b682dd4ab0..26a44b9ecd 100644
--- a/src/Reports/Junit.php
+++ b/src/Reports/Junit.php
@@ -126,6 +126,4 @@ public function generate(
         echo $cachedData;
         echo '</testsuites>' . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php
index bd84797860..ec3435940b 100644
--- a/src/Reports/Notifysend.php
+++ b/src/Reports/Notifysend.php
@@ -231,6 +231,4 @@ protected function getBasicCommand()
 
         return $cmd;
     }
-
-
 }
diff --git a/src/Reports/Performance.php b/src/Reports/Performance.php
index c5570bff9c..a8c36efdd2 100644
--- a/src/Reports/Performance.php
+++ b/src/Reports/Performance.php
@@ -154,6 +154,4 @@ public function generate(
         printf($formatBold, 'TOTAL RUN TIME', $runTime, 100);
         echo str_repeat('-', $width) . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Report.php b/src/Reports/Report.php
index 612b1ca7e3..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
     );
-
-
 }
diff --git a/src/Reports/Source.php b/src/Reports/Source.php
index 40d860314b..cd30130a6f 100644
--- a/src/Reports/Source.php
+++ b/src/Reports/Source.php
@@ -324,6 +324,4 @@ public function makeFriendlyName(string $name)
 
         return $friendlyName;
     }
-
-
 }
diff --git a/src/Reports/Summary.php b/src/Reports/Summary.php
index 21fceab273..08640aa4f4 100644
--- a/src/Reports/Summary.php
+++ b/src/Reports/Summary.php
@@ -172,6 +172,4 @@ static function ($keyA, $keyB) {
 
         echo PHP_EOL . str_repeat('-', $width) . PHP_EOL . PHP_EOL;
     }
-
-
 }
diff --git a/src/Reports/Svnblame.php b/src/Reports/Svnblame.php
index 5be83faed1..37ac06cdd1 100644
--- a/src/Reports/Svnblame.php
+++ b/src/Reports/Svnblame.php
@@ -67,6 +67,4 @@ protected function getBlameContent(string $filename)
 
         return $blames;
     }
-
-
 }
diff --git a/src/Reports/VersionControl.php b/src/Reports/VersionControl.php
index 7deea0a57d..a80b9a6b11 100644
--- a/src/Reports/VersionControl.php
+++ b/src/Reports/VersionControl.php
@@ -365,6 +365,4 @@ abstract protected function getAuthor(string $line);
      * @return array
      */
     abstract protected function getBlameContent(string $filename);
-
-
 }
diff --git a/src/Reports/Xml.php b/src/Reports/Xml.php
index 12a02defca..4bf894bc63 100644
--- a/src/Reports/Xml.php
+++ b/src/Reports/Xml.php
@@ -121,6 +121,4 @@ public function generate(
         echo $cachedData;
         echo '</phpcs>' . PHP_EOL;
     }
-
-
 }
diff --git a/src/Ruleset.php b/src/Ruleset.php
index 082368f1cd..45ba3fcc5b 100644
--- a/src/Ruleset.php
+++ b/src/Ruleset.php
@@ -1761,6 +1761,4 @@ public function getIncludePatterns(?string $listener = null)
 
         return [];
     }
-
-
 }
diff --git a/src/Runner.php b/src/Runner.php
index 6fb1f2c96d..0e98d6ca78 100644
--- a/src/Runner.php
+++ b/src/Runner.php
@@ -894,6 +894,4 @@ static function () use (
             }
         );
     }
-
-
 }
diff --git a/src/Sniffs/AbstractArraySniff.php b/src/Sniffs/AbstractArraySniff.php
index b12f47c42d..c6afbd2b7f 100644
--- a/src/Sniffs/AbstractArraySniff.php
+++ b/src/Sniffs/AbstractArraySniff.php
@@ -164,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);
-
-
 }
diff --git a/src/Sniffs/AbstractPatternSniff.php b/src/Sniffs/AbstractPatternSniff.php
index ec3b545d70..6735c903a6 100644
--- a/src/Sniffs/AbstractPatternSniff.php
+++ b/src/Sniffs/AbstractPatternSniff.php
@@ -922,6 +922,4 @@ private function createTokenPattern(string $str)
 
         return $patterns;
     }
-
-
 }
diff --git a/src/Sniffs/AbstractScopeSniff.php b/src/Sniffs/AbstractScopeSniff.php
index 35cbf6d9f1..a9ae992c64 100644
--- a/src/Sniffs/AbstractScopeSniff.php
+++ b/src/Sniffs/AbstractScopeSniff.php
@@ -181,6 +181,4 @@ abstract protected function processTokenWithinScope(File $phpcsFile, int $stackP
      *                  the rest of the file.
      */
     abstract protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr);
-
-
 }
diff --git a/src/Sniffs/AbstractVariableSniff.php b/src/Sniffs/AbstractVariableSniff.php
index 837d7ec25b..4824e6626f 100644
--- a/src/Sniffs/AbstractVariableSniff.php
+++ b/src/Sniffs/AbstractVariableSniff.php
@@ -225,6 +225,4 @@ abstract protected function processVariable(File $phpcsFile, int $stackPtr);
      *                  the rest of the file.
      */
     abstract protected function processVariableInString(File $phpcsFile, int $stackPtr);
-
-
 }
diff --git a/src/Sniffs/DeprecatedSniff.php b/src/Sniffs/DeprecatedSniff.php
index d8174ee3ab..e542babab2 100644
--- a/src/Sniffs/DeprecatedSniff.php
+++ b/src/Sniffs/DeprecatedSniff.php
@@ -58,6 +58,4 @@ public function getRemovalVersion();
      * @return string
      */
     public function getDeprecationMessage();
-
-
 }
diff --git a/src/Sniffs/Sniff.php b/src/Sniffs/Sniff.php
index 3f055bb9e6..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);
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
index c7d219b4c2..3276800551 100644
--- a/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php
@@ -187,6 +187,4 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
             $phpcsFile->fixer->replaceToken(($arrayEnd - 1), $padding);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
index 28c3718db2..f21a0147b2 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php
@@ -65,6 +65,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
index 52ef37777f..4ccbfe9ef9 100644
--- a/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php
@@ -54,6 +54,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
index 2bb7100899..4389156197 100644
--- a/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
@@ -111,6 +111,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
index f6961ae49a..3f9afb0a77 100644
--- a/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
+++ b/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php
@@ -116,6 +116,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
index e2ef9ef36c..f2859aaf13 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php
@@ -164,6 +164,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $startPos = $hasAssignment;
         } while ($startPos < $closer);
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
index 2a6c02250c..94aa7edfd5 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php
@@ -170,6 +170,4 @@ private function processCloseTag(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
index 10c5152489..792d72cdde 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
@@ -90,6 +90,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'Empty %s statement detected';
         $phpcsFile->addError($error, $stackPtr, 'Detected' . ucfirst(strtolower($name)), [$name]);
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
index 16a004c3e8..6a7788f220 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
@@ -84,6 +84,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $stackPtr, 'CanSimplify');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
index 6ffd199cc4..42e45b10a0 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
@@ -94,6 +94,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
index 7e1541852e..1d7d3fd7de 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
@@ -126,6 +126,4 @@ protected function findIncrementers(array $tokens, array $token)
 
         return $incrementers;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
index 03726fe522..e6a47e44d7 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php
@@ -105,6 +105,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error .= ' without using parentheses to clarify precedence is not allowed.';
         $phpcsFile->addError($error, $stackPtr, 'MissingParentheses');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
index 5e65a03057..d39ab57e5a 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
@@ -86,6 +86,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $stackPtr, 'Found');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
index 6a8dbb19a9..a7e3c6d60f 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
@@ -81,6 +81,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
index c6ba0069b1..cb5b2d1b10 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
@@ -298,6 +298,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
index 29d32b8f9a..f61f6f2e94 100644
--- a/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
+++ b/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
@@ -177,6 +177,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning('Possible useless method overriding detected', $stackPtr, 'Found');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
index 4885a0e603..ad1b76dbb8 100644
--- a/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php
@@ -340,6 +340,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $foundTags[$tagName] = true;
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
index 1c00eab11a..b1c44637e2 100644
--- a/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
@@ -61,6 +61,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, $type, $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
index 28d1b1dee9..9ae0b8a702 100644
--- a/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
+++ b/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php
@@ -60,6 +60,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
index 323bd2cbb9..0daa92b4c5 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -178,6 +178,4 @@ public function isArrayStatic(File $phpcsFile, int $arrayToken)
 
         return true;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
index 2aac11a21b..283e2598f8 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -317,6 +317,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->fixer->endChangeset();
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
index da629f46c9..e0d03f989f 100644
--- a/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php
@@ -84,6 +84,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
index dd044c648b..66c62a074c 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
@@ -66,6 +66,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
index 2121dfe966..7791c7939b 100644
--- a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
@@ -73,6 +73,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
index 46a4da1f52..60164f1e92 100644
--- a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
@@ -55,6 +55,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
index 749f260f3f..c08c200039 100644
--- a/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php
@@ -81,6 +81,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
index f2adf708f7..faf02453c7 100644
--- a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
@@ -125,6 +125,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
index ccd457d056..56ceeed79c 100644
--- a/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php
@@ -193,6 +193,4 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
             $phpcsFile->addWarning($warning, $stackPtr, 'TooLong', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
index 7a2a141a14..4a33fd0641 100644
--- a/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php
@@ -63,6 +63,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
index 1631fc9cef..96fccbc622 100644
--- a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
@@ -50,6 +50,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
index 6dff203392..7ad79ae334 100644
--- a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
@@ -50,6 +50,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $nextInterface, 'MultipleFound');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
index 98b56ef3f9..9104f93106 100644
--- a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
@@ -55,6 +55,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
index 570e8b8e1a..219ccb4250 100644
--- a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
@@ -50,6 +50,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
index 9f1f57bf2c..22851c2d4d 100644
--- a/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
@@ -98,6 +98,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'Multiple statements on same line', 'no');
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
index 7edcf2cbf5..b2025f46c7 100644
--- a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
@@ -396,6 +396,4 @@ public function checkAlignment(File $phpcsFile, int $stackPtr, ?int $end = null)
             return $assign;
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
index 804ae2ebb7..e3df3dbfd5 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
@@ -154,6 +154,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
index b0ae4d9d7c..255d4254cd 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php
@@ -126,6 +126,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
index cbc72216c4..bff5ce0d3a 100644
--- a/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php
@@ -66,6 +66,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
index cadb2c7fff..47529a2681 100644
--- a/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
@@ -189,6 +189,4 @@ public function checkSpacing(File $phpcsFile, int $stackPtr, int $openBracket)
             }//end if
         }//end while
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
index d4bd9a0dde..f72188c84e 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
@@ -217,6 +217,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->recordMetric($stackPtr, "$metricType opening brace placement", 'new line');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
index 7c534678cd..e1ce5b7994 100644
--- a/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
+++ b/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
@@ -170,6 +170,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
index 704eb8dc8e..38d7467434 100644
--- a/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
@@ -114,6 +114,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
index 89e9215c48..d07883fc63 100644
--- a/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
+++ b/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
@@ -93,6 +93,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($warning, $stackPtr, 'TooHigh', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
index 39a574fd1e..6ee7b96ef4 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
@@ -53,6 +53,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError('Abstract class names must be prefixed with "Abstract"; found "%s"', $stackPtr, 'Missing', [$className]);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
index 7b175a308a..3113ba923b 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php
@@ -241,6 +241,4 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'CamelCase method name', 'yes');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
index 1092a45c9f..fd9fcf23cf 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
@@ -179,6 +179,4 @@ protected function loadFunctionNamesInScope(File $phpcsFile, int $currScope)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
index 4186de6f2b..779bdaafee 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
@@ -48,6 +48,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError('Interface names must be suffixed with "Interface"; found "%s"', $stackPtr, 'Missing', [$interfaceName]);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
index eb5f1317c2..211f62b029 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
@@ -48,6 +48,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError('Trait names must be suffixed with "Trait"; found "%s"', $stackPtr, 'Missing', [$traitName]);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
index 70892eea31..6c3ca2b5bb 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
@@ -145,6 +145,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($constPtr, 'Constant name case', 'upper');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
index 34d395e19a..f392a89458 100644
--- a/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php
@@ -41,6 +41,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'Use of the backtick operator is forbidden';
         $phpcsFile->addError($error, $stackPtr, 'Found');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
index c2269c75f0..d27bc9b3ad 100644
--- a/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php
@@ -88,6 +88,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // open tags, typically embedded in HTML.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
index 8d24d5e3e6..4e07ca11fc 100644
--- a/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php
@@ -47,6 +47,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'NotFound');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
index 621904ceba..f1ea23b76d 100644
--- a/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
@@ -69,6 +69,4 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
index d814801a46..de275f342e 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
@@ -102,6 +102,4 @@ protected function getSnippet(string $content, string $start = '', int $length =
 
         return $snippet;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
index 47287af8e0..dc975b25d5 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php
@@ -48,6 +48,4 @@ 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');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
index b9c5ec02fd..e1c56735dd 100644
--- a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
@@ -162,6 +162,4 @@ protected function getSnippet(string $content, string $start = '', int $length =
 
         return $snippet;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
index 3c372ebbb8..b11c787b0c 100644
--- a/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php
@@ -43,6 +43,4 @@ public function process(File $phpcsFile, int $stackPtr)
     {
         $phpcsFile->addWarning('Use of the GOTO language construct is discouraged', $stackPtr, 'Found');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
index bde01c8699..62043ba7d1 100644
--- a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
@@ -236,6 +236,4 @@ protected function addError(File $phpcsFile, int $stackPtr, string $functionName
             $phpcsFile->addWarning($error, $stackPtr, $type, $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
index 2ebab79509..739d95d882 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
@@ -226,6 +226,4 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'lower');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
index 35a26d6718..acdaa701b5 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php
@@ -78,6 +78,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'PHP keyword case', 'lower');
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
index ccec5bf59f..8c52af4349 100644
--- a/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php
@@ -350,6 +350,4 @@ protected function processType(File $phpcsFile, int $stackPtr, string $type, str
             $phpcsFile->fixer->replaceToken($stackPtr, $typeLower);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
index 236065d947..b44a238d6f 100644
--- a/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
@@ -70,6 +70,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $stackPtr, 'Discouraged', [$found]);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
index 903094f7e2..a6f40bd5cf 100644
--- a/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php
@@ -101,6 +101,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // open tags, typically embedded in HTML.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
index f205d90643..18cbb3107e 100644
--- a/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php
@@ -65,6 +65,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'Use the PHP_SAPI constant instead of calling php_sapi_name()';
         $phpcsFile->addError($error, $stackPtr, 'FunctionFound');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
index 86936cdd48..4123739f56 100644
--- a/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php
@@ -96,6 +96,4 @@ private function getPhpLintCommand(File $phpcsFile)
             $fileName
         );
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
index 09d4b75278..520856c6df 100644
--- a/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
+++ b/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
@@ -51,6 +51,4 @@ protected function processConstant(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'PHP constant case', 'upper');
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
index a35df53f7d..1d14793b7d 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php
@@ -138,6 +138,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
index a03b17ff50..beb3865aa9 100644
--- a/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
+++ b/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
@@ -88,6 +88,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'String concat is not required here; use a single string instead';
         $phpcsFile->addError($error, $stackPtr, 'Found');
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
index 170c4520b5..287bb7f77b 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php
@@ -124,6 +124,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
index edd49a8de0..6de75b982d 100644
--- a/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
+++ b/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
@@ -187,6 +187,4 @@ protected function getProperties(string $path)
 
         return $properties;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
index 2dd5f05681..08d7a18070 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php
@@ -228,6 +228,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
index 38361bd1c4..7e3fe732c0 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -219,6 +219,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
index 6f6b657e32..595cbacfdb 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
@@ -189,6 +189,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
index 5f66ccccfb..4ab6323886 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/GotoTargetSpacingSniff.php
@@ -79,6 +79,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
index f243e9f1c0..78c0914d64 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/HereNowdocIdentifierSpacingSniff.php
@@ -62,6 +62,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($stackPtr, $replacement);
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
index 2c25319a66..acd95214b0 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php
@@ -154,6 +154,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
index 2cf2193a09..4358cff786 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
@@ -157,6 +157,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
index 07bb8469c0..72816b33c2 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -1393,6 +1393,4 @@ protected function adjustIndent(File $phpcsFile, int $stackPtr, int $length, int
 
         return true;
     }
-
-
 }
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
index accb8762df..9e57e53faf 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php
@@ -152,6 +152,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
index 6d91d8b28f..625f6b999a 100644
--- a/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php
@@ -74,6 +74,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
index 3e54679116..43244b57c9 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php
@@ -68,6 +68,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
index 56ad85858d..202cca8cf4 100644
--- a/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
index 18accd2509..3aa5a8e7e1 100644
--- a/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
@@ -91,6 +91,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
index 048a37922b..fc9acabcd3 100644
--- a/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
+++ b/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php
@@ -61,6 +61,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
index 05e10400ad..e605ef1b78 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
@@ -89,6 +89,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
index 41238048c4..d368465530 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
@@ -103,6 +103,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
index be600fcd39..d863530234 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
@@ -61,6 +61,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
index fc7b7dac0e..e36a993e08 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
index 1f229bda4c..31a25eb4e8 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
@@ -71,6 +71,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
index 7b9876d77a..9f40ded175 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
index 341473dc61..bc9186780c 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php
@@ -84,6 +84,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
index 354228e85a..902eb80dfe 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
index 485febadb4..10b127ce8b 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
@@ -64,6 +64,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
index ec1b3c1469..4b097072a1 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
@@ -71,6 +71,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
index 5adfb8b669..bac42c4bd0 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
index 99270d2717..8a96b59191 100644
--- a/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php
@@ -119,6 +119,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
index 8c04b8baa3..893920796b 100644
--- a/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php
@@ -56,6 +56,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
index ac19e6ac6a..514417f068 100644
--- a/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
+++ b/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php
@@ -55,6 +55,4 @@ public function getWarningList()
             21 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
index 5176438e1b..273a574a04 100644
--- a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
@@ -95,6 +95,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
index 40818835ae..43e8247a94 100644
--- a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
+++ b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
@@ -102,6 +102,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
index 3ec7265c0e..c1059fd087 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
@@ -70,6 +70,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
index c03e72f248..1fb85eb0c0 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
@@ -59,6 +59,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
index bd7fba3c7d..c4d86e9926 100644
--- a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
@@ -61,6 +61,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
index ae0df9af03..3a47b27643 100644
--- a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -68,6 +68,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
index 64cbd6075b..ef198742ef 100644
--- a/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php
@@ -62,6 +62,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
index 1cac1a8aad..924d034165 100644
--- a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
@@ -61,6 +61,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
index e0f347ce4e..f26c0082c8 100644
--- a/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php
@@ -107,6 +107,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
index d6e546ad38..0306fddb2b 100644
--- a/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php
@@ -97,6 +97,4 @@ public function testStdIn()
         $this->assertSame(0, $file->getWarningCount());
         $this->assertCount(0, $file->getErrors());
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
index 1b1ab588a4..84a0351b62 100644
--- a/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
index 5f71df24ab..db0c8434ba 100644
--- a/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
index dd5d577c3a..45062b49d4 100644
--- a/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php
@@ -52,6 +52,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
index 21a8477b7e..e7350ced16 100644
--- a/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
index 41658aa4b4..2a4358f2d8 100644
--- a/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
@@ -52,6 +52,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
index d6eca0ba43..9d0097cd0f 100644
--- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
@@ -123,6 +123,4 @@ public function getWarningList()
             500 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
index e49975eab2..ae97c5fc5b 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
@@ -96,6 +96,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
index bd799b5919..adacfc1878 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php
@@ -82,6 +82,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
index 26143d92a9..6fc96d35fa 100644
--- a/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
+++ b/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php
@@ -76,6 +76,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
index 80dab7ba0a..9dba4a86fb 100644
--- a/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
@@ -92,6 +92,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
index 0b2cb8e4da..72052a0d20 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
@@ -84,6 +84,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
index 46b5c703eb..40b0ca5d32 100644
--- a/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
+++ b/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
@@ -109,6 +109,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
index e863f8c723..db0453758b 100644
--- a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
@@ -70,6 +70,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
index f8240450f7..d02953a1b2 100644
--- a/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
+++ b/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
@@ -63,6 +63,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
index 186e00d193..af12b143c4 100644
--- a/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
index be156723dd..294c61f79a 100644
--- a/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php
@@ -98,6 +98,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
index 1012b53816..3ac4cd4ecc 100644
--- a/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
@@ -66,6 +66,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
index fef0054964..95f3f6b397 100644
--- a/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
@@ -55,6 +55,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
index 0c712d4f46..69b45f9b37 100644
--- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
@@ -56,6 +56,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
index 9f096d3ba2..4fe2a7d084 100644
--- a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
@@ -69,6 +69,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
index ad42a8a1bb..5dcc5c6ce5 100644
--- a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php
@@ -48,6 +48,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
index 7977ed6cde..9873a3785b 100644
--- a/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php
@@ -54,6 +54,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
index a536309fb6..75ba4c163f 100644
--- a/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
index 196ac32949..c35a9fef50 100644
--- a/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
index 57c4dc330b..cf4e75d6a1 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
@@ -78,6 +78,4 @@ public function getWarningList($testFile = '')
 
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
index 439039058e..c582501179 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php
@@ -49,6 +49,4 @@ protected function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
index 3c43d3be87..592e8055ce 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
@@ -107,6 +107,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
index 993e1966ef..0b6a3e4b5b 100644
--- a/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
             16 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
index 5fd94558f2..25425132c9 100644
--- a/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
index 94a0daa97a..bb3d1f3e35 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
@@ -93,6 +93,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
index 5e01089e39..8581342ea2 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php
@@ -76,6 +76,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
index 5d35a9ce62..694dcd111a 100644
--- a/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php
@@ -118,6 +118,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
index 443e7daf82..faf541b28f 100644
--- a/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
             16 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
index 8791dbbc5c..e5bf1bb3a2 100644
--- a/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
index 2de9349799..a23633759b 100644
--- a/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
index 619fbfefe6..0cb614d07a 100644
--- a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
@@ -161,6 +161,4 @@ public static function dataStdIn()
             ],
         ];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
index 9b1cedc0c6..e8d6697c37 100644
--- a/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
@@ -74,6 +74,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
index 7a56ccb2e4..f338d600ab 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryHeredocUnitTest.php
@@ -67,6 +67,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
index 770aa8b46f..43b3249c6c 100644
--- a/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
+++ b/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
@@ -61,6 +61,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
index 8e3ff3a243..9774cb8aea 100644
--- a/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php
@@ -132,6 +132,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
index 7dd366aac8..0e6e4056d4 100644
--- a/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
+++ b/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php
@@ -58,6 +58,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
index 8ca0aa9e5b..e5a17a24e0 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php
@@ -99,6 +99,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
index b2936e3897..fc5c2dc3ac 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
@@ -132,6 +132,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
index 3cf8f364ff..0d29bb2272 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
@@ -133,6 +133,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
index 202c5d443d..0e86a2f110 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/GotoTargetSpacingUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
index c03c921dac..006a3f59b1 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/HereNowdocIdentifierSpacingUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
index 8ac6dbd4b2..3bc6bf7045 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php
@@ -71,6 +71,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
index 7571903538..58e771aa3a 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
@@ -95,6 +95,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
index ac32cef614..f1c672c307 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -188,6 +188,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
index 2663bb312f..e8b35bf561 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
index 2bba6b9a62..ace6e1a013 100644
--- a/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
@@ -142,6 +142,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
index 7b2b999ccd..b89a50a940 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
@@ -114,6 +114,4 @@ protected function processVersion(File $phpcsFile, array $tags)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
index d94bfdfbe0..70c1490bb1 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
@@ -576,6 +576,4 @@ protected function processVersion(File $phpcsFile, array $tags)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
index 890015ddb0..ce74ddee43 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
@@ -540,6 +540,4 @@ protected function processParams(File $phpcsFile, int $stackPtr, int $commentSta
             $phpcsFile->addError($error, $commentStart, 'MissingParamTag', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
index f81bd9f9f0..63a1cf81dd 100644
--- a/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
@@ -61,6 +61,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'Inline comment style', '/* ... */');
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
index d94da7ea96..b7c821d29d 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -42,6 +42,4 @@ protected function getPatterns()
             'match (...) {EOL',
         ];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
index be70c09d2d..616e25f963 100644
--- a/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
+++ b/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
@@ -266,6 +266,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
index 1711233872..2c711812c7 100644
--- a/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
+++ b/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
@@ -129,6 +129,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
index 02c95cdf73..6c82651f0f 100644
--- a/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
+++ b/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
@@ -99,6 +99,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'Indent', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
index 821ca02c50..cbedac50f4 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -616,6 +616,4 @@ public function processMultiLineCall(File $phpcsFile, int $stackPtr, int $openBr
             }//end if
         }//end for
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
index 5bc8147db4..53dfa7c3dc 100644
--- a/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -525,6 +525,4 @@ public function processArgumentList(File $phpcsFile, int $stackPtr, int $indent,
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
index cc00c4f437..dee42547f9 100644
--- a/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
+++ b/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
@@ -74,6 +74,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end foreach
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
index 174a7d3775..126be891e1 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -91,6 +91,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 646062e7b5..a8ddb42350 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -289,6 +289,4 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'FunctionNameInvalid', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
index f78df9ba5e..694dd60dcb 100644
--- a/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -108,6 +108,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
         // 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 ced5674e64..510b0b648f 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -194,6 +194,4 @@ public function process(File $phpcsFile, int $stackPtr)
             );
         }//end while
     }
-
-
 }
diff --git a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index b3535b2835..c50032ae1f 100644
--- a/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -175,6 +175,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
index 73a9e9b024..76f7bed5fd 100644
--- a/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
@@ -89,6 +89,4 @@ public function getWarningList($testFile = '')
     {
         return[];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
index 967889167c..f409dfb858 100644
--- a/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
@@ -92,6 +92,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
index d18e8ed6c7..ad1c003af1 100644
--- a/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
@@ -88,6 +88,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
index afa6edd1cd..5c5d738410 100644
--- a/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
@@ -119,6 +119,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
index e0a8c6c4da..d5569027d1 100644
--- a/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
@@ -54,6 +54,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
index c9f0bed063..e5e204708e 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -70,6 +70,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
index cce69026f6..dca5fd073c 100644
--- a/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
+++ b/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
@@ -82,6 +82,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
index 8063f7b0db..ef51f88154 100644
--- a/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
+++ b/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
index 207eb099de..8c1a17c083 100644
--- a/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
+++ b/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
index baad23d9d3..6780b35359 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
@@ -144,6 +144,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
index 467a93bab1..ca18221af0 100644
--- a/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -133,6 +133,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
index bd4f6897ed..13551b5cb7 100644
--- a/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
+++ b/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
@@ -67,6 +67,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
index e8925265f8..c89547e1cf 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
@@ -71,6 +71,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 5a62322f94..87282cb5d3 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -155,6 +155,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
index c498227ccb..1c6d8a5ba4 100644
--- a/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -66,6 +66,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
index af85545770..eff18e0650 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
@@ -73,6 +73,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
index ea0c2261fa..76c6a7b3b3 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -66,6 +66,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
index 8fac569b23..f667edc70a 100644
--- a/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
+++ b/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -79,6 +79,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
index 1da6e5820e..43bbfe0be6 100644
--- a/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php
@@ -68,6 +68,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'Class defined in namespace', 'yes');
         }
     }
-
-
 }
diff --git a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
index 8ed6fd791e..36fdb52240 100644
--- a/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
+++ b/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
@@ -307,6 +307,4 @@ private function searchForConflict(File $phpcsFile, int $start, int $end, array
             'effect' => $firstEffect,
         ];
     }
-
-
 }
diff --git a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
index 6243923c8c..1bac6e9b98 100644
--- a/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
+++ b/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php
@@ -84,6 +84,4 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
     }
-
-
 }
diff --git a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
index 8af5e25093..f5f37f6a0a 100644
--- a/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
@@ -55,6 +55,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
index c958999a4e..1989098890 100644
--- a/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
+++ b/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php
@@ -78,6 +78,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
index 987cad6fe3..e5db7a575a 100644
--- a/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
+++ b/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
index 4a824ed4e0..20cd4dfb9a 100644
--- a/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php
@@ -237,6 +237,4 @@ public function processMultiLineArgumentList(File $phpcsFile, int $stackPtr)
         $this->multiLineSniff->processBracket($phpcsFile, $openBracket, $tokens, 'argument');
         $this->multiLineSniff->processArgumentList($phpcsFile, $stackPtr, $this->indent, 'argument');
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
index 7e9efec62b..963bed27c8 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php
@@ -104,6 +104,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->addContent($prev, '()');
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
index de2bb99193..ae1b6f96b2 100644
--- a/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php
@@ -60,6 +60,4 @@ 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');
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
index 0831352079..fdaaa2c687 100644
--- a/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
+++ b/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php
@@ -73,6 +73,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->fixer->endChangeset();
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
index e2e5d51577..9f16712d7e 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
@@ -227,6 +227,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->fixer->endChangeset();
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
index 048b5eaa70..e996687cd2 100644
--- a/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -212,6 +212,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
index 2eb04ffb1d..82498a14c9 100644
--- a/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php
@@ -255,6 +255,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
index 9cec2fd9fc..3947a449b3 100644
--- a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
@@ -422,6 +422,4 @@ public function processHeaderLines(File $phpcsFile, array $headerLines)
             }//end if
         }//end foreach
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
index a5f2769a70..59dc9488f4 100644
--- a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
@@ -70,6 +70,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($next, ltrim($tokens[$next]['content'], '\\'));
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
index 42f84c4067..667998f1b3 100644
--- a/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
+++ b/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php
@@ -77,6 +77,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
index 6f05da2cab..6dbee05704 100644
--- a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
@@ -86,6 +86,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Non-whitespace tokens found; trigger error but don't fix.
         $phpcsFile->addError($error, $stackPtr, 'UnexpectedCharactersFound');
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
index 7d3cc658db..9fd340d6a0 100644
--- a/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php
@@ -103,6 +103,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
index bb40a724a6..3311afc9a2 100644
--- a/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
+++ b/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php
@@ -68,6 +68,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($stackPtr, $replacement);
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
index c0c5bf02dd..800a829aee 100644
--- a/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
+++ b/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php
@@ -78,6 +78,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
index 46eb6148c8..f231f594fa 100644
--- a/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
+++ b/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php
@@ -121,6 +121,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
index f7e83de4e1..edeae1bb25 100644
--- a/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
+++ b/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php
@@ -68,6 +68,4 @@ 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');
     }
-
-
 }
diff --git a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
index dc1a67a295..9083c7a5ea 100644
--- a/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
+++ b/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php
@@ -691,6 +691,4 @@ protected function processUseStatement(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
index 5608404ce5..ab69e365da 100644
--- a/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php
@@ -73,6 +73,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
index 0dc90c0287..bf6afc4fd0 100644
--- a/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php
@@ -67,6 +67,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
index 3a682da903..9ffd91e4bb 100644
--- a/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
index 3a8425f824..023f9311c6 100644
--- a/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
+++ b/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
index b130f1423c..abbe82d8da 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
index c0b76bcb44..dbd70d209d 100644
--- a/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -70,6 +70,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
index dd1b430c08..8edad0b17b 100644
--- a/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php
@@ -77,6 +77,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
index 4206ee18e5..d497f7b75e 100644
--- a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php
@@ -80,6 +80,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
index 6f549e0a6c..247f77079f 100644
--- a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
index 87a26e4252..eb9e0e107c 100644
--- a/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
+++ b/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
index 16888a2f2b..cac04f0be7 100644
--- a/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php
@@ -66,6 +66,4 @@ protected function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
index 0cacbacb14..d25f352760 100644
--- a/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php
@@ -59,6 +59,4 @@ protected function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
index 057626bd87..b655225f69 100644
--- a/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
+++ b/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php
@@ -52,6 +52,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
index 5dd6c385f1..41b150ec7f 100644
--- a/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
+++ b/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
index 75226d9de3..d33849be67 100644
--- a/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
+++ b/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php
@@ -74,6 +74,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
index ee5a370353..20a8d92426 100644
--- a/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
+++ b/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php
@@ -63,6 +63,4 @@ public function getWarningList($testFile = '')
             return [];
         }
     }
-
-
 }
diff --git a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
index de173420f8..d64bd870f6 100644
--- a/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php
@@ -69,6 +69,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
index f7c4645122..bdace2de13 100644
--- a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
@@ -515,6 +515,4 @@ public function processClose(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
index a7ed1c9118..c1965c6806 100644
--- a/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -306,6 +306,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
         // 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 168b60ce09..c8276fb91b 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php
@@ -134,6 +134,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
index b8d493d932..705361457a 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -65,6 +65,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index bb24152eac..218787bded 100644
--- a/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -401,6 +401,4 @@ private function findNestedTerminator(File $phpcsFile, int $stackPtr, int $end)
 
         return false;
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
index af3d1db8f4..04b2d1329d 100644
--- a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
@@ -82,6 +82,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
index cf20b26bcf..e527ab9ae3 100644
--- a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
@@ -100,6 +100,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Skip the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
index 71733cde21..9f2c9e8bef 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
@@ -73,6 +73,4 @@ public function isMultiLineCall(File $phpcsFile, int $stackPtr, int $openBracket
 
         return false;
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
index 96f761d151..5da3ffe555 100644
--- a/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php
@@ -84,6 +84,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
index 929e76f323..45ad86432b 100644
--- a/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php
@@ -154,6 +154,4 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
index e1a3fe543b..43218aeb15 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
@@ -86,6 +86,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
index c9bfa2176c..dcd102a4f9 100644
--- a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
+++ b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -294,6 +294,4 @@ private function shouldIgnoreUse(File $phpcsFile, int $stackPtr)
 
         return false;
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
index 35b2b8216d..f99a225ebc 100644
--- a/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php
@@ -96,6 +96,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
index 699c7f1728..003e1148e8 100644
--- a/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -118,6 +118,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
index bbb57b775a..2598406e3c 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
index 692cf6fdd5..cacb82f45a 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
             12 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
index a9dad6abd1..988211cde1 100644
--- a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -84,6 +84,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
index 6773149a5c..1ca2a2b004 100644
--- a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
@@ -62,6 +62,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
index 92ddba0ebe..7e3a38eebf 100644
--- a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
@@ -64,6 +64,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
index e7f307f435..5a2051a362 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
@@ -97,6 +97,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
index 2f6d760824..394bc42f42 100644
--- a/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
index ed6b1d08de..b617a7f9be 100644
--- a/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php
@@ -85,6 +85,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
index 41f51cb752..a0685ac7ed 100644
--- a/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
index dbae525e6c..a855c03262 100644
--- a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
+++ b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
@@ -95,6 +95,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
index 7ed6fe28bc..c04caaada3 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
@@ -88,6 +88,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
index 2260b28623..6350acc688 100644
--- a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -953,6 +953,4 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
             }
         }//end foreach
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
index aa6f5655a0..448a17bed4 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
@@ -216,6 +216,4 @@ public function processClose(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
index c10b4a89e0..8522b13fc9 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
@@ -68,6 +68,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
index 5d2488ce80..708ba4c57a 100644
--- a/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
@@ -66,6 +66,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
index 179646944c..a3c50f3035 100644
--- a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
@@ -195,6 +195,4 @@ protected function getNamespaceName(File $phpcsFile, int $stackPtr)
 
         return $namespace;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
index 1d09ab6c10..532f82c06e 100644
--- a/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
@@ -79,6 +79,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'PascalCase class name', 'yes');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
index 6a25163ab3..45a7e6e00a 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
@@ -392,6 +392,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $commentCloser, 'NoEmptyLineAfter');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
index 9f09a3ad4e..f071a84d98 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
@@ -102,6 +102,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addWarning($error, $tag, 'TagNotAllowed', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
index dd8f18c83f..c27bc32125 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
@@ -125,6 +125,4 @@ public function process(File $phpcsFile, int $stackPtr)
             return;
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
index 8d9c0f7cce..f3514a5b91 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
@@ -140,6 +140,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
index 61010f3294..8f89be4a78 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
@@ -48,6 +48,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $scopeStart, 'Missing');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
index 01a3d7f68f..22718c1987 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
@@ -214,6 +214,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
index d2ec6450a9..ae74f13ec1 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
@@ -789,6 +789,4 @@ protected function checkInheritdoc(File $phpcsFile, int $stackPtr, int $commentS
 
         return false;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
index 364bbe3e01..a873b79c3e 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
@@ -226,6 +226,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $commentEnd, 'Missing', $data);
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
index 855b4cf802..575f1cb20d 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
@@ -309,6 +309,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return ($lastCommentToken + 1);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
index b5ec76ff3d..fffd476700 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
@@ -201,6 +201,4 @@ public function process(File $phpcsFile, int $stackPtr)
             return;
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
index f11f202694..e7c81256ac 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
@@ -110,6 +110,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->addNewlineBefore($stackPtr);
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
index 78ae1e23ec..621c854007 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
@@ -206,6 +206,4 @@ protected function processVariable(File $phpcsFile, int $stackPtr)
     protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
index da076ab2ef..c1e20ed711 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -320,6 +320,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
index 964c20ef75..6532742d43 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
@@ -44,6 +44,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($stackPtr, 'else if');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
index 4065f701f2..f2f7aac293 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
@@ -226,6 +226,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
index 27f4d84d83..68ef309a3c 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
@@ -298,6 +298,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         } while ($semicolonCount < 2);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
index 3b971f0489..670b64574a 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
@@ -148,6 +148,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
index cdb07ab1ac..e4936db7a2 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
@@ -68,6 +68,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
index c5f51f5ba2..4e5bce884f 100644
--- a/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
@@ -287,6 +287,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'MissingCase');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
index 610f5a2ff3..56e106a443 100644
--- a/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
@@ -61,6 +61,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
index e2782800fc..a439fc5559 100644
--- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
+++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
@@ -362,6 +362,4 @@ public function addMissingBracketsError(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
index d2952ed8a8..bb645efa77 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
@@ -560,6 +560,4 @@ public function processBracket(File $phpcsFile, int $openBracket)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
index b862e45d98..d7bdba5cac 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -28,6 +28,4 @@ protected function getPatterns()
             'abstract function abc(...);',
         ];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
index 41cc544754..d43e7db12d 100644
--- a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
@@ -57,6 +57,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
index fa6974d134..f13bc8e421 100644
--- a/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
@@ -54,6 +54,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
index 462b41cc35..e066355f32 100644
--- a/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
@@ -62,6 +62,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
index ccccf2f653..b3fd17d094 100644
--- a/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
@@ -240,6 +240,4 @@ public function processBracket(File $phpcsFile, int $openBracket, array $tokens,
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index 20408184d1..dc7d8137f0 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -48,6 +48,4 @@ protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'NotCamelCaps', $errorData);
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 4ed1877b3b..0e946e9110 100644
--- a/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -180,6 +180,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
index 3ccfed0e27..e2d79689ab 100644
--- a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
+++ b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
@@ -78,6 +78,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'New objects must be assigned to a variable';
         $phpcsFile->addError($error, $stackPtr, 'NotAssigned');
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
index 4ec804fb77..e7484cf006 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
@@ -207,6 +207,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
index 37bc6a6b5c..dc5ea8bb67 100644
--- a/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
@@ -222,6 +222,4 @@ protected function processAssignment(File $phpcsFile, int $stackPtr)
             $phpcsFile->addError($error, $stackPtr, 'Found');
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
index d9067a5931..48dc76cecb 100644
--- a/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
@@ -60,6 +60,4 @@ public function process(File $phpcsFile, int $stackPtr)
         ];
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed', $data);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
index 7d1c7c2cb2..63f15f60bb 100644
--- a/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
@@ -272,6 +272,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return ($lastCommentBlockToken + 1);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
index 72b134b66b..2cd9770ef6 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php
@@ -52,6 +52,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'Boolean operators are not allowed outside of control structure conditions';
         $phpcsFile->addError($error, $stackPtr, 'Found');
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
index 6186c63eb3..108b3eb702 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
@@ -103,6 +103,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
index 6c2013afa8..5de62b7716 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
@@ -40,6 +40,4 @@ public function process(File $phpcsFile, int $stackPtr)
     {
         $phpcsFile->addError('Inline IF statements are not allowed', $stackPtr, 'Found');
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
index 258d25729e..1f64d3d279 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
@@ -188,6 +188,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         $phpcsFile->addError($error, $stackPtr, $errorCode);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
index b58b452c03..d00442c310 100644
--- a/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
@@ -95,6 +95,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end for
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
index e57977fa67..e6ee2e893c 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
@@ -502,6 +502,4 @@ private function calculateLineIndent(File $phpcsFile, int $stackPtr)
 
         return $indent;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
index 5ce4ae4c37..0246caf9f2 100644
--- a/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php
@@ -41,6 +41,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'Use of eval() is discouraged';
         $phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
index 8ce43ff88d..c7df8c46f4 100644
--- a/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
@@ -46,6 +46,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $data    = [$varName];
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed', $data);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
index bc3513e858..7f5bde3ada 100644
--- a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
@@ -55,6 +55,4 @@ 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);
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
index d40bfcb2fa..0a4fdfba10 100644
--- a/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
@@ -69,6 +69,4 @@ public function process(File $phpcsFile, int $stackPtr)
         $error = 'The use of inner functions is forbidden';
         $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
index 73b1506d3b..cbd2f49bd1 100644
--- a/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
@@ -153,6 +153,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->replaceToken($stackPtr, strtolower($tokens[$stackPtr]['content']));
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
index 7a2462cf35..3449afc0c8 100644
--- a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
@@ -296,6 +296,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end for
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
index f173ce04c4..1be8a25f9e 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
@@ -88,6 +88,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
         // 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 5875c468f7..6580e3a685 100644
--- a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
@@ -75,6 +75,4 @@ protected function processTokenWithinScope(File $phpcsFile, int $stackPtr, int $
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
index 39d01937d7..ebf43bf013 100644
--- a/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
@@ -119,6 +119,4 @@ private function checkThisUsage(File $phpcsFile, int $next, int $end)
     protected function processTokenOutsideScope(File $phpcsFile, int $stackPtr)
     {
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
index ea8f64303c..9bead470f4 100644
--- a/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
@@ -157,6 +157,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
index 4a404ae38d..0522a4f1bf 100644
--- a/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
@@ -142,6 +142,4 @@ public function process(File $phpcsFile, int $stackPtr)
 
         return $skipTo;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
index b539282b69..93a913b0c2 100644
--- a/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
+++ b/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
@@ -81,6 +81,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
index 07fd0d4083..b2ca63ff12 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
@@ -58,6 +58,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
index 9d068b74a7..caac5450f3 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
@@ -342,6 +342,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
index 8f8faecbf2..6a3ed01111 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
@@ -127,6 +127,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
index b8b44e37fd..62bbde68df 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
@@ -81,6 +81,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
index d676836ec6..93a9ce4f85 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
@@ -369,6 +369,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
index 4550a1b744..4118e68885 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
@@ -85,6 +85,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
index 8cdab342b7..f52e46680d 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
@@ -256,6 +256,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
     {
         // 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 7929837fa2..a1395965f6 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -158,6 +158,4 @@ protected function checkSpacingAfterOperator(File $phpcsFile, int $stackPtr, $af
 
         return true;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
index b84c2f139a..7369d99437 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
@@ -391,6 +391,4 @@ protected function isOperator(File $phpcsFile, int $stackPtr)
 
         return true;
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index 9ceb6dbb5b..6de5671a3f 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -107,6 +107,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
index 870d69754c..d17795cf33 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -165,6 +165,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
index a3f64b69e2..741448c162 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
@@ -99,6 +99,4 @@ public function process(File $phpcsFile, int $stackPtr)
             $phpcsFile->fixer->endChangeset();
         }
     }
-
-
 }
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
index e4f724943e..992fb567db 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
@@ -207,6 +207,4 @@ public function process(File $phpcsFile, int $stackPtr)
             }//end if
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
index bdf3a92b31..ff4ce89a4c 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
@@ -55,6 +55,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
index e4085c8c29..520d133a7f 100644
--- a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
@@ -255,6 +255,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
index f02eda9c3f..2f788ca2c2 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
@@ -86,6 +86,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
index 2fd95f5e45..7c63e9b200 100644
--- a/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
@@ -138,6 +138,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
index 88b21b6dd4..a4e3a3132c 100644
--- a/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
@@ -62,6 +62,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
index 51b4aa15f1..a3e57bf17d 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
@@ -63,6 +63,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
index df4c70248b..c30147ce11 100644
--- a/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
@@ -76,6 +76,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
index 1682fe4f12..ff20688484 100644
--- a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
@@ -102,6 +102,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
index cb35732cc9..4cfbfd8bd5 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
@@ -80,6 +80,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
index f1e71a8dc5..677be56eae 100644
--- a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
@@ -79,6 +79,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
index fc92fc877c..15143e01a0 100644
--- a/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
@@ -83,6 +83,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
index d31330a786..00e5a7fae5 100644
--- a/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
index 0fdced18fd..fdce790126 100644
--- a/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
@@ -74,6 +74,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
index 6908843406..e97d9beb73 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
index e8219e4cfc..f0810924a5 100644
--- a/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
@@ -198,6 +198,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
index c045d7dcde..5e4e385b48 100644
--- a/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
index 9aab59bec2..ca35c36ca5 100644
--- a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
@@ -76,6 +76,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
index 74fc7f961f..473f6c274c 100644
--- a/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
@@ -58,6 +58,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
index c185a7c66a..8279a64075 100644
--- a/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
@@ -87,6 +87,4 @@ public function getWarningList()
             496 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
index c42dc5fe7d..6c44c2446c 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
@@ -104,6 +104,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
index 463f909f53..ee82ba2f14 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
index 6d939ca365..bcbaefc237 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
@@ -54,6 +54,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
index b70b130751..0c00bc83c9 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
@@ -87,6 +87,4 @@ public function getWarningList($testFile = '')
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
index a70a62aafa..82d8fd2d88 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
@@ -72,6 +72,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
index b741d1424a..b00e0a41c4 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
@@ -59,6 +59,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
index c4d43e3e73..34870eadd7 100644
--- a/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
@@ -94,6 +94,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
index 539e859f89..29a2363a95 100644
--- a/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
index af2ba1a797..7455663593 100644
--- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
+++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
@@ -97,6 +97,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
index 4e6be93d49..5dbee0eb3b 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
@@ -121,6 +121,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
index 14eda4f255..28fc70a889 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
index aa73bac96e..85eee0e1dd 100644
--- a/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
index 08469e8cb6..1e7d15f504 100644
--- a/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
@@ -54,6 +54,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
index d89dfa8009..fa43bbd51d 100644
--- a/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
@@ -56,6 +56,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
index e22eb7f108..f815cc861c 100644
--- a/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
@@ -90,6 +90,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
index 2c5fdb1987..0146ba433f 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -65,6 +65,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
index 958730948b..9738a5cc0d 100644
--- a/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -96,6 +96,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
index b1600f0696..1450a3a17a 100644
--- a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
+++ b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
index b0631a690e..2da1c17fcc 100644
--- a/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
@@ -80,6 +80,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
index f78fb0adb5..af9f073009 100644
--- a/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
@@ -66,6 +66,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
index 6d52251e42..24bd44282e 100644
--- a/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
index 2a9dffb61d..9ba224a3ff 100644
--- a/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
@@ -59,6 +59,4 @@ public function getWarningList()
             158 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
index 4cd43d4078..915a17c991 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
index 236e7303fc..985aae828c 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
index 9f0d71592d..576fe21c87 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
index 0ef78be8b3..f43f035a9d 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
@@ -64,6 +64,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
index c302c7f39e..6efbaedc0c 100644
--- a/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
@@ -62,6 +62,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
index b8c9315cc3..e53637de76 100644
--- a/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
             4 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
index a582971bf4..7cf4bbf765 100644
--- a/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
@@ -243,6 +243,4 @@ public function getWarningList($testFile = '')
 
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
index 2b9a9512af..18d3392c70 100644
--- a/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
             4 => 1,
         ];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
index f48266899f..5e2b632c94 100644
--- a/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
@@ -49,6 +49,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
index 4d4640848a..0a345f76cf 100644
--- a/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
index eb02e73003..0f2d0f934b 100644
--- a/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
@@ -51,6 +51,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
index 9d120bafbe..b451e7bce2 100644
--- a/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
index 075f0f523a..6a7aa8dcbe 100644
--- a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
@@ -119,6 +119,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
index dd586beb5e..f77b956164 100644
--- a/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
@@ -69,6 +69,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
index 4e238cf912..25bdf18e3b 100644
--- a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
@@ -59,6 +59,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
index c8d92cf9f5..38a7039d56 100644
--- a/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
index 67c489627d..11093e4ecf 100644
--- a/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
@@ -64,6 +64,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
index e8afe135fb..224baa8627 100644
--- a/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
@@ -60,6 +60,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
index 7b2a04178e..128029dea7 100644
--- a/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
+++ b/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
@@ -53,6 +53,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
index 4fcc324d9a..705de29a59 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
@@ -52,6 +52,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
index b21ddca15f..e2b074c2d1 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
@@ -77,6 +77,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
index 9a8c397065..3ed78f3da5 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
index a3e36d725e..2fa7055268 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
@@ -50,6 +50,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
index a4d0ea59d5..a3ccc4ef1b 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
@@ -143,6 +143,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
index ed9c1f63f9..8eb616a846 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
@@ -52,6 +52,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
index 2bb3919291..2288db1ea6 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
@@ -113,6 +113,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
index 0065704836..f52f1278c5 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -66,6 +66,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
index b90a5542f1..275d9e1339 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -130,6 +130,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
index 1253cf85db..74de03c78c 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -57,6 +57,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
index 6b435bcddd..2684993ab7 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
@@ -97,6 +97,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
index 5dca79318b..1d55bb7bd9 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
@@ -59,6 +59,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
index f3c5ac1eff..ccff6e3348 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
@@ -87,6 +87,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
index 90dd7e0a41..5de17450bf 100644
--- a/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
+++ b/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
@@ -72,6 +72,4 @@ public function process(File $phpcsFile, int $stackPtr)
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;
     }
-
-
 }
diff --git a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
index 7c909567d6..cdf6a4f418 100644
--- a/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ b/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -190,6 +190,4 @@ protected function processVariableInString(File $phpcsFile, int $stackPtr)
             }//end foreach
         }//end if
     }
-
-
 }
diff --git a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
index 79bb9da00d..60c9be4e30 100644
--- a/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
+++ b/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
@@ -63,6 +63,4 @@ public function getWarningList()
     {
         return [];
     }
-
-
 }
diff --git a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
index b9ac17f935..93359bee2b 100644
--- a/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
+++ b/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
@@ -115,6 +115,4 @@ public function getWarningList($testFile = '')
             return [];
         }//end switch
     }
-
-
 }
diff --git a/src/Tokenizers/Comment.php b/src/Tokenizers/Comment.php
index 9bf804a7d9..da6018dbb6 100644
--- a/src/Tokenizers/Comment.php
+++ b/src/Tokenizers/Comment.php
@@ -282,6 +282,4 @@ private function collectWhitespace(string $comment, int $start, int $end)
             'type'    => 'T_DOC_COMMENT_WHITESPACE',
         ];
     }
-
-
 }
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
index 936b059aaa..59c1c4b167 100644
--- a/src/Tokenizers/PHP.php
+++ b/src/Tokenizers/PHP.php
@@ -4072,6 +4072,4 @@ private function createAttributesNestingMap()
             }//end if
         }//end for
     }
-
-
 }
diff --git a/src/Tokenizers/Tokenizer.php b/src/Tokenizers/Tokenizer.php
index 8fb54a0c4a..4af7509c4b 100644
--- a/src/Tokenizers/Tokenizer.php
+++ b/src/Tokenizers/Tokenizer.php
@@ -1576,6 +1576,4 @@ private function createLevelMap()
             StatusWriter::write('*** END LEVEL MAP ***', 1);
         }
     }
-
-
 }
diff --git a/src/Util/Cache.php b/src/Util/Cache.php
index 3560b40028..6c8a543b5c 100644
--- a/src/Util/Cache.php
+++ b/src/Util/Cache.php
@@ -347,6 +347,4 @@ public static function getSize()
     {
         return (count(self::$cache) - 1);
     }
-
-
 }
diff --git a/src/Util/Common.php b/src/Util/Common.php
index 7d436788b4..4ac808962b 100644
--- a/src/Util/Common.php
+++ b/src/Util/Common.php
@@ -597,6 +597,4 @@ public static function cleanSniffClass(string $sniffClass)
         $newName = substr($newName, ($start + 1));
         return $newName;
     }
-
-
 }
diff --git a/src/Util/ExitCode.php b/src/Util/ExitCode.php
index 71744a4495..408651bcdf 100644
--- a/src/Util/ExitCode.php
+++ b/src/Util/ExitCode.php
@@ -139,6 +139,4 @@ public static function calculate(Reporter $reporter)
 
         return $exitCode;
     }
-
-
 }
diff --git a/src/Util/Help.php b/src/Util/Help.php
index 8fe05943af..ecfef28b87 100644
--- a/src/Util/Help.php
+++ b/src/Util/Help.php
@@ -625,6 +625,4 @@ private function getAllOptions()
 
         return $options;
     }
-
-
 }
diff --git a/src/Util/IgnoreList.php b/src/Util/IgnoreList.php
index 4412ae1523..068cecb3ab 100644
--- a/src/Util/IgnoreList.php
+++ b/src/Util/IgnoreList.php
@@ -193,6 +193,4 @@ public function ignoresEverything()
 
         return true;
     }
-
-
 }
diff --git a/src/Util/MessageCollector.php b/src/Util/MessageCollector.php
index 3a9c27d934..dc5af475c0 100644
--- a/src/Util/MessageCollector.php
+++ b/src/Util/MessageCollector.php
@@ -270,6 +270,4 @@ private function clearCache()
     {
         $this->cache = [];
     }
-
-
 }
diff --git a/src/Util/Standards.php b/src/Util/Standards.php
index 663d0dfba2..4be2a04f2f 100644
--- a/src/Util/Standards.php
+++ b/src/Util/Standards.php
@@ -345,6 +345,4 @@ public static function printInstalledStandards()
     {
         echo self::prepareInstalledStandardsForDisplay(), PHP_EOL;
     }
-
-
 }
diff --git a/src/Util/Timing.php b/src/Util/Timing.php
index 2dcbc6cd12..b7c4410ed8 100644
--- a/src/Util/Timing.php
+++ b/src/Util/Timing.php
@@ -148,6 +148,4 @@ public static function printRunTime(bool $force = false)
 
         self::$printed = true;
     }
-
-
 }
diff --git a/src/Util/Tokens.php b/src/Util/Tokens.php
index 7274768a75..3589ebf39d 100644
--- a/src/Util/Tokens.php
+++ b/src/Util/Tokens.php
@@ -984,6 +984,4 @@ public static function getHighestWeightedToken(array $tokens)
 
         return $highestType;
     }
-
-
 }
diff --git a/src/Util/Writers/StatusWriter.php b/src/Util/Writers/StatusWriter.php
index e31b675224..db7102ca9c 100644
--- a/src/Util/Writers/StatusWriter.php
+++ b/src/Util/Writers/StatusWriter.php
@@ -162,6 +162,4 @@ public static function isPaused()
     {
         return self::$paused;
     }
-
-
 }
diff --git a/tests/ConfigDouble.php b/tests/ConfigDouble.php
index e8e34818c5..c4048022b1 100644
--- a/tests/ConfigDouble.php
+++ b/tests/ConfigDouble.php
@@ -207,6 +207,4 @@ private function setStaticConfigProperty(string $name, $value)
 
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
     }
-
-
 }
diff --git a/tests/Core/AbstractMethodTestCase.php b/tests/Core/AbstractMethodTestCase.php
index b1e0e164ce..bce730c0a8 100644
--- a/tests/Core/AbstractMethodTestCase.php
+++ b/tests/Core/AbstractMethodTestCase.php
@@ -233,6 +233,4 @@ public function expectRunTimeException($message)
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($message);
     }
-
-
 }
diff --git a/tests/Core/Autoloader/DetermineLoadedClassTest.php b/tests/Core/Autoloader/DetermineLoadedClassTest.php
index 0df29af7f5..374df3329e 100644
--- a/tests/Core/Autoloader/DetermineLoadedClassTest.php
+++ b/tests/Core/Autoloader/DetermineLoadedClassTest.php
@@ -116,6 +116,4 @@ public function testUnordered()
         $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertSame('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
     }
-
-
 }
diff --git a/tests/Core/Config/AbstractRealConfigTestCase.php b/tests/Core/Config/AbstractRealConfigTestCase.php
index f45976ba12..fbce31bf6e 100644
--- a/tests/Core/Config/AbstractRealConfigTestCase.php
+++ b/tests/Core/Config/AbstractRealConfigTestCase.php
@@ -76,6 +76,4 @@ protected static function setStaticConfigProperty($name, $value)
         $property->setValue(null, $value);
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
     }
-
-
 }
diff --git a/tests/Core/Config/ExtensionsArgTest.php b/tests/Core/Config/ExtensionsArgTest.php
index 98e717c78e..976d285a47 100644
--- a/tests/Core/Config/ExtensionsArgTest.php
+++ b/tests/Core/Config/ExtensionsArgTest.php
@@ -160,6 +160,4 @@ public static function dataInvalidExtensions()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Config/GeneratorArgTest.php b/tests/Core/Config/GeneratorArgTest.php
index 6d2515e2ed..1453fe3091 100644
--- a/tests/Core/Config/GeneratorArgTest.php
+++ b/tests/Core/Config/GeneratorArgTest.php
@@ -144,6 +144,4 @@ public static function dataInvalidGeneratorNames()
             [''],
         ];
     }
-
-
 }
diff --git a/tests/Core/Config/IniSetTest.php b/tests/Core/Config/IniSetTest.php
index 482041facc..1efd347412 100644
--- a/tests/Core/Config/IniSetTest.php
+++ b/tests/Core/Config/IniSetTest.php
@@ -312,6 +312,4 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Config/IssueSquiz2675Test.php b/tests/Core/Config/IssueSquiz2675Test.php
index 58f234c9c1..9d418b5f97 100644
--- a/tests/Core/Config/IssueSquiz2675Test.php
+++ b/tests/Core/Config/IssueSquiz2675Test.php
@@ -37,6 +37,4 @@ public function testIssueSquiz2675()
 
         $this->assertSame(4, $configB->tabWidth, 'Tab width not correctly set when Config is created a second time');
     }
-
-
 }
diff --git a/tests/Core/Config/PrepareConfigDataForDisplayTest.php b/tests/Core/Config/PrepareConfigDataForDisplayTest.php
index 97a3c3236a..7207a3b2c7 100644
--- a/tests/Core/Config/PrepareConfigDataForDisplayTest.php
+++ b/tests/Core/Config/PrepareConfigDataForDisplayTest.php
@@ -109,6 +109,4 @@ public function testPrintConfigData()
         $config = new ConfigDouble();
         $config->printConfigData([]);
     }
-
-
 }
diff --git a/tests/Core/Config/ReportArgsTest.php b/tests/Core/Config/ReportArgsTest.php
index ccdf9b2001..7749e0ce90 100644
--- a/tests/Core/Config/ReportArgsTest.php
+++ b/tests/Core/Config/ReportArgsTest.php
@@ -57,6 +57,4 @@ public function testReportFileDoesNotSetReportsCbf()
         $this->assertNull($config->reportFile);
         $this->assertSame(['full' => null], $config->reports);
     }
-
-
 }
diff --git a/tests/Core/Config/ReportWidthTest.php b/tests/Core/Config/ReportWidthTest.php
index 0dbbfff8f8..1052ea2e47 100644
--- a/tests/Core/Config/ReportWidthTest.php
+++ b/tests/Core/Config/ReportWidthTest.php
@@ -246,6 +246,4 @@ public static function dataReportWidthInputHandling()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Config/SniffsExcludeArgsTest.php b/tests/Core/Config/SniffsExcludeArgsTest.php
index 54623175e0..0945b28615 100644
--- a/tests/Core/Config/SniffsExcludeArgsTest.php
+++ b/tests/Core/Config/SniffsExcludeArgsTest.php
@@ -310,6 +310,4 @@ public static function dataOnlySetOnce()
             'exclude' => ['exclude'],
         ];
     }
-
-
 }
diff --git a/tests/Core/ErrorSuppressionTest.php b/tests/Core/ErrorSuppressionTest.php
index 7a2c4c38be..005883f9fb 100644
--- a/tests/Core/ErrorSuppressionTest.php
+++ b/tests/Core/ErrorSuppressionTest.php
@@ -1237,6 +1237,4 @@ public static function dataCommenting()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
index 2a4f4b1904..30590b1aef 100644
--- a/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
+++ b/tests/Core/Files/File/AddMessageSelectiveInternalHandlingTest.php
@@ -117,6 +117,4 @@ private function getPhpcsFile($sniffs, $exclude)
 
         return $phpcsFile;
     }
-
-
 }
diff --git a/tests/Core/Files/File/FindEndOfStatementTest.php b/tests/Core/Files/File/FindEndOfStatementTest.php
index 3ecfd72c11..a2ef8ba8a1 100644
--- a/tests/Core/Files/File/FindEndOfStatementTest.php
+++ b/tests/Core/Files/File/FindEndOfStatementTest.php
@@ -430,6 +430,4 @@ public function testNestedMatch()
 
         $this->assertSame(($start + 5), $found);
     }
-
-
 }
diff --git a/tests/Core/Files/File/FindExtendedClassNameTest.php b/tests/Core/Files/File/FindExtendedClassNameTest.php
index 2ddd810acd..1a139f2b3d 100644
--- a/tests/Core/Files/File/FindExtendedClassNameTest.php
+++ b/tests/Core/Files/File/FindExtendedClassNameTest.php
@@ -148,6 +148,4 @@ public static function dataExtendedClass()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
index 6a6f97c649..8d66dbd88a 100644
--- a/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
+++ b/tests/Core/Files/File/FindImplementedInterfaceNamesTest.php
@@ -160,6 +160,4 @@ public static function dataImplementedInterface()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/FindStartOfStatementTest.php b/tests/Core/Files/File/FindStartOfStatementTest.php
index 74aed51b01..edbf88ac1a 100644
--- a/tests/Core/Files/File/FindStartOfStatementTest.php
+++ b/tests/Core/Files/File/FindStartOfStatementTest.php
@@ -947,6 +947,4 @@ public static function dataFindStartInsideShortArrayNestedWithinMatch()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetClassPropertiesTest.php b/tests/Core/Files/File/GetClassPropertiesTest.php
index e1761cfb9e..bace2d8d54 100644
--- a/tests/Core/Files/File/GetClassPropertiesTest.php
+++ b/tests/Core/Files/File/GetClassPropertiesTest.php
@@ -183,6 +183,4 @@ public static function dataGetClassProperties()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetConditionTest.php b/tests/Core/Files/File/GetConditionTest.php
index fb8faa3914..5baa64b0f9 100644
--- a/tests/Core/Files/File/GetConditionTest.php
+++ b/tests/Core/Files/File/GetConditionTest.php
@@ -475,6 +475,4 @@ public function testHasConditionMultipleTypes()
             'Failed asserting that "testSeriouslyNestedMethod" has an OO Scope token condition'
         );
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
index 7b41b0541b..37e3c5ce55 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError1Test.php
@@ -31,6 +31,4 @@ public function testGetDeclarationName()
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame('', $result);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
index 34dd0fd006..c89b9195a4 100644
--- a/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
+++ b/tests/Core/Files/File/GetDeclarationNameParseError2Test.php
@@ -31,6 +31,4 @@ public function testGetDeclarationName()
         $result = self::$phpcsFile->getDeclarationName($target);
         $this->assertSame('', $result);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetDeclarationNameTest.php b/tests/Core/Files/File/GetDeclarationNameTest.php
index 4df50c6373..6860826b1d 100644
--- a/tests/Core/Files/File/GetDeclarationNameTest.php
+++ b/tests/Core/Files/File/GetDeclarationNameTest.php
@@ -204,6 +204,4 @@ public static function dataGetDeclarationName()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMemberPropertiesTest.php b/tests/Core/Files/File/GetMemberPropertiesTest.php
index c4695e8624..f0759160d4 100644
--- a/tests/Core/Files/File/GetMemberPropertiesTest.php
+++ b/tests/Core/Files/File/GetMemberPropertiesTest.php
@@ -1898,6 +1898,4 @@ public function testNotAVariableException()
         $next = $this->getTargetToken('/* testNotAVariable */', T_RETURN);
         self::$phpcsFile->getMemberProperties($next);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodParametersParseError1Test.php b/tests/Core/Files/File/GetMethodParametersParseError1Test.php
index a62ea28700..4ecc8be944 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError1Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError1Test.php
@@ -32,6 +32,4 @@ public function testParseError()
 
         $this->assertSame([], $result);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodParametersParseError2Test.php b/tests/Core/Files/File/GetMethodParametersParseError2Test.php
index 0ad3362092..4b4d9f25b5 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError2Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError2Test.php
@@ -32,6 +32,4 @@ public function testParseError()
 
         $this->assertSame([], $result);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodParametersParseError3Test.php b/tests/Core/Files/File/GetMethodParametersParseError3Test.php
index a5a73e728f..a6dbf8816e 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError3Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError3Test.php
@@ -31,6 +31,4 @@ public function testParseError()
         $target = $this->getTargetToken('/* testParseError */', [T_USE]);
         self::$phpcsFile->getMethodParameters($target);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodParametersParseError4Test.php b/tests/Core/Files/File/GetMethodParametersParseError4Test.php
index 6bb7c72750..c13b00cc00 100644
--- a/tests/Core/Files/File/GetMethodParametersParseError4Test.php
+++ b/tests/Core/Files/File/GetMethodParametersParseError4Test.php
@@ -31,6 +31,4 @@ public function testParseError()
 
         $this->assertSame([], $result);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodParametersTest.php b/tests/Core/Files/File/GetMethodParametersTest.php
index 9172f387d3..fddc83dc3a 100644
--- a/tests/Core/Files/File/GetMethodParametersTest.php
+++ b/tests/Core/Files/File/GetMethodParametersTest.php
@@ -3268,6 +3268,4 @@ private function getMethodParametersTestHelper($commentString, $expected, $targe
 
         $this->assertSame($expected, $found);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetMethodPropertiesTest.php b/tests/Core/Files/File/GetMethodPropertiesTest.php
index 03949f9251..61abbf4eaf 100644
--- a/tests/Core/Files/File/GetMethodPropertiesTest.php
+++ b/tests/Core/Files/File/GetMethodPropertiesTest.php
@@ -1498,6 +1498,4 @@ private function getMethodPropertiesTestHelper($commentString, $expected)
 
         $this->assertSame($expected, $found);
     }
-
-
 }
diff --git a/tests/Core/Files/File/GetTokensAsStringTest.php b/tests/Core/Files/File/GetTokensAsStringTest.php
index cd61b3b8e7..ad9b4ecd37 100644
--- a/tests/Core/Files/File/GetTokensAsStringTest.php
+++ b/tests/Core/Files/File/GetTokensAsStringTest.php
@@ -320,6 +320,4 @@ public static function dataGetOrigContent()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/File/IsReferenceTest.php b/tests/Core/Files/File/IsReferenceTest.php
index 3dfede1edd..f133586bdf 100644
--- a/tests/Core/Files/File/IsReferenceTest.php
+++ b/tests/Core/Files/File/IsReferenceTest.php
@@ -387,6 +387,4 @@ public static function dataIsReference()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/FileList/AbstractFileListTestCase.php b/tests/Core/Files/FileList/AbstractFileListTestCase.php
index bb25f128c0..9cf9fe9929 100644
--- a/tests/Core/Files/FileList/AbstractFileListTestCase.php
+++ b/tests/Core/Files/FileList/AbstractFileListTestCase.php
@@ -47,6 +47,4 @@ public static function setUpBeforeClass(): void
             self::$ruleset        = new Ruleset(self::$config);
         }
     }
-
-
 }
diff --git a/tests/Core/Files/FileList/AddFileTest.php b/tests/Core/Files/FileList/AddFileTest.php
index e40f8df606..878796c7f0 100644
--- a/tests/Core/Files/FileList/AddFileTest.php
+++ b/tests/Core/Files/FileList/AddFileTest.php
@@ -125,6 +125,4 @@ public function testAddFileShouldNotAddTheSameFileTwice()
         $this->assertCount(2, $this->fileList);
         $this->assertSame($expectedFiles, array_keys(iterator_to_array($this->fileList)));
     }
-
-
 }
diff --git a/tests/Core/Files/FileList/ConstructTest.php b/tests/Core/Files/FileList/ConstructTest.php
index e3bbe2a850..49d540f647 100644
--- a/tests/Core/Files/FileList/ConstructTest.php
+++ b/tests/Core/Files/FileList/ConstructTest.php
@@ -116,6 +116,4 @@ public static function dataConstruct()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Files/FileList/FilterDouble.php b/tests/Core/Files/FileList/FilterDouble.php
index 873530aa99..5a71226df9 100644
--- a/tests/Core/Files/FileList/FilterDouble.php
+++ b/tests/Core/Files/FileList/FilterDouble.php
@@ -25,6 +25,4 @@ public function accept()
     {
         return true;
     }
-
-
 }
diff --git a/tests/Core/Filters/AbstractFilterTestCase.php b/tests/Core/Filters/AbstractFilterTestCase.php
index 707aa96590..7de5ccdc94 100644
--- a/tests/Core/Filters/AbstractFilterTestCase.php
+++ b/tests/Core/Filters/AbstractFilterTestCase.php
@@ -222,6 +222,4 @@ protected static function mapPathsToRuntimeOs(array $paths)
 
         return $paths;
     }
-
-
 }
diff --git a/tests/Core/Filters/Filter/AcceptTest.php b/tests/Core/Filters/Filter/AcceptTest.php
index 5900784acb..8fc085bba0 100644
--- a/tests/Core/Filters/Filter/AcceptTest.php
+++ b/tests/Core/Filters/Filter/AcceptTest.php
@@ -100,6 +100,4 @@ public static function dataExcludePatterns()
         // Allow these tests to work on Windows as well.
         return self::mapPathsToRuntimeOs($testCases);
     }
-
-
 }
diff --git a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
index e9cd3e3bac..94e25d4ef8 100644
--- a/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
+++ b/tests/Core/Filters/Filter/ShouldProcessFileWithoutExtensionTest.php
@@ -64,6 +64,4 @@ public function testFileWithoutExtensionIsRejectedWhenRecursingDirectory()
 
         $this->assertSame($expectedOutput, $this->getFilteredResultsAsArray($filter));
     }
-
-
 }
diff --git a/tests/Core/Filters/GitModifiedTest.php b/tests/Core/Filters/GitModifiedTest.php
index 5c0094f502..e40b1aa0b9 100644
--- a/tests/Core/Filters/GitModifiedTest.php
+++ b/tests/Core/Filters/GitModifiedTest.php
@@ -260,6 +260,4 @@ public static function dataExecAlwaysReturnsArray()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Filters/GitStagedTest.php b/tests/Core/Filters/GitStagedTest.php
index 76ecdb933b..8b9abb7dc8 100644
--- a/tests/Core/Filters/GitStagedTest.php
+++ b/tests/Core/Filters/GitStagedTest.php
@@ -260,6 +260,4 @@ public static function dataExecAlwaysReturnsArray()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Fixer/FixFileReturnValueTest.php b/tests/Core/Fixer/FixFileReturnValueTest.php
index fbf83371d9..e8da5de506 100644
--- a/tests/Core/Fixer/FixFileReturnValueTest.php
+++ b/tests/Core/Fixer/FixFileReturnValueTest.php
@@ -81,6 +81,4 @@ public static function dataReturnValueIsFalse()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Fixer/GenerateDiffTest.php b/tests/Core/Fixer/GenerateDiffTest.php
index 21e0ba2718..f2556e9e25 100644
--- a/tests/Core/Fixer/GenerateDiffTest.php
+++ b/tests/Core/Fixer/GenerateDiffTest.php
@@ -214,6 +214,4 @@ public function testGenerateDiffDifferentLineEndings()
 
         $this->assertSame($expected, $diff);
     }
-
-
 }
diff --git a/tests/Core/Generators/GeneratorTest.php b/tests/Core/Generators/GeneratorTest.php
index c04d08a54c..00fe449059 100644
--- a/tests/Core/Generators/GeneratorTest.php
+++ b/tests/Core/Generators/GeneratorTest.php
@@ -188,6 +188,4 @@ public function testGetTitleFallbackToFilename()
         $generator = new MockGenerator($ruleset);
         $generator->generate();
     }
-
-
 }
diff --git a/tests/Core/Generators/HTMLTest.php b/tests/Core/Generators/HTMLTest.php
index 4f2896c9aa..b75d8e069b 100644
--- a/tests/Core/Generators/HTMLTest.php
+++ b/tests/Core/Generators/HTMLTest.php
@@ -365,6 +365,4 @@ public function testFooterDoesntThrowWarningOnMissingTimezone()
         // Reset the timezone to its original state.
         ini_set('date.timezone', $originalIni);
     }
-
-
 }
diff --git a/tests/Core/Generators/MarkdownTest.php b/tests/Core/Generators/MarkdownTest.php
index 68631932b7..9d3edf2b93 100644
--- a/tests/Core/Generators/MarkdownTest.php
+++ b/tests/Core/Generators/MarkdownTest.php
@@ -338,6 +338,4 @@ public function testFooterDoesntThrowWarningOnMissingTimezone()
         // Reset the timezone to its original state.
         ini_set('date.timezone', $originalIni);
     }
-
-
 }
diff --git a/tests/Core/Generators/TextTest.php b/tests/Core/Generators/TextTest.php
index 88285bb478..1d4fc053b7 100644
--- a/tests/Core/Generators/TextTest.php
+++ b/tests/Core/Generators/TextTest.php
@@ -226,6 +226,4 @@ public static function dataDocSpecifics()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Reporter/MagicMethodsTest.php b/tests/Core/Reporter/MagicMethodsTest.php
index 22e0d6ed26..d837817267 100644
--- a/tests/Core/Reporter/MagicMethodsTest.php
+++ b/tests/Core/Reporter/MagicMethodsTest.php
@@ -139,6 +139,4 @@ public function testMagicUnsetThrowsException()
         $reporter = new Reporter(new ConfigDouble());
         unset($reporter->totalFixed);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/AbstractRulesetTestCase.php b/tests/Core/Ruleset/AbstractRulesetTestCase.php
index f66c8d2b56..8972b398cc 100644
--- a/tests/Core/Ruleset/AbstractRulesetTestCase.php
+++ b/tests/Core/Ruleset/AbstractRulesetTestCase.php
@@ -91,6 +91,4 @@ protected function expectRuntimeExceptionRegex($regex)
             $this->expectExceptionMessageRegExp($regex);
         }
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ConstructorTest.php b/tests/Core/Ruleset/ConstructorTest.php
index 606af9e040..33ca23f201 100644
--- a/tests/Core/Ruleset/ConstructorTest.php
+++ b/tests/Core/Ruleset/ConstructorTest.php
@@ -280,6 +280,4 @@ public function testNoSniffsRegisteredException()
 
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/DisplayCachedMessagesTest.php b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
index 3d86ad16d6..ae9040fec4 100644
--- a/tests/Core/Ruleset/DisplayCachedMessagesTest.php
+++ b/tests/Core/Ruleset/DisplayCachedMessagesTest.php
@@ -304,6 +304,4 @@ private function invokeDisplayCachedMessages(Ruleset $ruleset)
         $reflMethod->invoke($ruleset);
         (PHP_VERSION_ID < 80100) && $reflMethod->setAccessible(false);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
index 0dbd4ff9e3..c87693e25c 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
@@ -105,6 +105,4 @@ public function testHomePathRefGetsExpandedAndThrowsExceptionWhenPathIsInvalid()
 
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
index 0abdee32ab..595d23babe 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceInternalTest.php
@@ -64,6 +64,4 @@ public function testInternalStandardIsNotSupported()
         // This assertion will only take effect for PHPUnit 10+.
         $this->assertSame($expected, $ruleset->sniffCodes);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
index 3d8af2b974..7c61ef20cb 100644
--- a/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
+++ b/tests/Core/Ruleset/ExpandRulesetReferenceTest.php
@@ -126,6 +126,4 @@ public static function dataUnresolvableReferenceThrowsException()
 
         return $data;
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
index 7e3d3d7e05..281b7a0048 100644
--- a/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
+++ b/tests/Core/Ruleset/ExpandSniffDirectoryTest.php
@@ -61,6 +61,4 @@ public function testExpandSniffDirectory()
 
         $this->assertSame($expectedSniffCodes, $actual, 'Registered sniffs do not match expectation');
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ExplainTest.php b/tests/Core/Ruleset/ExplainTest.php
index 953ffd4cf9..9f99a4e873 100644
--- a/tests/Core/Ruleset/ExplainTest.php
+++ b/tests/Core/Ruleset/ExplainTest.php
@@ -203,6 +203,4 @@ public function testExplainWithDeprecatedSniffs()
 
         $ruleset->explain();
     }
-
-
 }
diff --git a/tests/Core/Ruleset/GetIgnorePatternsTest.php b/tests/Core/Ruleset/GetIgnorePatternsTest.php
index 107b960ab9..968f70bd44 100644
--- a/tests/Core/Ruleset/GetIgnorePatternsTest.php
+++ b/tests/Core/Ruleset/GetIgnorePatternsTest.php
@@ -101,6 +101,4 @@ public static function dataGetIgnorePatterns()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/GetIncludePatternsTest.php b/tests/Core/Ruleset/GetIncludePatternsTest.php
index 79df82c7ff..f1929e511a 100644
--- a/tests/Core/Ruleset/GetIncludePatternsTest.php
+++ b/tests/Core/Ruleset/GetIncludePatternsTest.php
@@ -98,6 +98,4 @@ public static function dataGetIncludePatterns()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
index 69be173c03..5be1481c7c 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersNamingConventionsTest.php
@@ -64,6 +64,4 @@ public function testBrokenNamingConventions()
         // This assertion will only take effect for PHPUnit 10+.
         $this->assertSame($expectedSniffCodes, $ruleset->sniffCodes, 'Registered sniffs do not match expectation');
     }
-
-
 }
diff --git a/tests/Core/Ruleset/PopulateTokenListenersTest.php b/tests/Core/Ruleset/PopulateTokenListenersTest.php
index ea47a16c09..435bd9a978 100644
--- a/tests/Core/Ruleset/PopulateTokenListenersTest.php
+++ b/tests/Core/Ruleset/PopulateTokenListenersTest.php
@@ -431,6 +431,4 @@ public static function dataSetsIncludeAndIgnorePatterns()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
index af19a04767..11553fe689 100644
--- a/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
+++ b/tests/Core/Ruleset/ProcessRuleInvalidTypeTest.php
@@ -37,6 +37,4 @@ public function testInvalidTypeHandling()
 
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
index 5953c64db6..7ae23dc2a8 100644
--- a/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRuleShouldProcessElementTest.php
@@ -638,6 +638,4 @@ 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");
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
index af69eaf861..04626733a6 100644
--- a/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetAutoloadTest.php
@@ -156,6 +156,4 @@ public function testFileNotFoundException()
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
index cbc1540b96..479ac45973 100644
--- a/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetBrokenRulesetTest.php
@@ -88,6 +88,4 @@ public function testBrokenRulesetMultiError()
 
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
index 4ed78001f6..7a4a600e77 100644
--- a/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetCliArgsTest.php
@@ -227,6 +227,4 @@ private function normalizeSlashes($path)
 
         return str_replace(DIRECTORY_SEPARATOR, '/', $path);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
index 0029afc26d..d05642c0a1 100644
--- a/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetConfigDirectivesTest.php
@@ -144,6 +144,4 @@ public static function dataConfigDirectives()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
index bbaf583d87..1d90912c38 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniDirectivesTest.php
@@ -165,6 +165,4 @@ public static function dataIniDirectives()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
index 43d0ef0d50..f6f7f6b115 100644
--- a/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetIniSetTest.php
@@ -130,6 +130,4 @@ public static function dataIniValueCannotBeUpdatedAtRuntime()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
index a0df87cb2c..f9dc426f1c 100644
--- a/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetShouldProcessElementTest.php
@@ -365,6 +365,4 @@ public function testShouldProcessRuleExcludeCbfonly()
 
         $this->assertSame($expected, self::$ruleset->ruleset);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ProcessRulesetTest.php b/tests/Core/Ruleset/ProcessRulesetTest.php
index 44a8da6e37..ab0f83e421 100644
--- a/tests/Core/Ruleset/ProcessRulesetTest.php
+++ b/tests/Core/Ruleset/ProcessRulesetTest.php
@@ -253,6 +253,4 @@ private function getMiscRuleset()
 
         return $ruleset;
     }
-
-
 }
diff --git a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
index eeff3fd5ce..9dcb04f626 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingOldArrayFormatTest.php
@@ -48,6 +48,4 @@ public function testUsingOldSchoolArrayFormatThrowsError()
         $config   = new ConfigDouble(["--standard=$standard"]);
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/PropertyTypeHandlingTest.php b/tests/Core/Ruleset/PropertyTypeHandlingTest.php
index db3e5d8a65..5627137b11 100644
--- a/tests/Core/Ruleset/PropertyTypeHandlingTest.php
+++ b/tests/Core/Ruleset/PropertyTypeHandlingTest.php
@@ -359,6 +359,4 @@ private function getSniffObjectAfterProcessingFile()
 
         return $sniffObject;
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
index 7655429e76..0e2f86234c 100644
--- a/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsMissingInterfaceTest.php
@@ -58,6 +58,4 @@ public function testErrorWhenSniffDoesntImplementInterface()
 
         new Ruleset($config);
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
index d3b714a370..af647ac98c 100644
--- a/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsRemovedTokenizersTest.php
@@ -98,6 +98,4 @@ public static function dataUnsupportedTokenizersTriggerError()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RegisterSniffsTest.php b/tests/Core/Ruleset/RegisterSniffsTest.php
index 22351bb1a9..8c7a9de27c 100644
--- a/tests/Core/Ruleset/RegisterSniffsTest.php
+++ b/tests/Core/Ruleset/RegisterSniffsTest.php
@@ -275,6 +275,4 @@ public function testRegisteredSniffsFiltersOutFilePathsWithoutSniffsDir()
         $this->assertSame(array_keys(self::$originalSniffs), array_keys(self::$ruleset->sniffs));
         $this->assertSame(array_keys(self::$originalSniffs), array_values(self::$ruleset->sniffs));
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
index 6fbc2e8d46..2c0b9b7dbe 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
@@ -107,6 +107,4 @@ public function testLinuxStylePathRuleInclusion()
             $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff']->spacing
         );
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
index 91f11f6076..a7193d7728 100644
--- a/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
+++ b/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
@@ -104,6 +104,4 @@ public function testWindowsStylePathRuleInclusion()
             $this->ruleset->sniffs['PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterCastSniff']->spacing
         );
     }
-
-
 }
diff --git a/tests/Core/Ruleset/RuleInclusionTest.php b/tests/Core/Ruleset/RuleInclusionTest.php
index c5c90545a9..ce0fb95d6c 100644
--- a/tests/Core/Ruleset/RuleInclusionTest.php
+++ b/tests/Core/Ruleset/RuleInclusionTest.php
@@ -461,6 +461,4 @@ public static function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilen
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Ruleset/SetSniffPropertyTest.php b/tests/Core/Ruleset/SetSniffPropertyTest.php
index 78e2319303..9ccaae6a31 100644
--- a/tests/Core/Ruleset/SetSniffPropertyTest.php
+++ b/tests/Core/Ruleset/SetSniffPropertyTest.php
@@ -269,6 +269,4 @@ public function testDirectCallWithNewArrayFormatSetsProperty()
         $sniffObject = $ruleset->sniffs[$sniffClass];
         $this->assertSame($propertyValue, $sniffObject->$propertyName, 'Property value not set to expected value');
     }
-
-
 }
diff --git a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
index a3f5e2400a..8fe243690d 100644
--- a/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
+++ b/tests/Core/Ruleset/ShowSniffDeprecationsTest.php
@@ -495,6 +495,4 @@ public static function dataExceptionIsThrownOnIncorrectlyImplementedInterface()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Runner/PrintProgressDotsTest.php b/tests/Core/Runner/PrintProgressDotsTest.php
index 3c4509bd22..3ee3f8de54 100644
--- a/tests/Core/Runner/PrintProgressDotsTest.php
+++ b/tests/Core/Runner/PrintProgressDotsTest.php
@@ -216,6 +216,4 @@ private function checkProgressDot($colors, $code, $sniffs, $expected, $enableFix
 
         $this->assertStderrOutputSameString($expected);
     }
-
-
 }
diff --git a/tests/Core/Runner/PrintProgressTest.php b/tests/Core/Runner/PrintProgressTest.php
index cf313e4965..76c4d99b21 100644
--- a/tests/Core/Runner/PrintProgressTest.php
+++ b/tests/Core/Runner/PrintProgressTest.php
@@ -228,6 +228,4 @@ public static function dataEndOfLineSummary()
         ];
         // phpcs:enable
     }
-
-
 }
diff --git a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
index e65dea871a..897ef3a260 100644
--- a/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
+++ b/tests/Core/Runner/RunAllFilesExcludedErrorTest.php
@@ -130,6 +130,4 @@ private function verifyOutput()
 
         $this->assertStderrOutputSameString($expected);
     }
-
-
 }
diff --git a/tests/Core/Runner/RunPHPCSExplainTest.php b/tests/Core/Runner/RunPHPCSExplainTest.php
index 66f44122cc..d702028e52 100644
--- a/tests/Core/Runner/RunPHPCSExplainTest.php
+++ b/tests/Core/Runner/RunPHPCSExplainTest.php
@@ -67,6 +67,4 @@ public function testExplainWillExplainEachStandardSeparately()
         $runner = new Runner();
         $runner->runPHPCS();
     }
-
-
 }
diff --git a/tests/Core/Runner/RunPHPCSGeneratorTest.php b/tests/Core/Runner/RunPHPCSGeneratorTest.php
index a3b55b4b32..bd46cbb3cc 100644
--- a/tests/Core/Runner/RunPHPCSGeneratorTest.php
+++ b/tests/Core/Runner/RunPHPCSGeneratorTest.php
@@ -66,6 +66,4 @@ public function testGeneratorWillShowEachStandardSeparately()
         $runner = new Runner();
         $runner->runPHPCS();
     }
-
-
 }
diff --git a/tests/Core/Sniffs/AbstractArraySniffTest.php b/tests/Core/Sniffs/AbstractArraySniffTest.php
index e2aa27d4a0..a4710974c6 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTest.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTest.php
@@ -281,6 +281,4 @@ public function testArrowFunctionValue()
 
         $this->assertSame($expected, self::$sniff->indicies);
     }
-
-
 }
diff --git a/tests/Core/Sniffs/AbstractArraySniffTestable.php b/tests/Core/Sniffs/AbstractArraySniffTestable.php
index a1cbc66590..ca5ed4b87d 100644
--- a/tests/Core/Sniffs/AbstractArraySniffTestable.php
+++ b/tests/Core/Sniffs/AbstractArraySniffTestable.php
@@ -59,6 +59,4 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $array
     {
         $this->indicies = $indices;
     }
-
-
 }
diff --git a/tests/Core/Standards/StandardRulesetsQATest.php b/tests/Core/Standards/StandardRulesetsQATest.php
index f5880e9860..b26a5b3ea3 100644
--- a/tests/Core/Standards/StandardRulesetsQATest.php
+++ b/tests/Core/Standards/StandardRulesetsQATest.php
@@ -75,6 +75,4 @@ public static function dataBuildInStandards()
 
         return $data;
     }
-
-
 }
diff --git a/tests/Core/StatusWriterTestHelper.php b/tests/Core/StatusWriterTestHelper.php
index b40e62bc26..081a39c42a 100644
--- a/tests/Core/StatusWriterTestHelper.php
+++ b/tests/Core/StatusWriterTestHelper.php
@@ -153,6 +153,4 @@ public function assertStderrOutputMatchesRegex($regex)
             $this->assertRegExp($regex, $output);
         }
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
index ab664dbcad..bb02c5f43c 100644
--- a/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
+++ b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
@@ -123,6 +123,4 @@ public static function clearResolvedTokensCache()
         $property->setValue(null, []);
         (PHP_VERSION_ID < 80100) && $property->setAccessible(false);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/CommentTestCase.php b/tests/Core/Tokenizers/Comment/CommentTestCase.php
index 6d0f50afb4..f0cf358625 100644
--- a/tests/Core/Tokenizers/Comment/CommentTestCase.php
+++ b/tests/Core/Tokenizers/Comment/CommentTestCase.php
@@ -121,6 +121,4 @@ protected function checkTokenSequence($startPtr, array $expectedSequence)
             );
         }//end for
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
index 9c446138bf..af7f73b527 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
@@ -62,6 +62,4 @@ public function testLiveCoding()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
index c41145c94f..f107f994a1 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
@@ -61,6 +61,4 @@ public function testLiveCoding()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
index 154932c8b5..637f800101 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
@@ -55,6 +55,4 @@ public function testLiveCoding()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
index d8fcc1b24b..95ba0f93d3 100644
--- a/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
@@ -69,6 +69,4 @@ public function testLiveCoding()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
index 268efd1ebd..7d61ed68b0 100644
--- a/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
@@ -426,6 +426,4 @@ public function testMultilineDocblockStarsNotAligned()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
index e9259e5dd5..cb61a56e45 100644
--- a/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
@@ -615,6 +615,4 @@ public function testMultiLineDocEnableAnnotationAtEnd()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
index c06711d4b5..13449e5b02 100644
--- a/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
@@ -204,6 +204,4 @@ public function testSingleLineDocblockWithTag3()
 
         $this->checkTokenSequence($target, $expectedSequence);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
index 30f2b164a4..f7f14b220d 100644
--- a/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
+++ b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
@@ -148,6 +148,4 @@ public static function dataAnonClassWithParentheses()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
index 37b89afb60..b7612f7a6d 100644
--- a/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
@@ -189,6 +189,4 @@ public static function dataNotArrayKeyword()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/AttributesTest.php b/tests/Core/Tokenizers/PHP/AttributesTest.php
index 5c8b219e42..307826120e 100644
--- a/tests/Core/Tokenizers/PHP/AttributesTest.php
+++ b/tests/Core/Tokenizers/PHP/AttributesTest.php
@@ -679,6 +679,4 @@ static function ($token) {
 
         $this->assertSame($tokenCodes, $map);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
index 470518b98a..4187203b4a 100644
--- a/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php
@@ -322,6 +322,4 @@ public static function dataNotAsymmetricVisibility()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
index 42cdcbc630..a902d0c78c 100644
--- a/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
@@ -225,6 +225,4 @@ public static function dataNotEnums()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
index 12f09b4028..8b4c25f353 100644
--- a/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
@@ -113,6 +113,4 @@ public static function dataExplicitOctalNotation()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
index b256d55f48..e75bad666a 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenParseErrorTest.php
@@ -38,6 +38,4 @@ public function testUnfinishedArrowFunction()
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
index 4bfc6895c8..513dc5f782 100644
--- a/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
@@ -967,6 +967,4 @@ private function scopePositionTestHelper($token, $openerOffset, $closerOffset, $
         $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');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
index 3c04bc2ca1..762ab488cb 100644
--- a/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
@@ -549,6 +549,4 @@ private function parenthesisTestHelper($token)
         $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');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
index cc24db2de1..5585506df5 100644
--- a/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
@@ -393,6 +393,4 @@ public static function dataNoBackfill()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
index 8865f06913..7460f15154 100644
--- a/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
@@ -272,6 +272,4 @@ public static function dataNotReadonly()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
index 66b7e9053b..301d1a8d70 100644
--- a/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
+++ b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
@@ -164,6 +164,4 @@ public static function dataTypeUnion()
             'return type for closure with FQN null'                    => ['/* testTypeUnionFQNNull */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
index 3473d3beb1..231e875388 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsGotoTest.php
@@ -123,6 +123,4 @@ public static function dataStrings()
             'xor'          => ['/* testXor */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
index 01cbfebd5b..4478f5dc07 100644
--- a/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
@@ -563,6 +563,4 @@ public static function dataKeywords()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
index b886cafa30..635596e257 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
@@ -62,6 +62,4 @@ public static function dataBrokenDNFTypeCantEndOnOpenParenthesis()
             'Return type'      => ['/* testBrokenReturnDNFTypeEndOnOpenParenthesis */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
index d541b5fdbe..9c9ffa4279 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
@@ -207,6 +207,4 @@ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmat
             'Return type - missing one open parenthesis'      => ['/* testBrokenReturnDNFTypeParensMissingOneOpen */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DNFTypesTest.php b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
index c10eb63eea..ee1df2dacb 100644
--- a/tests/Core/Tokenizers/PHP/DNFTypesTest.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
@@ -557,6 +557,4 @@ public static function dataDNFTypeParentheses()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
index 489fac67f3..076d80a0a3 100644
--- a/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
@@ -260,6 +260,4 @@ public static function dataNotDefaultKeyword()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
index 5a85089d5e..ac874db03a 100644
--- a/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
@@ -226,6 +226,4 @@ public static function dataFnArrow()
             'in_complex_match_value_in_short_array' => ['/* testFnArrowInComplexMatchValueInShortArrayValue */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
index 835849e547..8a18de2041 100644
--- a/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
@@ -137,6 +137,4 @@ public static function dataDoubleQuotedString()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/EnumCaseTest.php b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
index c2de0be68d..30c5e6d369 100644
--- a/tests/Core/Tokenizers/PHP/EnumCaseTest.php
+++ b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
@@ -140,6 +140,4 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"exit" as case name'      => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
index 84a2bcda4a..72a2fb7535 100644
--- a/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ExitKeywordTest.php
@@ -240,6 +240,4 @@ public static function dataNotExitKeyword()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/FinallyTest.php b/tests/Core/Tokenizers/PHP/FinallyTest.php
index 94df6243e2..e12c9bb98a 100644
--- a/tests/Core/Tokenizers/PHP/FinallyTest.php
+++ b/tests/Core/Tokenizers/PHP/FinallyTest.php
@@ -51,6 +51,4 @@ public static function dataFinallyNonKeyword()
             'finally used as property name'       => ['/* testFinallyUsedAsPropertyName */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/GotoLabelTest.php b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
index bc8b88f74a..4de3248abf 100644
--- a/tests/Core/Tokenizers/PHP/GotoLabelTest.php
+++ b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
@@ -270,6 +270,4 @@ public static function dataNotAGotoDeclaration()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
index 3ccec4c4a3..3b912a15eb 100644
--- a/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
@@ -201,6 +201,4 @@ private function checkTokenSequence($startPtr, array $expectedSequence)
             );
         }//end for
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
index a79ce7af71..63df7ec84e 100644
--- a/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
@@ -35,6 +35,4 @@ 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)');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/HeredocStringTest.php b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
index 92e8084e92..ca16adcc40 100644
--- a/tests/Core/Tokenizers/PHP/HeredocStringTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
@@ -153,6 +153,4 @@ public static function dataHeredocString()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
index 0f1379832e..624a556a58 100644
--- a/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
+++ b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
@@ -973,6 +973,4 @@ public static function dataReservedKeywordsAsName()
 
         return $data;
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
index 5ce46360ef..14b68dfeb6 100644
--- a/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/NamespacedNameSingleTokenTest.php
@@ -1285,6 +1285,4 @@ public static function dataIdentifierTokenization()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
index 3bea6be6fd..2d7abbc83e 100644
--- a/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
+++ b/tests/Core/Tokenizers/PHP/NullableVsInlineThenTest.php
@@ -114,6 +114,4 @@ public static function dataInlineThen()
             'ternary ? followed by namespace relative static method call'  => ['/* testInlineThenWithNamespaceRelativeNameAndDoubleColon */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
index 6253b59037..50f268b616 100644
--- a/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
+++ b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
@@ -134,6 +134,4 @@ public static function dataTernaryThen()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
index 6d197b3b61..ffe0758a18 100644
--- a/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
@@ -733,6 +733,4 @@ public static function dataKeywords()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
index 450e5de890..3cf87a1f3c 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF1Test.php
@@ -56,6 +56,4 @@ 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);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
index 1a3d099df2..59bb8c3183 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF2Test.php
@@ -48,6 +48,4 @@ 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);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
index 7419129820..96bb12e639 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagEOF3Test.php
@@ -48,6 +48,4 @@ 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);
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
index a776bc0173..91108ca282 100644
--- a/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
+++ b/tests/Core/Tokenizers/PHP/PHPOpenTagTest.php
@@ -404,6 +404,4 @@ private static function getOpenTagTokenizationProvider($tagtype, $tokenType, $to
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
index 1dfef0b065..5908a494dd 100644
--- a/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
@@ -409,6 +409,4 @@ private function checkTokenSequence($startPtr, array $expectedSequence)
             ++$sequenceKey;
         }//end for
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/ShortArrayTest.php b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
index 86de877bf5..df44e37928 100644
--- a/tests/Core/Tokenizers/PHP/ShortArrayTest.php
+++ b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
@@ -140,6 +140,4 @@ public static function dataShortArrays()
             'short list after class declaration'             => ['/* testShortListDeclarationAfterClassDeclaration */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
index 1823e40f38..ec27013fa6 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
@@ -1057,6 +1057,4 @@ public static function dataCommentTokenization()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
index fa7494cc03..422827816a 100644
--- a/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
@@ -368,6 +368,4 @@ public static function dataCommentTokenization()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
index 2636e74baa..aede69e1ef 100644
--- a/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
+++ b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
@@ -159,6 +159,4 @@ public static function dataTypeIntersection()
             'return type for closure, includes (invalid) FQN null'        => ['/* testTypeIntersectionInvalidFQNNull */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
index bc21fe1628..05d2c5cbd8 100644
--- a/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
+++ b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
@@ -625,6 +625,4 @@ public static function dataDNFTypedConstant()
 
         return $data;
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/PHP/YieldTest.php b/tests/Core/Tokenizers/PHP/YieldTest.php
index 5852dcbf14..32b81debfd 100644
--- a/tests/Core/Tokenizers/PHP/YieldTest.php
+++ b/tests/Core/Tokenizers/PHP/YieldTest.php
@@ -419,6 +419,4 @@ public static function dataYieldNonKeyword()
             'yield used as method name with ref'  => ['/* testYieldUsedAsMethodNameReturnByRef */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
index c082c370a2..3eca64eb30 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
@@ -365,6 +365,4 @@ public static function dataDNFTypeParentheses()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
index 97d561cc89..8e43db00a5 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
@@ -110,6 +110,4 @@ public static function dataHeredocNowdocCloserTabReplacement()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
index 4c97ea6bd8..4c694d4523 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
@@ -115,6 +115,4 @@ public static function dataHeredocNowdocOpenerTabReplacement()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
index dc8ffd7386..ebc91359c8 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapTabWidth0Test.php
@@ -101,6 +101,4 @@ public static function getTabReplacementExpected()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
index 7644133ec7..d21a5d218b 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapYieldFromTest.php
@@ -93,6 +93,4 @@ public static function dataYieldFromTabReplacement()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
index f7d4bb7bd4..76e8a2c2cd 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
@@ -201,6 +201,4 @@ public static function dataNotArrayKeyword()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
index 0039f47575..3ab3764a98 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesParseErrorTest.php
@@ -34,6 +34,4 @@ public function testLiveCoding()
         $this->assertArrayNotHasKey('parenthesis_opener', $tokens[$use], 'parenthesis_opener key is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokens[$use], 'parenthesis_closer key is set');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
index 4cddee5956..4668d9110f 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapClosureUseParenthesesTest.php
@@ -184,6 +184,4 @@ public static function dataClosureUse()
             'Closure use nested in class' => ['/* testClosureUseNestedInClass */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
index fff59cf8ce..838e33036f 100644
--- a/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php
@@ -333,6 +333,4 @@ public static function dataParenthesesOwnerWithoutParentheses()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
index bf1beb277f..d61b5d9462 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
@@ -261,6 +261,4 @@ public static function dataKeywordAsEnumCaseNameShouldBeString()
             '"exit" as case name'      => ['/* testKeywordAsEnumCaseNameShouldBeString8 */'],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
index 7d1de1cee7..a647ef9f2d 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
@@ -485,6 +485,4 @@ public function testIssue3326()
         $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set');
         $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set');
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
index 025fcfe2f1..605891e786 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapIfKeywordConditionsTest.php
@@ -70,6 +70,4 @@ public function testIfElseWithNestedCaseMissingBreakSharedClosers()
             )
         );
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
index 766ceecb42..3de81f8837 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
@@ -153,6 +153,4 @@ public static function dataSwitchScope()
 
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
index d082453fc2..c8eef9fe77 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
@@ -91,6 +91,4 @@ public static function dataScopeSetting()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
index a10efaffa9..cc9855b5cf 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenMiscTest.php
@@ -115,6 +115,4 @@ public function testLengthSettingFallsBackToBytesWhenTextContainsIllegalChars()
         $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.");
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
index 5e8bf33e96..ea105b20b0 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth1Test.php
@@ -105,6 +105,4 @@ public static function getTabReplacementExpected()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
index e18e77f0c8..4ebac3346d 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth2Test.php
@@ -105,6 +105,4 @@ public static function getTabReplacementExpected()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
index ff0d8c49e9..058770bbaf 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth4Test.php
@@ -105,6 +105,4 @@ public static function getTabReplacementExpected()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
index d8d7bd9c1f..8ed7a3c107 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTabWidth5Test.php
@@ -105,6 +105,4 @@ public static function getTabReplacementExpected()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
index 1b47becd78..0b6e117954 100644
--- a/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
+++ b/tests/Core/Tokenizers/Tokenizer/ReplaceTabsInTokenTestCase.php
@@ -259,6 +259,4 @@ public static function dataTabReplacement()
      * @return array<string, array<string, int|string|null>>
      */
     abstract public static function getTabReplacementExpected();
-
-
 }
diff --git a/tests/Core/Util/Common/EscapeshellcmdTest.php b/tests/Core/Util/Common/EscapeshellcmdTest.php
index ea74814528..33368bea55 100644
--- a/tests/Core/Util/Common/EscapeshellcmdTest.php
+++ b/tests/Core/Util/Common/EscapeshellcmdTest.php
@@ -84,6 +84,4 @@ public static function dataEscapeshellcmd()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Common/GetSniffCodeTest.php b/tests/Core/Util/Common/GetSniffCodeTest.php
index 773b10cc67..fe15b97d69 100644
--- a/tests/Core/Util/Common/GetSniffCodeTest.php
+++ b/tests/Core/Util/Common/GetSniffCodeTest.php
@@ -155,6 +155,4 @@ public static function dataGetSniffCode()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Common/IsCamelCapsTest.php b/tests/Core/Util/Common/IsCamelCapsTest.php
index 29b6a0d1f8..172b7890cf 100644
--- a/tests/Core/Util/Common/IsCamelCapsTest.php
+++ b/tests/Core/Util/Common/IsCamelCapsTest.php
@@ -489,6 +489,4 @@ public static function dataInvalidDefaultArguments()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Common/PrepareForOutputTest.php b/tests/Core/Util/Common/PrepareForOutputTest.php
index 78e0480a8d..e70e3b7fd6 100644
--- a/tests/Core/Util/Common/PrepareForOutputTest.php
+++ b/tests/Core/Util/Common/PrepareForOutputTest.php
@@ -105,6 +105,4 @@ public static function dataPrepareForOutput()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Common/StripColorsTest.php b/tests/Core/Util/Common/StripColorsTest.php
index a27547bc2c..38b83ffcb1 100644
--- a/tests/Core/Util/Common/StripColorsTest.php
+++ b/tests/Core/Util/Common/StripColorsTest.php
@@ -89,6 +89,4 @@ public static function dataStripColors()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Common/SuggestTypeTest.php b/tests/Core/Util/Common/SuggestTypeTest.php
index 1e995cfa8e..948decc964 100644
--- a/tests/Core/Util/Common/SuggestTypeTest.php
+++ b/tests/Core/Util/Common/SuggestTypeTest.php
@@ -212,6 +212,4 @@ public static function dataSuggestTypeOther()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/ExitCode/ExitCodeTest.php b/tests/Core/Util/ExitCode/ExitCodeTest.php
index 156f084981..bff490872f 100644
--- a/tests/Core/Util/ExitCode/ExitCodeTest.php
+++ b/tests/Core/Util/ExitCode/ExitCodeTest.php
@@ -655,6 +655,4 @@ private function setServerArgs($cmd, $extraArgs)
             $_SERVER['argv'][] = $arg;
         }
     }
-
-
 }
diff --git a/tests/Core/Util/Help/HelpTest.php b/tests/Core/Util/Help/HelpTest.php
index 20d8219b29..a328ab34f7 100644
--- a/tests/Core/Util/Help/HelpTest.php
+++ b/tests/Core/Util/Help/HelpTest.php
@@ -757,6 +757,4 @@ private function setReflectionProperty(Help $help, $properyName, $value)
         $reflProperty->setValue($help, $value);
         (PHP_VERSION_ID < 80100) && $reflProperty->setAccessible(false);
     }
-
-
 }
diff --git a/tests/Core/Util/IgnoreList/CheckAndSetTest.php b/tests/Core/Util/IgnoreList/CheckAndSetTest.php
index 4f9ff0caa5..82aae4bbef 100644
--- a/tests/Core/Util/IgnoreList/CheckAndSetTest.php
+++ b/tests/Core/Util/IgnoreList/CheckAndSetTest.php
@@ -138,6 +138,4 @@ public static function dataCheckAndSet()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
index 50fefec1a4..84a54a4bb0 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringAllTest.php
@@ -31,6 +31,4 @@ public function testGetInstanceIgnoringAllWorks()
         $this->assertInstanceOf(IgnoreList::class, $ignoreList);
         $this->assertTrue($ignoreList->isIgnored('Anything'));
     }
-
-
 }
diff --git a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
index 7359572126..61a931aba8 100644
--- a/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
+++ b/tests/Core/Util/IgnoreList/GetInstanceIgnoringNothingTest.php
@@ -31,6 +31,4 @@ public function testGetInstanceIgnoringNothingWorks()
         $this->assertInstanceOf(IgnoreList::class, $ignoreList);
         $this->assertFalse($ignoreList->isIgnored('Anything'));
     }
-
-
 }
diff --git a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
index d67107e81a..e1d0f6621c 100644
--- a/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
+++ b/tests/Core/Util/IgnoreList/GetNewInstanceFromTest.php
@@ -36,6 +36,4 @@ public function testGetNewInstanceFrom()
 
         $this->assertTrue($ignoreList2->isIgnored('Foo.Bar'), 'New instance ignores the same as the old one');
     }
-
-
 }
diff --git a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
index 010499b973..36782f4989 100644
--- a/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
+++ b/tests/Core/Util/IgnoreList/IgnoresNothingAndEverythingTest.php
@@ -96,6 +96,4 @@ public static function dataIgnoresNothingAndEverything()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/MessageCollector/MessageCollectorTest.php b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
index 385c08a28a..b98c228344 100644
--- a/tests/Core/Util/MessageCollector/MessageCollectorTest.php
+++ b/tests/Core/Util/MessageCollector/MessageCollectorTest.php
@@ -513,6 +513,4 @@ private function createErrorCache(MessageCollector $collector, $messages)
             $collector->add($msg, $type);
         }
     }
-
-
 }
diff --git a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
index 59351c01e7..66b78ef7e5 100644
--- a/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
+++ b/tests/Core/Util/Timing/GetHumanReadableDurationTest.php
@@ -107,6 +107,4 @@ public static function dataGetHumanReadableDuration()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Timing/TimingTest.php b/tests/Core/Util/Timing/TimingTest.php
index a9ebcd4baf..b58bf7c06d 100644
--- a/tests/Core/Util/Timing/TimingTest.php
+++ b/tests/Core/Util/Timing/TimingTest.php
@@ -139,6 +139,4 @@ public function testTimeIsPrintedMultipleTimesOnlyIfForced()
         $regex = '`^(Time: [0-9]+ms; Memory: [0-9\.]+MB' . PHP_EOL . '){3}$`';
         $this->assertStderrOutputMatchesRegex($regex);
     }
-
-
 }
diff --git a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
index e8e4c516b0..62a414a4a6 100644
--- a/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
+++ b/tests/Core/Util/Tokens/GetHighestWeightedTokenTest.php
@@ -155,6 +155,4 @@ public static function dataGetHighestWeightedToken()
 
         return $data;
     }
-
-
 }
diff --git a/tests/Core/Util/Tokens/TokenNameTest.php b/tests/Core/Util/Tokens/TokenNameTest.php
index 2a3be30421..fa3137fd6d 100644
--- a/tests/Core/Util/Tokens/TokenNameTest.php
+++ b/tests/Core/Util/Tokens/TokenNameTest.php
@@ -154,6 +154,4 @@ public static function dataPolyfilledPHPNativeTokens()
             ],
         ];
     }
-
-
 }
diff --git a/tests/Core/Util/Writers/StatusWriterTest.php b/tests/Core/Util/Writers/StatusWriterTest.php
index 20f6a5a442..929919e78a 100644
--- a/tests/Core/Util/Writers/StatusWriterTest.php
+++ b/tests/Core/Util/Writers/StatusWriterTest.php
@@ -373,6 +373,4 @@ public function testResumingMoreOftenThanPaused()
 
         $this->assertStderrOutputSameString($expected);
     }
-
-
 }
diff --git a/tests/Standards/AbstractSniffTestCase.php b/tests/Standards/AbstractSniffTestCase.php
index 96bfd57ed4..27ecdaa649 100644
--- a/tests/Standards/AbstractSniffTestCase.php
+++ b/tests/Standards/AbstractSniffTestCase.php
@@ -466,6 +466,4 @@ abstract protected function getErrorList();
      * @return array<int, int>
      */
     abstract protected function getWarningList();
-
-
 }