Restructure tests to match PSR-4 configuration

martin-helmich · Mar 3, 2024 · ff8f805 · ff8f805
1 parent 53fdc67
commit ff8f805
Show file tree

Hide file tree

Showing 62 changed files with 3 additions and 5 deletions.
diff --git a/...r/Fixtures/ConfigNoCache/input.typoscript → ...r/Fixtures/ConfigNoCache/input.typoscript b/...r/Fixtures/ConfigNoCache/input.typoscript → ...r/Fixtures/ConfigNoCache/input.typoscript
diff --git a/.../Linter/Fixtures/ConfigNoCache/output.txt → .../Linter/Fixtures/ConfigNoCache/output.txt b/.../Linter/Fixtures/ConfigNoCache/output.txt → .../Linter/Fixtures/ConfigNoCache/output.txt
diff --git a/...ures/ConstantAnnotations/input.typoscript → ...ures/ConstantAnnotations/input.typoscript b/...ures/ConstantAnnotations/input.typoscript → ...ures/ConstantAnnotations/input.typoscript
diff --git a/...r/Fixtures/ConstantAnnotations/output.txt → ...r/Fixtures/ConstantAnnotations/output.txt b/...r/Fixtures/ConstantAnnotations/output.txt → ...r/Fixtures/ConstantAnnotations/output.txt
diff --git a/...Linter/Fixtures/DeadCode/input.typoscript → ...Linter/Fixtures/DeadCode/input.typoscript b/...Linter/Fixtures/DeadCode/input.typoscript → ...Linter/Fixtures/DeadCode/input.typoscript
diff --git a/...Tests/Linter/Fixtures/DeadCode/output.txt → ...ional/Linter/Fixtures/DeadCode/output.txt b/...Tests/Linter/Fixtures/DeadCode/output.txt → ...ional/Linter/Fixtures/DeadCode/output.txt
diff --git a/...s/DeadCodeFalsePositives/input.typoscript → ...s/DeadCodeFalsePositives/input.typoscript b/...s/DeadCodeFalsePositives/input.typoscript → ...s/DeadCodeFalsePositives/input.typoscript
diff --git a/...ixtures/DeadCodeFalsePositives/output.txt → ...ixtures/DeadCodeFalsePositives/output.txt b/...ixtures/DeadCodeFalsePositives/output.txt → ...ixtures/DeadCodeFalsePositives/output.txt
diff --git a/...ures/DuplicateAssignment/input.typoscript → ...ures/DuplicateAssignment/input.typoscript b/...ures/DuplicateAssignment/input.typoscript → ...ures/DuplicateAssignment/input.typoscript
diff --git a/...r/Fixtures/DuplicateAssignment/output.txt → ...r/Fixtures/DuplicateAssignment/output.txt b/...r/Fixtures/DuplicateAssignment/output.txt → ...r/Fixtures/DuplicateAssignment/output.txt
diff --git a/...er/Fixtures/EmptySection/input.typoscript → ...er/Fixtures/EmptySection/input.typoscript b/...er/Fixtures/EmptySection/input.typoscript → ...er/Fixtures/EmptySection/input.typoscript
diff --git a/...s/Linter/Fixtures/EmptySection/output.txt → ...l/Linter/Fixtures/EmptySection/output.txt b/...s/Linter/Fixtures/EmptySection/output.txt → ...l/Linter/Fixtures/EmptySection/output.txt
diff --git a/...ter/Fixtures/Indentation/input.typoscript → ...ter/Fixtures/Indentation/input.typoscript b/...ter/Fixtures/Indentation/input.typoscript → ...ter/Fixtures/Indentation/input.typoscript
diff --git a/...ts/Linter/Fixtures/Indentation/output.txt → ...al/Linter/Fixtures/Indentation/output.txt b/...ts/Linter/Fixtures/Indentation/output.txt → ...al/Linter/Fixtures/Indentation/output.txt
diff --git a/...res/IndentationCondition/input.typoscript → ...res/IndentationCondition/input.typoscript b/...res/IndentationCondition/input.typoscript → ...res/IndentationCondition/input.typoscript
diff --git a/.../Fixtures/IndentationCondition/output.txt → .../Fixtures/IndentationCondition/output.txt b/.../Fixtures/IndentationCondition/output.txt → .../Fixtures/IndentationCondition/output.txt
diff --git a/...ntationIndentedCondition/input.typoscript → ...ntationIndentedCondition/input.typoscript b/...ntationIndentedCondition/input.typoscript → ...ntationIndentedCondition/input.typoscript
diff --git a/...s/IndentationIndentedCondition/output.txt → ...s/IndentationIndentedCondition/output.txt b/...s/IndentationIndentedCondition/output.txt → ...s/IndentationIndentedCondition/output.txt
diff --git a/...s/IndentationIndentedCondition/tslint.yml → ...s/IndentationIndentedCondition/tslint.yml b/...s/IndentationIndentedCondition/tslint.yml → ...s/IndentationIndentedCondition/tslint.yml
diff --git a/...tures/NestingConsistency/input.typoscript → ...tures/NestingConsistency/input.typoscript b/...tures/NestingConsistency/input.typoscript → ...tures/NestingConsistency/input.typoscript
diff --git a/...er/Fixtures/NestingConsistency/output.txt → ...er/Fixtures/NestingConsistency/output.txt b/...er/Fixtures/NestingConsistency/output.txt → ...er/Fixtures/NestingConsistency/output.txt
diff --git a/...estingConsistencyIntKeys/input.typoscript → ...estingConsistencyIntKeys/input.typoscript b/...estingConsistencyIntKeys/input.typoscript → ...estingConsistencyIntKeys/input.typoscript
diff --git a/...ures/NestingConsistencyIntKeys/output.txt → ...ures/NestingConsistencyIntKeys/output.txt b/...ures/NestingConsistencyIntKeys/output.txt → ...ures/NestingConsistencyIntKeys/output.txt
diff --git a/...onsistencyNonAssignments/input.typoscript → ...onsistencyNonAssignments/input.typoscript b/...onsistencyNonAssignments/input.typoscript → ...onsistencyNonAssignments/input.typoscript
diff --git a/...stingConsistencyNonAssignments/output.txt → ...stingConsistencyNonAssignments/output.txt b/...stingConsistencyNonAssignments/output.txt → ...stingConsistencyNonAssignments/output.txt
diff --git a/...ithConfigurableThreshold/input.typoscript → ...ithConfigurableThreshold/input.typoscript b/...ithConfigurableThreshold/input.typoscript → ...ithConfigurableThreshold/input.typoscript
diff --git a/...tencyWithConfigurableThreshold/output.txt → ...tencyWithConfigurableThreshold/output.txt b/...tencyWithConfigurableThreshold/output.txt → ...tencyWithConfigurableThreshold/output.txt
diff --git a/...tencyWithConfigurableThreshold/tslint.yml → ...tencyWithConfigurableThreshold/tslint.yml b/...tencyWithConfigurableThreshold/tslint.yml → ...tencyWithConfigurableThreshold/tslint.yml
diff --git a/...tures/OperatorWhitespace/input.typoscript → ...tures/OperatorWhitespace/input.typoscript b/...tures/OperatorWhitespace/input.typoscript → ...tures/OperatorWhitespace/input.typoscript
diff --git a/...er/Fixtures/OperatorWhitespace/output.txt → ...er/Fixtures/OperatorWhitespace/output.txt b/...er/Fixtures/OperatorWhitespace/output.txt → ...er/Fixtures/OperatorWhitespace/output.txt
diff --git a/...nter/Fixtures/ParseError/input.typoscript → ...nter/Fixtures/ParseError/input.typoscript b/...nter/Fixtures/ParseError/input.typoscript → ...nter/Fixtures/ParseError/input.typoscript
diff --git a/...sts/Linter/Fixtures/ParseError/output.txt → ...nal/Linter/Fixtures/ParseError/output.txt b/...sts/Linter/Fixtures/ParseError/output.txt → ...nal/Linter/Fixtures/ParseError/output.txt
diff --git a/...Fixtures/RepeatingRValue/input.typoscript → ...Fixtures/RepeatingRValue/input.typoscript b/...Fixtures/RepeatingRValue/input.typoscript → ...Fixtures/RepeatingRValue/input.typoscript
diff --git a/...inter/Fixtures/RepeatingRValue/output.txt → ...inter/Fixtures/RepeatingRValue/output.txt b/...inter/Fixtures/RepeatingRValue/output.txt → ...inter/Fixtures/RepeatingRValue/output.txt
diff --git a/...atingRValueDataProcessor/input.typoscript → ...atingRValueDataProcessor/input.typoscript b/...atingRValueDataProcessor/input.typoscript → ...atingRValueDataProcessor/input.typoscript
diff --git a/...s/RepeatingRValueDataProcessor/output.txt → ...s/RepeatingRValueDataProcessor/output.txt b/...s/RepeatingRValueDataProcessor/output.txt → ...s/RepeatingRValueDataProcessor/output.txt
diff --git a/...xtures/TokenizationError/input.typoscript → ...xtures/TokenizationError/input.typoscript b/...xtures/TokenizationError/input.typoscript → ...xtures/TokenizationError/input.typoscript
diff --git a/...ter/Fixtures/TokenizationError/output.txt → ...ter/Fixtures/TokenizationError/output.txt b/...ter/Fixtures/TokenizationError/output.txt → ...ter/Fixtures/TokenizationError/output.txt
diff --git a/.../UnaryOperatorWhitespace/input.typoscript → .../UnaryOperatorWhitespace/input.typoscript b/.../UnaryOperatorWhitespace/input.typoscript → .../UnaryOperatorWhitespace/input.typoscript
diff --git a/...xtures/UnaryOperatorWhitespace/output.txt → ...xtures/UnaryOperatorWhitespace/output.txt b/...xtures/UnaryOperatorWhitespace/output.txt → ...xtures/UnaryOperatorWhitespace/output.txt
diff --git a/...ter/Fixtures/Whitespaces/input.typoscript → ...ter/Fixtures/Whitespaces/input.typoscript b/...ter/Fixtures/Whitespaces/input.typoscript → ...ter/Fixtures/Whitespaces/input.typoscript
diff --git a/...ts/Linter/Fixtures/Whitespaces/output.txt → ...al/Linter/Fixtures/Whitespaces/output.txt b/...ts/Linter/Fixtures/Whitespaces/output.txt → ...al/Linter/Fixtures/Whitespaces/output.txt
diff --git a/.../Linter/Fixtures/typoscript-lint.dist.yml → .../Linter/Fixtures/typoscript-lint.dist.yml b/.../Linter/Fixtures/typoscript-lint.dist.yml → .../Linter/Fixtures/typoscript-lint.dist.yml
diff --git a/...ypoScriptLint/Tests/Linter/LinterTest.php → tests/functional/Linter/LinterTest.php b/...ypoScriptLint/Tests/Linter/LinterTest.php → tests/functional/Linter/LinterTest.php
diff --git a/...ypoScriptLint/Command/LintCommandTest.php → tests/unit/Command/LintCommandTest.php b/...ypoScriptLint/Command/LintCommandTest.php → tests/unit/Command/LintCommandTest.php
diff --git a/...onfiguration/ConfigurationLocatorTest.php → ...onfiguration/ConfigurationLocatorTest.php b/...onfiguration/ConfigurationLocatorTest.php → ...onfiguration/ConfigurationLocatorTest.php
diff --git a/...iguration/YamlConfigurationLoaderTest.php → ...iguration/YamlConfigurationLoaderTest.php b/...iguration/YamlConfigurationLoaderTest.php → ...iguration/YamlConfigurationLoaderTest.php
diff --git a/...ptLint/Linter/LinterConfigurationTest.php → ...s/unit/Linter/LinterConfigurationTest.php b/...ptLint/Linter/LinterConfigurationTest.php → ...s/unit/Linter/LinterConfigurationTest.php
diff --git a/...inter/Logging/LinterLoggerBuilderTest.php → ...inter/Logging/LinterLoggerBuilderTest.php b/...inter/Logging/LinterLoggerBuilderTest.php → ...inter/Logging/LinterLoggerBuilderTest.php
diff --git a/...TypoScriptLint/Linter/Report/FileTest.php → tests/unit/Linter/Report/FileTest.php b/...TypoScriptLint/Linter/Report/FileTest.php → tests/unit/Linter/Report/FileTest.php
diff --git a/...ypoScriptLint/Linter/Report/IssueTest.php → tests/unit/Linter/Report/IssueTest.php b/...ypoScriptLint/Linter/Report/IssueTest.php → tests/unit/Linter/Report/IssueTest.php
diff --git a/...poScriptLint/Linter/Report/ReportTest.php → tests/unit/Linter/Report/ReportTest.php b/...poScriptLint/Linter/Report/ReportTest.php → tests/unit/Linter/Report/ReportTest.php
diff --git a/...rtPrinter/CheckstyleReportPrinterTest.php → ...rtPrinter/CheckstyleReportPrinterTest.php b/...rtPrinter/CheckstyleReportPrinterTest.php → ...rtPrinter/CheckstyleReportPrinterTest.php
diff --git a/...eportPrinter/ConsoleReportPrinterTest.php → ...eportPrinter/ConsoleReportPrinterTest.php b/...eportPrinter/ConsoleReportPrinterTest.php → ...eportPrinter/ConsoleReportPrinterTest.php
diff --git a/...er/ReportPrinter/GccReportPrinterTest.php → ...er/ReportPrinter/GccReportPrinterTest.php b/...er/ReportPrinter/GccReportPrinterTest.php → ...er/ReportPrinter/GccReportPrinterTest.php
diff --git a/...ptLint/Linter/Sniff/DeadCodeSniffTest.php → ...s/unit/Linter/Sniff/DeadCodeSniffTest.php b/...ptLint/Linter/Sniff/DeadCodeSniffTest.php → ...s/unit/Linter/Sniff/DeadCodeSniffTest.php
diff --git a/...int/Linter/Sniff/IndentationSniffTest.php → ...nit/Linter/Sniff/IndentationSniffTest.php b/...int/Linter/Sniff/IndentationSniffTest.php → ...nit/Linter/Sniff/IndentationSniffTest.php
diff --git a/...ter/Sniff/OperatorWhitespaceSniffTest.php → ...ter/Sniff/OperatorWhitespaceSniffTest.php b/...ter/Sniff/OperatorWhitespaceSniffTest.php → ...ter/Sniff/OperatorWhitespaceSniffTest.php
@@ -8,6 +8,7 @@
 use Helmich\TypoScriptLint\Linter\Sniff\OperatorWhitespaceSniff;
 use Helmich\TypoScriptParser\Tokenizer\Token;
 use Helmich\TypoScriptParser\Tokenizer\TokenInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function PHPUnit\Framework\assertThat;
@@ -22,7 +23,7 @@ public function setUp(): void
         $this->sniff = new OperatorWhitespaceSniff([]);
     }
 
-    public function getValidTokenSequences(): \Generator
+    public static function getValidTokenSequences(): \Generator
     {
         yield [
             [
@@ -37,10 +38,7 @@ public function getValidTokenSequences(): \Generator
         ];
     }
 
-    /**
-     *
-     * @dataProvider getValidTokenSequences
-     */
+    #[DataProvider('getValidTokenSequences')]
     public function testTokenSequenceGeneratesExpectedWarnings(array $tokens, array $warnings): void
     {
         $file = new File("sample.ts");

diff --git a/...Linter/Sniff/RepeatingRValueSniffTest.php → ...Linter/Sniff/RepeatingRValueSniffTest.php b/...Linter/Sniff/RepeatingRValueSniffTest.php → ...Linter/Sniff/RepeatingRValueSniffTest.php
diff --git a/...isitor/DuplicateAssignmentVisitorTest.php → ...isitor/DuplicateAssignmentVisitorTest.php b/...isitor/DuplicateAssignmentVisitorTest.php → ...isitor/DuplicateAssignmentVisitorTest.php
diff --git a/...Visitor/NestingConsistencyVisitorTest.php → ...Visitor/NestingConsistencyVisitorTest.php b/...Visitor/NestingConsistencyVisitorTest.php → ...Visitor/NestingConsistencyVisitorTest.php
diff --git a/...elmich/TypoScriptLint/Util/FinderTest.php → tests/unit/Util/FinderTest.php b/...elmich/TypoScriptLint/Util/FinderTest.php → tests/unit/Util/FinderTest.php