Merge pull request #643 from PHPCSStandards/feature/tests-fix-typo-in…

…-dirname+test-renames Tests/Tokenizer(s): fix typo in directory name and rename some test files
PHPCSStandards · Oct 24, 2024 · 3a47cd6 · 3a47cd6
2 parents 760c450 + 1bf4e42
commit 3a47cd6
Show file tree

Hide file tree

Showing 97 changed files with 98 additions and 96 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -139,7 +139,7 @@
 
     <!-- This test file specifically *needs* Windows line endings for testing purposes. -->
     <rule ref="Generic.Files.LineEndings.InvalidEOLChar">
-        <exclude-pattern>tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest\.php</exclude-pattern>
+        <exclude-pattern>tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest\.php</exclude-pattern>
     </rule>
 
     <!-- Avoid false positive with this sniff detecting itself -->

diff --git a/...e/Tokenizer/AbstractTokenizerTestCase.php → .../Tokenizers/AbstractTokenizerTestCase.php b/...e/Tokenizer/AbstractTokenizerTestCase.php → .../Tokenizers/AbstractTokenizerTestCase.php
@@ -10,7 +10,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers;
 
 use PHP_CodeSniffer\Files\DummyFile;
 use PHP_CodeSniffer\Ruleset;

diff --git a/...ore/Tokenizer/Comment/CommentTestCase.php → ...re/Tokenizers/Comment/CommentTestCase.php b/...ore/Tokenizer/Comment/CommentTestCase.php → ...re/Tokenizers/Comment/CommentTestCase.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**

diff --git a/...ore/Tokenizer/Comment/LiveCoding1Test.inc → ...re/Tokenizers/Comment/LiveCoding1Test.inc b/...ore/Tokenizer/Comment/LiveCoding1Test.inc → ...re/Tokenizers/Comment/LiveCoding1Test.inc
diff --git a/...ore/Tokenizer/Comment/LiveCoding1Test.php → ...re/Tokenizers/Comment/LiveCoding1Test.php b/...ore/Tokenizer/Comment/LiveCoding1Test.php → ...re/Tokenizers/Comment/LiveCoding1Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.

diff --git a/...ore/Tokenizer/Comment/LiveCoding2Test.inc → ...re/Tokenizers/Comment/LiveCoding2Test.inc b/...ore/Tokenizer/Comment/LiveCoding2Test.inc → ...re/Tokenizers/Comment/LiveCoding2Test.inc
diff --git a/...ore/Tokenizer/Comment/LiveCoding2Test.php → ...re/Tokenizers/Comment/LiveCoding2Test.php b/...ore/Tokenizer/Comment/LiveCoding2Test.php → ...re/Tokenizers/Comment/LiveCoding2Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.

diff --git a/...ore/Tokenizer/Comment/LiveCoding3Test.inc → ...re/Tokenizers/Comment/LiveCoding3Test.inc b/...ore/Tokenizer/Comment/LiveCoding3Test.inc → ...re/Tokenizers/Comment/LiveCoding3Test.inc
diff --git a/...ore/Tokenizer/Comment/LiveCoding3Test.php → ...re/Tokenizers/Comment/LiveCoding3Test.php b/...ore/Tokenizer/Comment/LiveCoding3Test.php → ...re/Tokenizers/Comment/LiveCoding3Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.

diff --git a/...ore/Tokenizer/Comment/LiveCoding4Test.inc → ...re/Tokenizers/Comment/LiveCoding4Test.inc b/...ore/Tokenizer/Comment/LiveCoding4Test.inc → ...re/Tokenizers/Comment/LiveCoding4Test.inc
diff --git a/...ore/Tokenizer/Comment/LiveCoding4Test.php → ...re/Tokenizers/Comment/LiveCoding4Test.php b/...ore/Tokenizer/Comment/LiveCoding4Test.php → ...re/Tokenizers/Comment/LiveCoding4Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.

diff --git a/...kenizer/Comment/MultiLineDocBlockTest.inc → ...enizers/Comment/MultiLineDocBlockTest.inc b/...kenizer/Comment/MultiLineDocBlockTest.inc → ...enizers/Comment/MultiLineDocBlockTest.inc
diff --git a/...kenizer/Comment/MultiLineDocBlockTest.php → ...enizers/Comment/MultiLineDocBlockTest.php b/...kenizer/Comment/MultiLineDocBlockTest.php → ...enizers/Comment/MultiLineDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that multiline docblocks are tokenized correctly.

diff --git a/...omment/PhpcsAnnotationsInDocBlockTest.inc → ...omment/PhpcsAnnotationsInDocBlockTest.inc b/...omment/PhpcsAnnotationsInDocBlockTest.inc → ...omment/PhpcsAnnotationsInDocBlockTest.inc
diff --git a/...omment/PhpcsAnnotationsInDocBlockTest.php → ...omment/PhpcsAnnotationsInDocBlockTest.php b/...omment/PhpcsAnnotationsInDocBlockTest.php → ...omment/PhpcsAnnotationsInDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that PHPCS native annotations in docblocks are tokenized correctly.

diff --git a/...enizer/Comment/SingleLineDocBlockTest.inc → ...nizers/Comment/SingleLineDocBlockTest.inc b/...enizer/Comment/SingleLineDocBlockTest.inc → ...nizers/Comment/SingleLineDocBlockTest.inc
diff --git a/...enizer/Comment/SingleLineDocBlockTest.php → ...nizers/Comment/SingleLineDocBlockTest.php b/...enizer/Comment/SingleLineDocBlockTest.php → ...nizers/Comment/SingleLineDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that single line docblocks are tokenized correctly.

diff --git a/...zer/PHP/AnonClassParenthesisOwnerTest.inc → ...ers/PHP/AnonClassParenthesisOwnerTest.inc b/...zer/PHP/AnonClassParenthesisOwnerTest.inc → ...ers/PHP/AnonClassParenthesisOwnerTest.inc
diff --git a/...zer/PHP/AnonClassParenthesisOwnerTest.php → ...ers/PHP/AnonClassParenthesisOwnerTest.php b/...zer/PHP/AnonClassParenthesisOwnerTest.php → ...ers/PHP/AnonClassParenthesisOwnerTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class AnonClassParenthesisOwnerTest extends AbstractTokenizerTestCase
 {

diff --git a/...s/Core/Tokenizer/PHP/ArrayKeywordTest.inc → .../Core/Tokenizers/PHP/ArrayKeywordTest.inc b/...s/Core/Tokenizer/PHP/ArrayKeywordTest.inc → .../Core/Tokenizers/PHP/ArrayKeywordTest.inc
diff --git a/...s/Core/Tokenizer/PHP/ArrayKeywordTest.php → .../Core/Tokenizers/PHP/ArrayKeywordTest.php b/...s/Core/Tokenizer/PHP/ArrayKeywordTest.php → .../Core/Tokenizers/PHP/ArrayKeywordTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class ArrayKeywordTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/AttributesTest.inc → tests/Core/Tokenizers/PHP/AttributesTest.inc b/tests/Core/Tokenizer/PHP/AttributesTest.inc → tests/Core/Tokenizers/PHP/AttributesTest.inc
diff --git a/tests/Core/Tokenizer/PHP/AttributesTest.php → tests/Core/Tokenizers/PHP/AttributesTest.php b/tests/Core/Tokenizer/PHP/AttributesTest.php → tests/Core/Tokenizers/PHP/AttributesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class AttributesTest extends AbstractTokenizerTestCase
 {

diff --git a/...s/Core/Tokenizer/PHP/BackfillEnumTest.inc → .../Core/Tokenizers/PHP/BackfillEnumTest.inc b/...s/Core/Tokenizer/PHP/BackfillEnumTest.inc → .../Core/Tokenizers/PHP/BackfillEnumTest.inc
diff --git a/...s/Core/Tokenizer/PHP/BackfillEnumTest.php → .../Core/Tokenizers/PHP/BackfillEnumTest.php b/...s/Core/Tokenizer/PHP/BackfillEnumTest.php → .../Core/Tokenizers/PHP/BackfillEnumTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillEnumTest extends AbstractTokenizerTestCase
 {

diff --git a/...PHP/BackfillExplicitOctalNotationTest.inc → ...PHP/BackfillExplicitOctalNotationTest.inc b/...PHP/BackfillExplicitOctalNotationTest.inc → ...PHP/BackfillExplicitOctalNotationTest.inc
diff --git a/...PHP/BackfillExplicitOctalNotationTest.php → ...PHP/BackfillExplicitOctalNotationTest.php b/...PHP/BackfillExplicitOctalNotationTest.php → ...PHP/BackfillExplicitOctalNotationTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillExplicitOctalNotationTest extends AbstractTokenizerTestCase
 {

diff --git a/...ore/Tokenizer/PHP/BackfillFnTokenTest.inc → ...re/Tokenizers/PHP/BackfillFnTokenTest.inc b/...ore/Tokenizer/PHP/BackfillFnTokenTest.inc → ...re/Tokenizers/PHP/BackfillFnTokenTest.inc
diff --git a/...ore/Tokenizer/PHP/BackfillFnTokenTest.php → ...re/Tokenizers/PHP/BackfillFnTokenTest.php b/...ore/Tokenizer/PHP/BackfillFnTokenTest.php → ...re/Tokenizers/PHP/BackfillFnTokenTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillFnTokenTest extends AbstractTokenizerTestCase
 {

diff --git a/.../Tokenizer/PHP/BackfillMatchTokenTest.inc → ...Tokenizers/PHP/BackfillMatchTokenTest.inc b/.../Tokenizer/PHP/BackfillMatchTokenTest.inc → ...Tokenizers/PHP/BackfillMatchTokenTest.inc
diff --git a/.../Tokenizer/PHP/BackfillMatchTokenTest.php → ...Tokenizers/PHP/BackfillMatchTokenTest.php b/.../Tokenizer/PHP/BackfillMatchTokenTest.php → ...Tokenizers/PHP/BackfillMatchTokenTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class BackfillMatchTokenTest extends AbstractTokenizerTestCase

diff --git a/...izer/PHP/BackfillNumericSeparatorTest.inc → ...zers/PHP/BackfillNumericSeparatorTest.inc b/...izer/PHP/BackfillNumericSeparatorTest.inc → ...zers/PHP/BackfillNumericSeparatorTest.inc
diff --git a/...izer/PHP/BackfillNumericSeparatorTest.php → ...zers/PHP/BackfillNumericSeparatorTest.php b/...izer/PHP/BackfillNumericSeparatorTest.php → ...zers/PHP/BackfillNumericSeparatorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class BackfillNumericSeparatorTest extends AbstractTokenizerTestCase

diff --git a/...re/Tokenizer/PHP/BackfillReadonlyTest.inc → ...e/Tokenizers/PHP/BackfillReadonlyTest.inc b/...re/Tokenizer/PHP/BackfillReadonlyTest.inc → ...e/Tokenizers/PHP/BackfillReadonlyTest.inc
diff --git a/...re/Tokenizer/PHP/BackfillReadonlyTest.php → ...e/Tokenizers/PHP/BackfillReadonlyTest.php b/...re/Tokenizer/PHP/BackfillReadonlyTest.php → ...e/Tokenizers/PHP/BackfillReadonlyTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillReadonlyTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/BitwiseOrTest.inc → tests/Core/Tokenizers/PHP/BitwiseOrTest.inc b/tests/Core/Tokenizer/PHP/BitwiseOrTest.inc → tests/Core/Tokenizers/PHP/BitwiseOrTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BitwiseOrTest.php → tests/Core/Tokenizers/PHP/BitwiseOrTest.php b/tests/Core/Tokenizer/PHP/BitwiseOrTest.php → tests/Core/Tokenizers/PHP/BitwiseOrTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BitwiseOrTest extends AbstractTokenizerTestCase
 {

diff --git a/...izer/PHP/ContextSensitiveKeywordsTest.inc → ...zers/PHP/ContextSensitiveKeywordsTest.inc b/...izer/PHP/ContextSensitiveKeywordsTest.inc → ...zers/PHP/ContextSensitiveKeywordsTest.inc
diff --git a/...izer/PHP/ContextSensitiveKeywordsTest.php → ...zers/PHP/ContextSensitiveKeywordsTest.php b/...izer/PHP/ContextSensitiveKeywordsTest.php → ...zers/PHP/ContextSensitiveKeywordsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class ContextSensitiveKeywordsTest extends AbstractTokenizerTestCase

diff --git a/...Tokenizer/PHP/DNFTypesParseError1Test.inc → ...okenizers/PHP/DNFTypesParseError1Test.inc b/...Tokenizer/PHP/DNFTypesParseError1Test.inc → ...okenizers/PHP/DNFTypesParseError1Test.inc
diff --git a/...Tokenizer/PHP/DNFTypesParseError1Test.php → ...okenizers/PHP/DNFTypesParseError1Test.php b/...Tokenizer/PHP/DNFTypesParseError1Test.php → ...okenizers/PHP/DNFTypesParseError1Test.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DNFTypesParseError1Test extends AbstractTokenizerTestCase
 {

diff --git a/...Tokenizer/PHP/DNFTypesParseError2Test.inc → ...okenizers/PHP/DNFTypesParseError2Test.inc b/...Tokenizer/PHP/DNFTypesParseError2Test.inc → ...okenizers/PHP/DNFTypesParseError2Test.inc
diff --git a/...Tokenizer/PHP/DNFTypesParseError2Test.php → ...okenizers/PHP/DNFTypesParseError2Test.php b/...Tokenizer/PHP/DNFTypesParseError2Test.php → ...okenizers/PHP/DNFTypesParseError2Test.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class DNFTypesParseError2Test extends AbstractTokenizerTestCase

diff --git a/tests/Core/Tokenizer/PHP/DNFTypesTest.inc → tests/Core/Tokenizers/PHP/DNFTypesTest.inc b/tests/Core/Tokenizer/PHP/DNFTypesTest.inc → tests/Core/Tokenizers/PHP/DNFTypesTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesTest.php → tests/Core/Tokenizers/PHP/DNFTypesTest.php b/tests/Core/Tokenizer/PHP/DNFTypesTest.php → tests/Core/Tokenizers/PHP/DNFTypesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class DNFTypesTest extends AbstractTokenizerTestCase

diff --git a/...Core/Tokenizer/PHP/DefaultKeywordTest.inc → ...ore/Tokenizers/PHP/DefaultKeywordTest.inc b/...Core/Tokenizer/PHP/DefaultKeywordTest.inc → ...ore/Tokenizers/PHP/DefaultKeywordTest.inc
diff --git a/...Core/Tokenizer/PHP/DefaultKeywordTest.php → ...ore/Tokenizers/PHP/DefaultKeywordTest.php b/...Core/Tokenizer/PHP/DefaultKeywordTest.php → ...ore/Tokenizers/PHP/DefaultKeywordTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DefaultKeywordTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/DoubleArrowTest.inc → ...s/Core/Tokenizers/PHP/DoubleArrowTest.inc b/tests/Core/Tokenizer/PHP/DoubleArrowTest.inc → ...s/Core/Tokenizers/PHP/DoubleArrowTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DoubleArrowTest.php → ...s/Core/Tokenizers/PHP/DoubleArrowTest.php b/tests/Core/Tokenizer/PHP/DoubleArrowTest.php → ...s/Core/Tokenizers/PHP/DoubleArrowTest.php
@@ -9,9 +9,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DoubleArrowTest extends AbstractTokenizerTestCase
 {

diff --git a/.../Tokenizer/PHP/DoubleQuotedStringTest.inc → ...Tokenizers/PHP/DoubleQuotedStringTest.inc b/.../Tokenizer/PHP/DoubleQuotedStringTest.inc → ...Tokenizers/PHP/DoubleQuotedStringTest.inc
diff --git a/.../Tokenizer/PHP/DoubleQuotedStringTest.php → ...Tokenizers/PHP/DoubleQuotedStringTest.php b/.../Tokenizer/PHP/DoubleQuotedStringTest.php → ...Tokenizers/PHP/DoubleQuotedStringTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DoubleQuotedStringTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/EnumCaseTest.inc → tests/Core/Tokenizers/PHP/EnumCaseTest.inc b/tests/Core/Tokenizer/PHP/EnumCaseTest.inc → tests/Core/Tokenizers/PHP/EnumCaseTest.inc
diff --git a/tests/Core/Tokenizer/PHP/EnumCaseTest.php → tests/Core/Tokenizers/PHP/EnumCaseTest.php b/tests/Core/Tokenizer/PHP/EnumCaseTest.php → tests/Core/Tokenizers/PHP/EnumCaseTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class EnumCaseTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/FinallyTest.inc → tests/Core/Tokenizers/PHP/FinallyTest.inc b/tests/Core/Tokenizer/PHP/FinallyTest.inc → tests/Core/Tokenizers/PHP/FinallyTest.inc
diff --git a/tests/Core/Tokenizer/PHP/FinallyTest.php → tests/Core/Tokenizers/PHP/FinallyTest.php b/tests/Core/Tokenizer/PHP/FinallyTest.php → tests/Core/Tokenizers/PHP/FinallyTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class FinallyTest extends AbstractTokenizerTestCase
 {

diff --git a/tests/Core/Tokenizer/PHP/GotoLabelTest.inc → tests/Core/Tokenizers/PHP/GotoLabelTest.inc b/tests/Core/Tokenizer/PHP/GotoLabelTest.inc → tests/Core/Tokenizers/PHP/GotoLabelTest.inc
diff --git a/tests/Core/Tokenizer/PHP/GotoLabelTest.php → tests/Core/Tokenizers/PHP/GotoLabelTest.php b/tests/Core/Tokenizer/PHP/GotoLabelTest.php → tests/Core/Tokenizers/PHP/GotoLabelTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class GotoLabelTest extends AbstractTokenizerTestCase
 {

diff --git a/.../Core/Tokenizer/PHP/HeredocNowdocTest.inc → ...Core/Tokenizers/PHP/HeredocNowdocTest.inc b/.../Core/Tokenizer/PHP/HeredocNowdocTest.inc → ...Core/Tokenizers/PHP/HeredocNowdocTest.inc
diff --git a/.../Core/Tokenizer/PHP/HeredocNowdocTest.php → ...Core/Tokenizers/PHP/HeredocNowdocTest.php b/.../Core/Tokenizer/PHP/HeredocNowdocTest.php → ...Core/Tokenizers/PHP/HeredocNowdocTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**

diff --git a/...e/Tokenizer/PHP/HeredocParseErrorTest.inc → .../Tokenizers/PHP/HeredocParseErrorTest.inc b/...e/Tokenizer/PHP/HeredocParseErrorTest.inc → .../Tokenizers/PHP/HeredocParseErrorTest.inc
diff --git a/...e/Tokenizer/PHP/HeredocParseErrorTest.php → .../Tokenizers/PHP/HeredocParseErrorTest.php b/...e/Tokenizer/PHP/HeredocParseErrorTest.php → .../Tokenizers/PHP/HeredocParseErrorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 /**
  * Tests the tokenization for an unclosed heredoc construct.

diff --git a/.../Core/Tokenizer/PHP/HeredocStringTest.inc → ...Core/Tokenizers/PHP/HeredocStringTest.inc b/.../Core/Tokenizer/PHP/HeredocStringTest.inc → ...Core/Tokenizers/PHP/HeredocStringTest.inc
diff --git a/.../Core/Tokenizer/PHP/HeredocStringTest.php → ...Core/Tokenizers/PHP/HeredocStringTest.php b/.../Core/Tokenizer/PHP/HeredocStringTest.php → ...Core/Tokenizers/PHP/HeredocStringTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class HeredocStringTest extends AbstractTokenizerTestCase
 {

diff --git a/...er/PHP/NamedFunctionCallArgumentsTest.inc → ...rs/PHP/NamedFunctionCallArgumentsTest.inc b/...er/PHP/NamedFunctionCallArgumentsTest.inc → ...rs/PHP/NamedFunctionCallArgumentsTest.inc
diff --git a/...er/PHP/NamedFunctionCallArgumentsTest.php → ...rs/PHP/NamedFunctionCallArgumentsTest.php b/...er/PHP/NamedFunctionCallArgumentsTest.php → ...rs/PHP/NamedFunctionCallArgumentsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class NamedFunctionCallArgumentsTest extends AbstractTokenizerTestCase

diff --git a/...enizer/PHP/NullsafeObjectOperatorTest.inc → ...nizers/PHP/NullsafeObjectOperatorTest.inc b/...enizer/PHP/NullsafeObjectOperatorTest.inc → ...nizers/PHP/NullsafeObjectOperatorTest.inc
diff --git a/...enizer/PHP/NullsafeObjectOperatorTest.php → ...nizers/PHP/NullsafeObjectOperatorTest.php b/...enizer/PHP/NullsafeObjectOperatorTest.php → ...nizers/PHP/NullsafeObjectOperatorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class NullsafeObjectOperatorTest extends AbstractTokenizerTestCase

diff --git a/...PHP/OtherContextSensitiveKeywordsTest.inc → ...PHP/OtherContextSensitiveKeywordsTest.inc b/...PHP/OtherContextSensitiveKeywordsTest.inc → ...PHP/OtherContextSensitiveKeywordsTest.inc