From 231026da21ad3d70837130305932b5264aac8c09 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 29 Mar 2021 00:54:46 +0200
Subject: [PATCH] PHPUnit: improve configuration

Move the CLI arguments which can be placed in the configuration file to the configuration file and removed them from the Ant build configuration.
---
 build.xml        | 9 +--------
 phpunit.xml.dist | 9 +++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 9d95c2e..1d42bd8 100644
--- a/build.xml
+++ b/build.xml
@@ -65,9 +65,7 @@
         <delete file="${basedir}/build/logs/phpunit.xml" quiet="true" />
 
         <exec executable="${phpunit}" failonerror="true">
-            <arg line='--configuration ${basedir}/phpunit.xml.dist' />
-            <arg line='-d memory_limit=256M' />
-            <arg line='--log-junit "${basedir}/build/logs/phpunit.xml"' />
+            <arg line='--no-coverage' />
             <arg line='${colors-arg.color}' />
         </exec>
     </target>
@@ -79,11 +77,6 @@
         <mkdir dir="${basedir}/build/coverage" />
 
         <exec executable="${phpunit}" failonerror="true">
-            <arg line='--configuration ${basedir}/phpunit.xml.dist' />
-            <arg line='-d memory_limit=256M' />
-            <arg line='--log-junit "${basedir}/build/logs/phpunit.xml"' />
-            <arg line='--coverage-clover "${basedir}/build/logs/clover.xml"' />
-            <arg line='--coverage-html "${basedir}/build/coverage/"' />
             <arg line='${colors-arg.color}' />
         </exec>
     </target>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1bac566..411917f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,4 +16,13 @@
         </whitelist>
     </filter>
 
+    <logging>
+        <log type="junit" target="build/logs/phpunit.xml"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-html" target="build/coverage/"/>
+    </logging>
+
+    <php>
+        <ini name="memory_limit" value="256M"/>
+    </php>
 </phpunit>