From d88b8cd90207f3bbc025646c3300b1db1f69b9f8 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Wed, 28 Feb 2024 10:07:25 +0100
Subject: [PATCH] [TASK] Update invalid test data providers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backport of https://review.typo3.org/c/Packages/TYPO3.CMS/+/83155
to TYPO3 v12.

PHPUnit 10.5.18 introduces deprecation warning due to
use of non-matching parameter names with data providers,
introduced by https://github.com/sebastianbergmann/phpunit/pull/5812.

This patch backports changes that were made for PHPUnit v11 support,
which also addresses these kind of deprecation warnings too.

Resolves: #103634
Related: #103222
Releases: 12.4
Change-Id: Ia9a1f7c5d62894dc80b3d1f9b465fb488b3250fc
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83788
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
 Tests/Functional/Command/CliCommandTest.php   | 44 +++++++-------
 .../DataHandling/Regular/MinValueTest.php     |  6 +-
 Tests/Functional/Imaging/IconFactoryTest.php  | 38 ++++++------
 .../Resource/Driver/LocalDriverTest.php       |  6 +-
 .../Resource/StorageRepositoryTest.php        | 60 +++++++++----------
 Tests/Unit/DataHandling/DataHandlerTest.php   |  6 +-
 .../EmailSoftReferenceParserTest.php          | 26 ++++----
 .../ExtensionPathSoftReferenceParserTest.php  | 18 +++---
 .../TypoLinkTagSoftReferenceParserTest.php    | 32 +++++-----
 .../UrlSoftReferenceParserTest.php            | 40 ++++++-------
 .../Localization/Parser/XliffParserTest.php   | 30 +++++-----
 Tests/Unit/Migrations/TcaMigrationTest.php    | 14 ++---
 Tests/Unit/Session/UserSessionManagerTest.php |  6 +-
 13 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/Tests/Functional/Command/CliCommandTest.php b/Tests/Functional/Command/CliCommandTest.php
index 0026862fc3..a9fa642b93 100644
--- a/Tests/Functional/Command/CliCommandTest.php
+++ b/Tests/Functional/Command/CliCommandTest.php
@@ -50,28 +50,28 @@ public function setUp(): void
     public static function commandTestDataProvider(): array
     {
         return [
-            ['command' => 'cleanup:localprocessedfiles', 'args' => ['-v'], 'code' => 0],
-            ['command' => 'cache:flush', 'args' => [], 'code' => 0],
-            ['command' => 'cache:warmup', 'args' => [], 'code' => 0],
-            ['command' => 'cleanup:flexforms', 'args' => [], 'code' => 0],
-            ['command' => 'cleanup:deletedrecords', 'args' => [], 'code' => 0],
-            ['command' => 'cleanup:orphanrecords', 'args' => [], 'code' => 0],
-            ['command' => 'cleanup:previewlinks', 'args' => [], 'code' => 0],
-            ['command' => 'cleanup:versions', 'args' => [], 'code' => 0],
-            ['command' => 'extension:list', 'args' => [], 'code' => 0],
-            ['command' => 'extension:setup', 'args' => [], 'code' => 0],
-            ['command' => 'extension:deactivate workspaces', 'args' => [], 'code' => 0],
-            ['command' => 'extension:activate workspaces', 'args' => [], 'code' => 0],
-            ['command' => 'language:update', 'args' => [], 'code' => 0],
-            ['command' => 'mailer:spool:send', 'args' => [], 'code' => 1],
-            ['command' => 'redirects:checkintegrity', 'args' => [], 'code' => 0],
-            ['command' => 'redirects:cleanup', 'args' => [], 'code' => 0],
-            ['command' => 'referenceindex:update', 'args' => ['--check'], 'code' => 0],
-            ['command' => 'scheduler:run', 'args' => [], 'code' => 0],
-            ['command' => 'site:list', 'args' => [], 'code' => 0],
-            ['command' => 'site:show show-me', 'args' => [], 'code' => 0],
-            ['command' => 'syslog:list', 'args' => [], 'code' => 0],
-            ['command' => 'upgrade:list', 'args' => [], 'code' => 0],
+            ['command' => 'cleanup:localprocessedfiles', 'args' => ['-v'], 'expectedExitCode' => 0],
+            ['command' => 'cache:flush', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cache:warmup', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cleanup:flexforms', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cleanup:deletedrecords', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cleanup:orphanrecords', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cleanup:previewlinks', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'cleanup:versions', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'extension:list', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'extension:setup', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'extension:deactivate workspaces', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'extension:activate workspaces', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'language:update', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'mailer:spool:send', 'args' => [], 'expectedExitCode' => 1],
+            ['command' => 'redirects:checkintegrity', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'redirects:cleanup', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'referenceindex:update', 'args' => ['--check'], 'expectedExitCode' => 0],
+            ['command' => 'scheduler:run', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'site:list', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'site:show show-me', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'syslog:list', 'args' => [], 'expectedExitCode' => 0],
+            ['command' => 'upgrade:list', 'args' => [], 'expectedExitCode' => 0],
         ];
     }
 
diff --git a/Tests/Functional/DataHandling/Regular/MinValueTest.php b/Tests/Functional/DataHandling/Regular/MinValueTest.php
index c63bbe5cb7..fbd409659a 100644
--- a/Tests/Functional/DataHandling/Regular/MinValueTest.php
+++ b/Tests/Functional/DataHandling/Regular/MinValueTest.php
@@ -68,13 +68,13 @@ public static function valuesLowerThanMinResetToEmptyStringDataProvider(): itera
 
     #[DataProvider('valuesLowerThanMinResetToEmptyStringDataProvider')]
     #[Test]
-    public function valuesLowerThanMinResetToEmptyString(string $string, string $expected): void
+    public function valuesLowerThanMinResetToEmptyString(string $value, string $expected): void
     {
         // Should work for type=input and type=text (except RTE).
         $actionService = new ActionService();
         $map = $actionService->createNewRecord('tt_content', 1, [
-            'tx_testdatahandler_input_minvalue' => $string,
-            'tx_testdatahandler_text_minvalue' => $string,
+            'tx_testdatahandler_input_minvalue' => $value,
+            'tx_testdatahandler_text_minvalue' => $value,
         ]);
         $newRecordId = reset($map['tt_content']);
         $newRecord = BackendUtility::getRecord('tt_content', $newRecordId);
diff --git a/Tests/Functional/Imaging/IconFactoryTest.php b/Tests/Functional/Imaging/IconFactoryTest.php
index d2633c8177..ad2b7ee4d2 100644
--- a/Tests/Functional/Imaging/IconFactoryTest.php
+++ b/Tests/Functional/Imaging/IconFactoryTest.php
@@ -30,15 +30,15 @@
 
 final class IconFactoryTest extends FunctionalTestCase
 {
-    protected IconFactory $subject;
-    protected string $notRegisteredIconIdentifier = 'my-super-unregistered-identifier';
-    protected string $registeredIconIdentifier = 'actions-close';
-    protected string $registeredSpinningIconIdentifier = 'spinning-icon';
+    private IconFactory $subject;
+    private string $notRegisteredIconIdentifier = 'my-super-unregistered-identifier';
+    private string $registeredIconIdentifier = 'actions-close';
+    private string $registeredSpinningIconIdentifier = 'spinning-icon';
 
     /**
      * Simulate a tt_content record
      */
-    protected array $mockRecord = [
+    private array $mockRecord = [
         'header' => 'dummy content header',
         'uid' => '1',
         'pid' => '1',
@@ -68,10 +68,10 @@ protected function setUp(): void
     public static function differentSizesDataProvider(): array
     {
         return [
-            ['size ' . Icon::SIZE_DEFAULT => ['input' => Icon::SIZE_DEFAULT, 'expected' => Icon::SIZE_DEFAULT]],
-            ['size ' . Icon::SIZE_SMALL => ['input' => Icon::SIZE_SMALL, 'expected' => Icon::SIZE_SMALL]],
-            ['size ' . Icon::SIZE_MEDIUM => ['input' => Icon::SIZE_MEDIUM, 'expected' => Icon::SIZE_MEDIUM]],
-            ['size ' . Icon::SIZE_LARGE => ['input' => Icon::SIZE_LARGE, 'expected' => Icon::SIZE_LARGE]],
+            'size ' . Icon::SIZE_DEFAULT => ['size' => Icon::SIZE_DEFAULT, 'expected' => Icon::SIZE_DEFAULT],
+            'size ' . Icon::SIZE_SMALL => ['size' => Icon::SIZE_SMALL, 'expected' => Icon::SIZE_SMALL],
+            'size ' . Icon::SIZE_MEDIUM => ['size' => Icon::SIZE_MEDIUM, 'expected' => Icon::SIZE_MEDIUM],
+            'size ' . Icon::SIZE_LARGE => ['size' => Icon::SIZE_LARGE, 'expected' => Icon::SIZE_LARGE],
         ];
     }
 
@@ -95,21 +95,21 @@ public function getIconByIdentifierReturnsIconWithCorrectMarkupIfRegisteredIconI
 
     #[DataProvider('differentSizesDataProvider')]
     #[Test]
-    public function getIconByIdentifierAndSizeReturnsIconWithCorrectMarkupIfRegisteredIconIdentifierIsUsed($size): void
+    public function getIconByIdentifierAndSizeReturnsIconWithCorrectMarkupIfRegisteredIconIdentifierIsUsed(string $size, string $expected): void
     {
         self::assertStringContainsString(
-            '<span class="t3js-icon icon icon-size-' . $size['expected'] . ' icon-state-default icon-actions-close" data-identifier="actions-close" aria-hidden="true">',
-            $this->subject->getIcon($this->registeredIconIdentifier, $size['input'])->render()
+            '<span class="t3js-icon icon icon-size-' . $expected . ' icon-state-default icon-actions-close" data-identifier="actions-close" aria-hidden="true">',
+            $this->subject->getIcon($this->registeredIconIdentifier, $size)->render()
         );
     }
 
     #[DataProvider('differentSizesDataProvider')]
     #[Test]
-    public function getIconByIdentifierAndSizeAndWithOverlayReturnsIconWithCorrectOverlayMarkupIfRegisteredIconIdentifierIsUsed($size): void
+    public function getIconByIdentifierAndSizeAndWithOverlayReturnsIconWithCorrectOverlayMarkupIfRegisteredIconIdentifierIsUsed(string $size, string $expected): void
     {
         self::assertStringContainsString(
             '<span class="icon-overlay icon-overlay-readonly">',
-            $this->subject->getIcon($this->registeredIconIdentifier, $size['input'], 'overlay-readonly')->render()
+            $this->subject->getIcon($this->registeredIconIdentifier, $size, 'overlay-readonly')->render()
         );
     }
 
@@ -124,11 +124,11 @@ public function getIconReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentif
 
     #[DataProvider('differentSizesDataProvider')]
     #[Test]
-    public function getIconByIdentifierAndSizeReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentifierIsUsed(array $size): void
+    public function getIconByIdentifierAndSizeReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentifierIsUsed(string $size, string $expected): void
     {
         self::assertStringContainsString(
-            '<span class="t3js-icon icon icon-size-' . $size['expected'] . ' icon-state-default icon-default-not-found" data-identifier="default-not-found" aria-hidden="true">',
-            $this->subject->getIcon($this->notRegisteredIconIdentifier, $size['input'])->render()
+            '<span class="t3js-icon icon icon-size-' . $expected . ' icon-state-default icon-default-not-found" data-identifier="default-not-found" aria-hidden="true">',
+            $this->subject->getIcon($this->notRegisteredIconIdentifier, $size)->render()
         );
     }
 
@@ -152,11 +152,11 @@ public function getIconReturnsCorrectMarkupIfIconIsRegisteredAsSpinningIcon(): v
 
     #[DataProvider('differentSizesDataProvider')]
     #[Test]
-    public function getIconByIdentifierAndSizeAndOverlayReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentifierIsUsed(array $size): void
+    public function getIconByIdentifierAndSizeAndOverlayReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentifierIsUsed(string $size, string $expected): void
     {
         self::assertStringContainsString(
             '<span class="icon-overlay icon-overlay-readonly">',
-            $this->subject->getIcon($this->notRegisteredIconIdentifier, $size['input'], 'overlay-readonly')->render()
+            $this->subject->getIcon($this->notRegisteredIconIdentifier, $size, 'overlay-readonly')->render()
         );
     }
 
diff --git a/Tests/Functional/Resource/Driver/LocalDriverTest.php b/Tests/Functional/Resource/Driver/LocalDriverTest.php
index 6e3fb47462..893d341b49 100644
--- a/Tests/Functional/Resource/Driver/LocalDriverTest.php
+++ b/Tests/Functional/Resource/Driver/LocalDriverTest.php
@@ -349,15 +349,15 @@ public static function getSpecificFileInformationDataProvider(): array
 
     #[DataProvider('getSpecificFileInformationDataProvider')]
     #[Test]
-    public function getSpecificFileInformationReturnsRequestedFileInformation(string|int $expectedValue, string $property): void
+    public function getSpecificFileInformationReturnsRequestedFileInformation(string|int $expectedValue, string $propertyName): void
     {
         copy(__DIR__ . '/Fixtures/Dummy.html', $this->baseDirectory . '/Dummy.html');
-        if (in_array($property, ['mtime', 'ctime', 'atime'])) {
+        if (in_array($propertyName, ['mtime', 'ctime', 'atime'])) {
             $expectedValue = filemtime($this->baseDirectory . '/Dummy.html');
         }
         $subject = $this->getDefaultInitializedSubject();
         $subject->setStorageUid(5);
-        self::assertSame($expectedValue, $subject->getSpecificFileInformation($this->baseDirectory . '/Dummy.html', '/', $property));
+        self::assertSame($expectedValue, $subject->getSpecificFileInformation($this->baseDirectory . '/Dummy.html', '/', $propertyName));
     }
 
     #[Test]
diff --git a/Tests/Functional/Resource/StorageRepositoryTest.php b/Tests/Functional/Resource/StorageRepositoryTest.php
index f43d60b942..49bde3a09b 100644
--- a/Tests/Functional/Resource/StorageRepositoryTest.php
+++ b/Tests/Functional/Resource/StorageRepositoryTest.php
@@ -164,46 +164,46 @@ public static function isWithinFileMountBoundariesDataProvider(): array
     {
         return [
             'Access to file in ro file mount denied for write request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'fooBaz',
-                '$isFileMountReadOnly' => true,
-                '$checkWriteAccess' => true,
-                '$expectedResult' => false,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'fooBaz',
+                'isFileMountReadOnly' => true,
+                'checkWriteAccess' => true,
+                'expectedResult' => false,
             ],
             'Access to file in ro file mount allowed for read request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'fooBaz',
-                '$isFileMountReadOnly' => true,
-                '$checkWriteAccess' => false,
-                '$expectedResult' => true,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'fooBaz',
+                'isFileMountReadOnly' => true,
+                'checkWriteAccess' => false,
+                'expectedResult' => true,
             ],
             'Access to file in rw file mount allowed for write request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'fooBaz',
-                '$isFileMountReadOnly' => false,
-                '$checkWriteAccess' => true,
-                '$expectedResult' => true,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'fooBaz',
+                'isFileMountReadOnly' => false,
+                'checkWriteAccess' => true,
+                'expectedResult' => true,
             ],
             'Access to file in rw file mount allowed for read request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'fooBaz',
-                '$isFileMountReadOnly' => false,
-                '$checkWriteAccess' => false,
-                '$expectedResult' => true,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'fooBaz',
+                'isFileMountReadOnly' => false,
+                'checkWriteAccess' => false,
+                'expectedResult' => true,
             ],
             'Access to file not in file mount denied for write request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'barBaz',
-                '$isFileMountReadOnly' => false,
-                '$checkWriteAccess' => true,
-                '$expectedResult' => false,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'barBaz',
+                'isFileMountReadOnly' => false,
+                'checkWriteAccess' => true,
+                'expectedResult' => false,
             ],
             'Access to file not in file mount denied for read request' => [
-                '$targetDirectory' => 'fooBaz',
-                '$fileMountFolder' => 'barBaz',
-                '$isFileMountReadOnly' => false,
-                '$checkWriteAccess' => false,
-                '$expectedResult' => false,
+                'targetDirectory' => 'fooBaz',
+                'fileMountFolder' => 'barBaz',
+                'isFileMountReadOnly' => false,
+                'checkWriteAccess' => false,
+                'expectedResult' => false,
             ],
         ];
     }
diff --git a/Tests/Unit/DataHandling/DataHandlerTest.php b/Tests/Unit/DataHandling/DataHandlerTest.php
index d4d1300c88..4a67a3ae59 100644
--- a/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -285,14 +285,14 @@ public static function numberValueCheckRecognizesDecimalStringValuesAsFloatValue
 
     #[DataProvider('numberValueCheckRecognizesDecimalStringValuesAsFloatValuesCorrectlyDataProvider')]
     #[Test]
-    public function numberValueCheckRecognizesDecimalStringValuesAsFloatValuesCorrectly(string $value, string $expectedReturnValue): void
+    public function numberValueCheckRecognizesDecimalStringValuesAsFloatValuesCorrectly(string $input, string $expected): void
     {
         $tcaFieldConf = [
             'type' => 'number',
             'format' => 'decimal',
         ];
-        $returnValue = $this->subject->_call('checkValueForNumber', $value, $tcaFieldConf);
-        self::assertSame($expectedReturnValue, $returnValue['value']);
+        $returnValue = $this->subject->_call('checkValueForNumber', $input, $tcaFieldConf);
+        self::assertSame($expected, $returnValue['value']);
     }
 
     /**
diff --git a/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php b/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
index 77d7cdbb4a..960286960a 100644
--- a/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
+++ b/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
@@ -26,19 +26,19 @@ public static function emailSoftReferenceParserTestDataProvider(): array
     {
         return [
             'Simple email address found' => [
-                'foo@bar.baz',
                 'content' => 'foo@bar.baz',
-                'elements' => [
+                'expectedContent' => 'foo@bar.baz',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'foo@bar.baz',
                     ],
                 ],
-                'hasMatched' => true,
+                'expectedHasMatched' => true,
             ],
             'Multiple email addresses found' => [
-                'This is my first email: foo@bar.baz and this is my second email: foo-_2@bar.baz',
                 'content' => 'This is my first email: foo@bar.baz and this is my second email: foo-_2@bar.baz',
-                'elements' => [
+                'expectedContent' => 'This is my first email: foo@bar.baz and this is my second email: foo-_2@bar.baz',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'foo@bar.baz',
                     ],
@@ -46,10 +46,10 @@ public static function emailSoftReferenceParserTestDataProvider(): array
                         'matchString' => 'foo-_2@bar.baz',
                     ],
                 ],
-                'hasMatched' => true,
+                'expectedHasMatched' => true,
             ],
             'Invalid emails are ignored' => [
-                'abc-@mail.com
+                'content' => 'abc-@mail.com
                  abc..def@mail.com
                  .abc@mail.com
                  abc#def@mail.com
@@ -57,14 +57,14 @@ public static function emailSoftReferenceParserTestDataProvider(): array
                  abc.def@mail#archive.com
                  abc.def@mail
                  abc.def@mail..com',
-                'content' => '',
-                'elements' => [],
-                'hasMatched' => false,
+                'expectedContent' => '',
+                'expectedElements' => [],
+                'expectedHasMatched' => false,
             ],
             'E-Mails in html match' => [
-                '<a href="mailto:foo@bar.de">foo@bar.baz</a>',
                 'content' => '<a href="mailto:foo@bar.de">foo@bar.baz</a>',
-                'elements' => [
+                'expectedContent' => '<a href="mailto:foo@bar.de">foo@bar.baz</a>',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'foo@bar.de',
                     ],
@@ -72,7 +72,7 @@ public static function emailSoftReferenceParserTestDataProvider(): array
                         'matchString' => 'foo@bar.baz',
                     ],
                 ],
-                'hasMatched' => true,
+                'expectedHasMatched' => true,
             ],
         ];
     }
diff --git a/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php b/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
index 59d42f172d..547a41aa89 100644
--- a/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
+++ b/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
@@ -28,12 +28,12 @@ public static function extensionPathSoftReferenceParserDataProvider(): array
             'Simple EXT: path has a match' => [
                 'text' => 'EXT:foobar/Configuration/TypoScript/setup.typoscript',
                 'content' => 'EXT:foobar/Configuration/TypoScript/setup.typoscript',
-                'elements' => [
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'EXT:foobar/Configuration/TypoScript/setup.typoscript',
                     ],
                 ],
-                'hasMatched' => true,
+                'expectedHasMatched' => true,
             ],
             'Multiple EXT: paths have matches' => [
                 'text' => '
@@ -48,7 +48,7 @@ public static function extensionPathSoftReferenceParserDataProvider(): array
                     @import "EXT:foobar/Configuration/TypoScript/setup2.typoscript"
                     # some comment
                 ',
-                'elements' => [
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'EXT:foobar/Configuration/TypoScript/setup1.typoscript',
                     ],
@@ -56,24 +56,24 @@ public static function extensionPathSoftReferenceParserDataProvider(): array
                         'matchString' => 'EXT:foobar/Configuration/TypoScript/setup2.typoscript',
                     ],
                 ],
-                'hasMatched' => true,
+                'expectedHasMatched' => true,
             ],
             'No matches returns null' => [
                 'text' => '/foobar/Configuration/TypoScript/setup.typoscript',
                 'content' => '',
-                'elements' => [],
-                'hasMatched' => false,
+                'expectedElements' => [],
+                'expectedHasMatched' => false,
             ],
         ];
     }
 
     #[DataProvider('extensionPathSoftReferenceParserDataProvider')]
     #[Test]
-    public function extensionPathSoftReferenceParserTest(string $content, string $expectedContent, array $expectedElements, bool $expectedHasMatched): void
+    public function extensionPathSoftReferenceParserTest(string $text, string $content, array $expectedElements, bool $expectedHasMatched): void
     {
         $subject = $this->getParserByKey('ext_fileref');
-        $result = $subject->parse('sys_template', 'include_static_file', 1, $content);
-        self::assertSame($expectedContent, $result->getContent());
+        $result = $subject->parse('sys_template', 'include_static_file', 1, $text);
+        self::assertSame($content, $result->getContent());
         self::assertSame($expectedElements, $result->getMatchedElements());
         self::assertSame($expectedHasMatched, $result->hasMatched());
     }
diff --git a/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php b/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
index 7b9a7a2a56..eb651555c0 100644
--- a/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
+++ b/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
@@ -30,12 +30,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
     {
         return [
             'link to page' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a href="t3://page?uid=42">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a href="t3://page?uid=42">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'db',
                         'recordRef' => 'pages:42',
@@ -44,12 +44,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to page with properties' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a class="link-page" href="t3://page?uid=42" target="_top" title="Foo">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a class="link-page" href="t3://page?uid=42" target="_top" title="Foo">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'db',
                         'recordRef' => 'pages:42',
@@ -58,12 +58,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to external URL without scheme' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a class="link-page" href="www.example.com" target="_top" title="Foo">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a class="link-page" href="www.example.com" target="_top" title="Foo">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'external',
                         'tokenValue' => 'http://www.example.com',
@@ -71,12 +71,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to external URL with scheme' => [
-                'typolink_tag' => [
+                'softrefConfiguration' => [
                     'content' => '<p><a class="link-page" href="https://www.example.com" target="_top" title="Foo">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a class="link-page" href="https://www.example.com" target="_top" title="Foo">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'external',
                         'tokenValue' => 'https://www.example.com',
@@ -84,12 +84,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to email' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a href="mailto:test@example.com">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a href="mailto:test@example.com">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'string',
                         'tokenValue' => 'test@example.com',
@@ -97,12 +97,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to email without schema' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a href="test@example.com">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a href="test@example.com">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'string',
                         'tokenValue' => 'test@example.com',
@@ -110,12 +110,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link to phone number' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a href="tel:0123456789">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a href="tel:0123456789">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'string',
                         'tokenValue' => '0123456789',
@@ -123,12 +123,12 @@ public static function findRefReturnsParsedElementsDataProvider(): array
                 ],
             ],
             'link with invalid content' => [
-                [
+                'softrefConfiguration' => [
                     'content' => '<p><a href="Email: hans@example.com">Click here</a></p>',
                     'elementKey' => 1,
                     'matchString' => '<a href="Email: hans@example.com">',
                 ],
-                [
+                'expectedElement' => [
                     'subst' => [
                         'type' => 'string',
                         'tokenValue' => '',
diff --git a/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php b/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
index bcf625ecbd..2c3fd22f99 100644
--- a/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
+++ b/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
@@ -26,63 +26,63 @@ public static function urlSoftReferenceParserTestDataProvider(): array
     {
         return [
             'Simple url matches' => [
-                'https://foo-bar.baz',
                 'content' => 'https://foo-bar.baz',
-                'elements' => [
+                'expectedContent' => 'https://foo-bar.baz',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'https://foo-bar.baz',
                     ],
                 ],
             ],
             'Valid characters by RFC 3986 match' => [
-                'http://ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&\'()*+,;=.foo',
                 'content' => 'http://ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&\'()*+,;=.foo',
-                'elements' => [
+                'expectedContent' => 'http://ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&\'()*+,;=.foo',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'http://ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&\'()*+,;=.foo',
                     ],
                 ],
             ],
             'URLs in content match' => [
-                'Lorem ipsum https://foo-bar.baz dolor sit',
                 'content' => 'Lorem ipsum https://foo-bar.baz dolor sit',
-                'elements' => [
+                'expectedContent' => 'Lorem ipsum https://foo-bar.baz dolor sit',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'https://foo-bar.baz',
                     ],
                 ],
             ],
             'FTP URLs match' => [
-                'ftp://foo-bar.baz',
                 'content' => 'ftp://foo-bar.baz',
-                'elements' => [
+                'expectedContent' => 'ftp://foo-bar.baz',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'ftp://foo-bar.baz',
                     ],
                 ],
             ],
             'Full URLs match' => [
-                'https://foo-bar.baz?foo=bar&baz=fizz#anchor',
                 'content' => 'https://foo-bar.baz?foo=bar&baz=fizz#anchor',
-                'elements' => [
+                'expectedContent' => 'https://foo-bar.baz?foo=bar&baz=fizz#anchor',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'https://foo-bar.baz?foo=bar&baz=fizz#anchor',
                     ],
                 ],
             ],
             'URL encoded URLs match' => [
-                'https://foo-bar.baz?foo%3Dbar%26baz%3Dfi%20zz%23anchor',
                 'content' => 'https://foo-bar.baz?foo%3Dbar%26baz%3Dfi%20zz%23anchor',
-                'elements' => [
+                'expectedContent' => 'https://foo-bar.baz?foo%3Dbar%26baz%3Dfi%20zz%23anchor',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'https://foo-bar.baz?foo%3Dbar%26baz%3Dfi%20zz%23anchor',
                     ],
                 ],
             ],
             'No space character after the last URL matches' => [
-                '<p>Lorem Ipsum<br> https://foo.bar.baz/abc/def/ghi/.</p>',
                 'content' => '<p>Lorem Ipsum<br> https://foo.bar.baz/abc/def/ghi/.</p>',
-                'elements' => [
+                'expectedContent' => '<p>Lorem Ipsum<br> https://foo.bar.baz/abc/def/ghi/.</p>',
+                'expectedElements' => [
                     2 => [
                         'matchString' => 'https://foo.bar.baz/abc/def/ghi/.',
                     ],
@@ -90,14 +90,14 @@ public static function urlSoftReferenceParserTestDataProvider(): array
             ],
             // The two cases below are handled by typolink_tag
             'URLs in anchor tag attributes do NOT match' => [
-                '<a href="https://foo-bar.baz">some link</a>',
-                'content' => '',
-                'elements' => [],
+                'content' => '<a href="https://foo-bar.baz">some link</a>',
+                'expectedContent' => '',
+                'expectedElements' => [],
             ],
             'URLs in link tag attributes do NOT match' => [
-                '<link href="https://foo-bar.baz/style.css" rel="stylesheet">',
-                'content' => '',
-                'elements' => [],
+                'content' => '<link href="https://foo-bar.baz/style.css" rel="stylesheet">',
+                'expectedContent' => '',
+                'expectedElements' => [],
             ],
         ];
     }
diff --git a/Tests/Unit/Localization/Parser/XliffParserTest.php b/Tests/Unit/Localization/Parser/XliffParserTest.php
index 1385ae7395..43d881f1e0 100644
--- a/Tests/Unit/Localization/Parser/XliffParserTest.php
+++ b/Tests/Unit/Localization/Parser/XliffParserTest.php
@@ -24,18 +24,6 @@
 
 final class XliffParserTest extends UnitTestCase
 {
-    #[DataProvider('canParseXliffDataProvider')]
-    #[Test]
-    public function canParseXliff(string $languageKey, array $expectedLabels, bool $requireApprovedLocalizations): void
-    {
-        $GLOBALS['TYPO3_CONF_VARS']['SYS']['lang']['requireApprovedLocalizations'] = $requireApprovedLocalizations;
-        $LOCAL_LANG = (new XliffParser())->getParsedData(__DIR__ . '/Fixtures/locallang.xlf', $languageKey);
-        self::assertArrayHasKey($languageKey, $LOCAL_LANG, sprintf('%s key not found in $LOCAL_LANG', $languageKey));
-        foreach ($expectedLabels as $key => $expectedLabel) {
-            self::assertEquals($expectedLabel, $LOCAL_LANG[$languageKey][$key][0]['target']);
-        }
-    }
-
     public static function canParseXliffDataProvider(): \Generator
     {
         yield 'Can handle default' => [
@@ -45,14 +33,14 @@ public static function canParseXliffDataProvider(): \Generator
                 'label2' => 'This is label #2',
                 'label3' => 'This is label #3',
             ],
-            false,
+            'requireApprovedLocalizations' => false,
         ];
         yield 'Can handle translation with approved only' => [
             'languageKey' => 'fr',
             'expectedLabels' => [
                 'label2' => 'Ceci est le libellé no. 2 [approved]',
             ],
-            true,
+            'requireApprovedLocalizations' => true,
         ];
         yield 'Can handle translation with non approved' => [
             'languageKey' => 'fr',
@@ -61,7 +49,19 @@ public static function canParseXliffDataProvider(): \Generator
                 'label2' => 'Ceci est le libellé no. 2 [approved]',
                 'label3' => 'Ceci est le libellé no. 3 [not approved]',
             ],
-            false,
+            'requireApprovedLocalizations' => false,
         ];
     }
+
+    #[DataProvider('canParseXliffDataProvider')]
+    #[Test]
+    public function canParseXliff(string $languageKey, array $expectedLabels, bool $requireApprovedLocalizations): void
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['lang']['requireApprovedLocalizations'] = $requireApprovedLocalizations;
+        $LOCAL_LANG = (new XliffParser())->getParsedData(__DIR__ . '/Fixtures/locallang.xlf', $languageKey);
+        self::assertArrayHasKey($languageKey, $LOCAL_LANG, sprintf('%s key not found in $LOCAL_LANG', $languageKey));
+        foreach ($expectedLabels as $key => $expectedLabel) {
+            self::assertEquals($expectedLabel, $LOCAL_LANG[$languageKey][$key][0]['target']);
+        }
+    }
 }
diff --git a/Tests/Unit/Migrations/TcaMigrationTest.php b/Tests/Unit/Migrations/TcaMigrationTest.php
index afae6f624d..c1d9bc3e5d 100644
--- a/Tests/Unit/Migrations/TcaMigrationTest.php
+++ b/Tests/Unit/Migrations/TcaMigrationTest.php
@@ -1411,10 +1411,10 @@ public static function requiredFlagIsMigratedDataProvider(): iterable
 
     #[DataProvider('requiredFlagIsMigratedDataProvider')]
     #[Test]
-    public function requiredFlagIsMigrated(array $input, array $expected): void
+    public function requiredFlagIsMigrated(array $tca, array $expected): void
     {
         $subject = new TcaMigration();
-        self::assertEquals($expected, $subject->migrate($input));
+        self::assertEquals($expected, $subject->migrate($tca));
     }
 
     public static function evalNullMigratedToNullableOptionDataProvider(): iterable
@@ -1528,15 +1528,15 @@ public static function evalNullMigratedToNullableOptionDataProvider(): iterable
     }
 
     /**
-     * @param array<string, mixed> $input
+     * @param array<string, mixed> $tca
      * @param array<string, mixed> $expected
      */
     #[DataProvider('evalNullMigratedToNullableOptionDataProvider')]
     #[Test]
-    public function evalNullMigratedToNullableOption(array $input, array $expected): void
+    public function evalNullMigratedToNullableOption(array $tca, array $expected): void
     {
         $subject = new TcaMigration();
-        self::assertSame($expected, $subject->migrate($input));
+        self::assertSame($expected, $subject->migrate($tca));
     }
 
     public static function evalEmailMigratedToTypeDataProvider(): iterable
@@ -2747,10 +2747,10 @@ public static function selectIndividualAllowDenyMigratedToNewPositionDataProvide
 
     #[DataProvider('selectIndividualAllowDenyMigratedToNewPositionDataProvider')]
     #[Test]
-    public function selectIndividualAllowDenyMigratedToNewPosition(array $input, array $expected): void
+    public function selectIndividualAllowDenyMigratedToNewPosition(array $tca, array $expected): void
     {
         $subject = new TcaMigration();
-        self::assertEquals($expected, $subject->migrate($input));
+        self::assertEquals($expected, $subject->migrate($tca));
     }
 
     public static function renderTypeColorpickerToTypeColorDataProvider(): iterable
diff --git a/Tests/Unit/Session/UserSessionManagerTest.php b/Tests/Unit/Session/UserSessionManagerTest.php
index 4a795b6f99..76ff387ea0 100644
--- a/Tests/Unit/Session/UserSessionManagerTest.php
+++ b/Tests/Unit/Session/UserSessionManagerTest.php
@@ -40,17 +40,17 @@ public static function willExpireDataProvider(): array
             [
                 'sessionLifetime' => 120,
                 'gracePeriod' => 120,
-                'shouldBeMarkedAsExpired' => true,
+                'expectedResult' => true,
             ],
             [
                 'sessionLifetime' => 120,
                 'gracePeriod' => 60,
-                'shouldBeMarkedAsExpired' => false,
+                'expectedResult' => false,
             ],
             [
                 'sessionLifetime' => 120,
                 'gracePeriod' => 240,
-                'shouldBeMarkedAsExpired' => true,
+                'expectedResult' => true,
             ],
         ];
     }