VincentLanglet · VincentLanglet · Oct 10, 2024 · Oct 10, 2024
diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php
@@ -9,6 +9,11 @@
 
 return $config
     ->addPathToScan(__DIR__.'/bin/twig-cs-fixer', isDev: false)
+    ->ignoreErrorsOnPackageAndPath(
+        'phpunit/phpunit',
+        __DIR__.'/src/Test/AbstractRuleTestCase.php',
+        [ErrorType::DEV_DEPENDENCY_IN_PROD]
+    )
     ->ignoreErrorsOnPackageAndPath(
         'symfony/twig-bridge',
         __DIR__.'/src/Environment/StubbedEnvironment.php',

diff --git a/tests/Rules/AbstractRuleTestCase.php → src/Test/AbstractRuleTestCase.php b/tests/Rules/AbstractRuleTestCase.php → src/Test/AbstractRuleTestCase.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TwigCsFixer\Tests\Rules;
+namespace TwigCsFixer\Test;
 
 use PHPUnit\Framework\TestCase;
 use TwigCsFixer\Environment\StubbedEnvironment;
@@ -12,14 +12,16 @@
 use TwigCsFixer\Ruleset\Ruleset;
 use TwigCsFixer\Runner\Fixer;
 use TwigCsFixer\Runner\Linter;
-use TwigCsFixer\Tests\TestHelper;
 use TwigCsFixer\Token\Tokenizer;
 
 abstract class AbstractRuleTestCase extends TestCase
 {
     /**
      * @param RuleInterface|NodeRuleInterface|array<RuleInterface|NodeRuleInterface> $rules
      * @param array<string|null>                                                     $expects
+     *
+     * @throws \TwigCsFixer\Exception\CannotFixFileException
+     * @throws \TwigCsFixer\Exception\CannotTokenizeException
      */
     protected function checkRule(
         RuleInterface|NodeRuleInterface|array $rules,

diff --git a/tests/TestHelper.php → src/Test/TestHelper.php b/tests/TestHelper.php → src/Test/TestHelper.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TwigCsFixer\Tests;
+namespace TwigCsFixer\Test;
 
 final class TestHelper
 {

diff --git a/tests/Binary/TwigCsFixerTest.php b/tests/Binary/TwigCsFixerTest.php
@@ -7,8 +7,8 @@
 use Composer\InstalledVersions;
 use Symfony\Component\Process\Process;
 use TwigCsFixer\Console\Application;
+use TwigCsFixer\Test\TestHelper;
 use TwigCsFixer\Tests\FileTestCase;
-use TwigCsFixer\Tests\TestHelper;
 
 /**
  * @group skip-windows

diff --git a/tests/Config/Fixtures/directoryWithCustomCacheFile/.twig-cs-fixer.php b/tests/Config/Fixtures/directoryWithCustomCacheFile/.twig-cs-fixer.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use TwigCsFixer\Config\Config;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 $config = new Config('Custom');
 $config->setCacheFile(TestHelper::getOsPath(__DIR__.'/.twig-cs-fixer.cache'));

diff --git a/tests/Console/Command/TwigCsFixerCommandTest.php b/tests/Console/Command/TwigCsFixerCommandTest.php
@@ -13,8 +13,8 @@
 use TwigCsFixer\Cache\Signature;
 use TwigCsFixer\Config\Config;
 use TwigCsFixer\Console\Command\TwigCsFixerCommand;
+use TwigCsFixer\Test\TestHelper;
 use TwigCsFixer\Tests\FileTestCase;
-use TwigCsFixer\Tests\TestHelper;
 
 final class TwigCsFixerCommandTest extends FileTestCase
 {

diff --git a/tests/FileTestCase.php b/tests/FileTestCase.php
@@ -7,6 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
+use TwigCsFixer\Test\TestHelper;
 use Webmozart\Assert\Assert;
 
 abstract class FileTestCase extends TestCase

diff --git a/tests/Report/Reporter/CheckstyleReporterTest.php b/tests/Report/Reporter/CheckstyleReporterTest.php
@@ -11,7 +11,7 @@
 use TwigCsFixer\Report\Reporter\CheckstyleReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 final class CheckstyleReporterTest extends TestCase
 {

diff --git a/tests/Report/Reporter/GithubReporterTest.php b/tests/Report/Reporter/GithubReporterTest.php
@@ -11,7 +11,7 @@
 use TwigCsFixer\Report\Reporter\GithubReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 final class GithubReporterTest extends TestCase
 {

diff --git a/tests/Report/Reporter/JUnitReporterTest.php b/tests/Report/Reporter/JUnitReporterTest.php
@@ -11,7 +11,7 @@
 use TwigCsFixer\Report\Reporter\JUnitReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 final class JUnitReporterTest extends TestCase
 {

diff --git a/tests/Report/Reporter/NullReporterTest.php b/tests/Report/Reporter/NullReporterTest.php
@@ -10,7 +10,7 @@
 use TwigCsFixer\Report\Report;
 use TwigCsFixer\Report\Reporter\NullReporter;
 use TwigCsFixer\Report\Violation;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 final class NullReporterTest extends TestCase
 {

diff --git a/tests/Report/Reporter/TextReporterTest.php b/tests/Report/Reporter/TextReporterTest.php
@@ -11,7 +11,7 @@
 use TwigCsFixer\Report\Reporter\TextReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 
 final class TextReporterTest extends TestCase
 {

diff --git a/tests/Rules/Delimiter/BlockNameSpacing/BlockNameSpacingRuleTest.php b/tests/Rules/Delimiter/BlockNameSpacing/BlockNameSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Delimiter\BlockNameSpacing;
 
 use TwigCsFixer\Rules\Delimiter\BlockNameSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class BlockNameSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Delimiter/DelimiterSpacing/DelimiterSpacingRuleTest.php b/tests/Rules/Delimiter/DelimiterSpacing/DelimiterSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Delimiter\DelimiterSpacing;
 
 use TwigCsFixer\Rules\Delimiter\DelimiterSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class DelimiterSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/File/DirectoryName/DirectoryNameRuleTest.php b/tests/Rules/File/DirectoryName/DirectoryNameRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\File\DirectoryName;
 
 use TwigCsFixer\Rules\File\DirectoryNameRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class DirectoryNameRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/File/FileExtension/FileExtensionRuleTest.php b/tests/Rules/File/FileExtension/FileExtensionRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\File\FileExtension;
 
 use TwigCsFixer\Rules\File\FileExtensionRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class FileExtensionRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/File/FileName/FileNameRuleTest.php b/tests/Rules/File/FileName/FileNameRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\File\FileName;
 
 use TwigCsFixer\Rules\File\FileNameRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class FileNameRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Function/IncludeFunction/IncludeFunctionRuleTest.php b/tests/Rules/Function/IncludeFunction/IncludeFunctionRuleTest.php
@@ -6,7 +6,7 @@
 
 use TwigCsFixer\Rules\Function\IncludeFunctionRule;
 use TwigCsFixer\Rules\Punctuation\PunctuationSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class IncludeFunctionRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Function/NamedArgumentSeparatorRuleTest.php b/tests/Rules/Function/NamedArgumentSeparatorRuleTest.php
@@ -7,7 +7,7 @@
 use Composer\InstalledVersions;
 use Composer\Semver\VersionParser;
 use TwigCsFixer\Rules\Function\NamedArgumentSeparatorRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class NamedArgumentSeparatorRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Function/NamedArgumentSpacing/NamedArgumentSpacingRuleTest.php b/tests/Rules/Function/NamedArgumentSpacing/NamedArgumentSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Function\NamedArgumentSpacing;
 
 use TwigCsFixer\Rules\Function\NamedArgumentSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class NamedArgumentSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Node/ForbiddenBlock/ForbiddenBlockRuleTest.php b/tests/Rules/Node/ForbiddenBlock/ForbiddenBlockRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Node\ForbiddenBlock;
 
 use TwigCsFixer\Rules\Node\ForbiddenBlockRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class ForbiddenBlockRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Node/ForbiddenFilter/ForbiddenFilterRuleTest.php b/tests/Rules/Node/ForbiddenFilter/ForbiddenFilterRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Node\ForbiddenFilter;
 
 use TwigCsFixer\Rules\Node\ForbiddenFilterRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class ForbiddenFilterRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Node/ForbiddenFunction/ForbiddenFunctionRuleTest.php b/tests/Rules/Node/ForbiddenFunction/ForbiddenFunctionRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Node\ForbiddenFunction;
 
 use TwigCsFixer\Rules\Node\ForbiddenFunctionRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class ForbiddenFunctionRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Node/ValidConstantFunction/ValidConstantFunctionRuleTest.php b/tests/Rules/Node/ValidConstantFunction/ValidConstantFunctionRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Node\ValidConstantFunction;
 
 use TwigCsFixer\Rules\Node\ValidConstantFunctionRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class ValidConstantFunctionRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Operator/OperatorNameSpacing/OperatorNameSpacingRuleTest.php b/tests/Rules/Operator/OperatorNameSpacing/OperatorNameSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Operator\OperatorNameSpacing;
 
 use TwigCsFixer\Rules\Operator\OperatorNameSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class OperatorNameSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Operator/OperatorSpacing/OperatorSpacingRuleTest.php b/tests/Rules/Operator/OperatorSpacing/OperatorSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Operator\OperatorSpacing;
 
 use TwigCsFixer\Rules\Operator\OperatorSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class OperatorSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Punctuation/PunctuationSpacing/PunctuationSpacingRuleTest.php b/tests/Rules/Punctuation/PunctuationSpacing/PunctuationSpacingRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Punctuation\PunctuationSpacing;
 
 use TwigCsFixer\Rules\Punctuation\PunctuationSpacingRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class PunctuationSpacingRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Punctuation/TrailingCommaMultiLine/TrailingCommaMultiLineRuleTest.php b/tests/Rules/Punctuation/TrailingCommaMultiLine/TrailingCommaMultiLineRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Punctuation\TrailingCommaMultiLine;
 
 use TwigCsFixer\Rules\Punctuation\TrailingCommaMultiLineRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class TrailingCommaMultiLineRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Punctuation/TrailingCommaSingleLine/TrailingCommaSingleLineRuleTest.php b/tests/Rules/Punctuation/TrailingCommaSingleLine/TrailingCommaSingleLineRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Punctuation\TrailingCommaSingleLine;
 
 use TwigCsFixer\Rules\Punctuation\TrailingCommaSingleLineRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class TrailingCommaSingleLineRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/String/HashQuote/HashQuoteRuleTest.php b/tests/Rules/String/HashQuote/HashQuoteRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\String\HashQuote;
 
 use TwigCsFixer\Rules\String\HashQuoteRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class HashQuoteRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/String/SimpleQuote/SingleQuoteRuleTest.php b/tests/Rules/String/SimpleQuote/SingleQuoteRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\String\SimpleQuote;
 
 use TwigCsFixer\Rules\String\SingleQuoteRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class SingleQuoteRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Variable/VariableName/VariableNameRuleTest.php b/tests/Rules/Variable/VariableName/VariableNameRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Variable\VariableName;
 
 use TwigCsFixer\Rules\Variable\VariableNameRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class VariableNameRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Whitespace/BlankEOF/BlankEOFRuleTest.php b/tests/Rules/Whitespace/BlankEOF/BlankEOFRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Whitespace\BlankEOF;
 
 use TwigCsFixer\Rules\Whitespace\BlankEOFRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class BlankEOFRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Whitespace/EmptyLines/EmptyLinesRuleTest.php b/tests/Rules/Whitespace/EmptyLines/EmptyLinesRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Whitespace\EmptyLines;
 
 use TwigCsFixer\Rules\Whitespace\EmptyLinesRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class EmptyLinesRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Whitespace/Indent/IndentRuleTest.php b/tests/Rules/Whitespace/Indent/IndentRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Whitespace\Indent;
 
 use TwigCsFixer\Rules\Whitespace\IndentRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class IndentRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Rules/Whitespace/TrailingSpace/TrailingSpaceRuleTest.php b/tests/Rules/Whitespace/TrailingSpace/TrailingSpaceRuleTest.php
@@ -5,7 +5,7 @@
 namespace TwigCsFixer\Tests\Rules\Whitespace\TrailingSpace;
 
 use TwigCsFixer\Rules\Whitespace\TrailingSpaceRule;
-use TwigCsFixer\Tests\Rules\AbstractRuleTestCase;
+use TwigCsFixer\Test\AbstractRuleTestCase;
 
 final class TrailingSpaceRuleTest extends AbstractRuleTestCase
 {

diff --git a/tests/Token/Tokenizer/TokenizerTest.php b/tests/Token/Tokenizer/TokenizerTest.php
@@ -9,7 +9,7 @@
 use TwigCsFixer\Environment\StubbedEnvironment;
 use TwigCsFixer\Exception\CannotTokenizeException;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\TestHelper;
+use TwigCsFixer\Test\TestHelper;
 use TwigCsFixer\Tests\Token\Tokenizer\Fixtures\CustomTwigExtension;
 use TwigCsFixer\Token\Token;
 use TwigCsFixer\Token\Tokenizer;