From e565bf50b6f480fded52e023d8ef72376014b58d Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Tue, 19 Dec 2023 13:01:31 +0100
Subject: [PATCH] [TASK] Streamline the PHPUnit configuration files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- autoformat the files
- sort the configuration options
This keeps the files consistent and avoids unrelated formatting changes
when other things are changed.
Resolves: #102699
Releases: main, 12.4
Change-Id: Iffb8401328949d0d38f91512671f77285c470e6a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/82243
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
---
Build/phpunit/FunctionalTests.xml | 24 ++++++++++-----------
Build/phpunit/FunctionalTestsDeprecated.xml | 24 ++++++++++-----------
Build/phpunit/UnitTests.xml | 24 ++++++++++-----------
Build/phpunit/UnitTestsDeprecated.xml | 24 ++++++++++-----------
4 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/Build/phpunit/FunctionalTests.xml b/Build/phpunit/FunctionalTests.xml
index 870e4eaa1473..e08799c31f42 100644
--- a/Build/phpunit/FunctionalTests.xml
+++ b/Build/phpunit/FunctionalTests.xml
@@ -15,10 +15,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
backupGlobals="true"
+ beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="FunctionalTestsBootstrap.php"
+ cacheDirectory=".phpunit.cache"
cacheResult="false"
colors="true"
- beStrictAboutTestsThatDoNotTestAnything="false"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerNotices="true"
@@ -27,16 +28,15 @@
failOnNotice="true"
failOnRisky="true"
failOnWarning="true"
- cacheDirectory=".phpunit.cache"
>
- <testsuites>
- <testsuite name="Core tests">
- <directory>../../typo3/sysext/*/Tests/Functional/</directory>
- </testsuite>
- </testsuites>
- <php>
- <ini name="display_errors" value="1"/>
- <ini name="error_reporting" value="E_ALL"/>
- <env name="TYPO3_CONTEXT" value="Testing"/>
- </php>
+ <testsuites>
+ <testsuite name="Core tests">
+ <directory>../../typo3/sysext/*/Tests/Functional/</directory>
+ </testsuite>
+ </testsuites>
+ <php>
+ <ini name="display_errors" value="1"/>
+ <ini name="error_reporting" value="E_ALL"/>
+ <env name="TYPO3_CONTEXT" value="Testing"/>
+ </php>
</phpunit>
diff --git a/Build/phpunit/FunctionalTestsDeprecated.xml b/Build/phpunit/FunctionalTestsDeprecated.xml
index 7758f91c4695..c2fc9d7f910f 100644
--- a/Build/phpunit/FunctionalTestsDeprecated.xml
+++ b/Build/phpunit/FunctionalTestsDeprecated.xml
@@ -15,10 +15,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
backupGlobals="true"
+ beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="FunctionalTestsBootstrap.php"
+ cacheDirectory=".phpunit.cache"
cacheResult="false"
colors="true"
- beStrictAboutTestsThatDoNotTestAnything="false"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerNotices="true"
@@ -26,16 +27,15 @@
failOnNotice="true"
failOnRisky="true"
failOnWarning="true"
- cacheDirectory=".phpunit.cache"
>
- <testsuites>
- <testsuite name="Core tests">
- <directory>../../typo3/sysext/*/Tests/FunctionalDeprecated/</directory>
- </testsuite>
- </testsuites>
- <php>
- <ini name="display_errors" value="1"/>
- <ini name="error_reporting" value="E_ALL"/>
- <env name="TYPO3_CONTEXT" value="Testing"/>
- </php>
+ <testsuites>
+ <testsuite name="Core tests">
+ <directory>../../typo3/sysext/*/Tests/FunctionalDeprecated/</directory>
+ </testsuite>
+ </testsuites>
+ <php>
+ <ini name="display_errors" value="1"/>
+ <ini name="error_reporting" value="E_ALL"/>
+ <env name="TYPO3_CONTEXT" value="Testing"/>
+ </php>
</phpunit>
diff --git a/Build/phpunit/UnitTests.xml b/Build/phpunit/UnitTests.xml
index 3a4797c44770..991709e73bd0 100644
--- a/Build/phpunit/UnitTests.xml
+++ b/Build/phpunit/UnitTests.xml
@@ -15,10 +15,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
backupGlobals="true"
+ beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="UnitTestsBootstrap.php"
+ cacheDirectory=".phpunit.cache"
cacheResult="false"
colors="true"
- beStrictAboutTestsThatDoNotTestAnything="false"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerNotices="true"
@@ -27,16 +28,15 @@
failOnNotice="true"
failOnRisky="true"
failOnWarning="true"
- cacheDirectory=".phpunit.cache"
>
- <testsuites>
- <testsuite name="Core tests">
- <directory>../../typo3/sysext/*/Tests/Unit/</directory>
- </testsuite>
- </testsuites>
- <php>
- <ini name="display_errors" value="1"/>
- <ini name="error_reporting" value="E_ALL"/>
- <env name="TYPO3_CONTEXT" value="Testing"/>
- </php>
+ <testsuites>
+ <testsuite name="Core tests">
+ <directory>../../typo3/sysext/*/Tests/Unit/</directory>
+ </testsuite>
+ </testsuites>
+ <php>
+ <ini name="display_errors" value="1"/>
+ <ini name="error_reporting" value="E_ALL"/>
+ <env name="TYPO3_CONTEXT" value="Testing"/>
+ </php>
</phpunit>
diff --git a/Build/phpunit/UnitTestsDeprecated.xml b/Build/phpunit/UnitTestsDeprecated.xml
index cc60626ef159..9768f9ffd163 100644
--- a/Build/phpunit/UnitTestsDeprecated.xml
+++ b/Build/phpunit/UnitTestsDeprecated.xml
@@ -19,27 +19,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
backupGlobals="true"
+ beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="UnitTestsBootstrap.php"
+ cacheDirectory=".phpunit.cache"
cacheResult="false"
colors="true"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerNotices="true"
displayDetailsOnTestsThatTriggerWarnings="true"
- beStrictAboutTestsThatDoNotTestAnything="false"
failOnNotice="true"
failOnRisky="true"
failOnWarning="true"
- cacheDirectory=".phpunit.cache"
>
- <testsuites>
- <testsuite name="Core tests">
- <directory>../../typo3/sysext/*/Tests/UnitDeprecated/</directory>
- </testsuite>
- </testsuites>
- <php>
- <ini name="display_errors" value="1"/>
- <ini name="error_reporting" value="E_ALL"/>
- <env name="TYPO3_CONTEXT" value="Testing"/>
- </php>
+ <testsuites>
+ <testsuite name="Core tests">
+ <directory>../../typo3/sysext/*/Tests/UnitDeprecated/</directory>
+ </testsuite>
+ </testsuites>
+ <php>
+ <ini name="display_errors" value="1"/>
+ <ini name="error_reporting" value="E_ALL"/>
+ <env name="TYPO3_CONTEXT" value="Testing"/>
+ </php>
</phpunit>
--
GitLab