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

Author: jrfnl

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 -->

tests/Core/Tokenizer/AbstractTokenizerTestCase.php renamed to tests/Core/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;

tests/Core/Tokenizer/Comment/CommentTestCase.php renamed to tests/Core/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;
 
 /**

tests/Core/Tokenizer/Comment/LiveCoding1Test.inc renamed to tests/Core/Tokenizers/Comment/LiveCoding1Test.inc

@@ -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.

tests/Core/Tokenizer/Comment/LiveCoding1Test.php renamed to tests/Core/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.

tests/Core/Tokenizer/Comment/LiveCoding2Test.inc renamed to tests/Core/Tokenizers/Comment/LiveCoding2Test.inc

@@ -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.