From 403da928651a308fab8b9792020f9d9443e45c60 Mon Sep 17 00:00:00 2001
From: Siad Ardroumli <siad.ardroumli@gmail.com>
Date: Sat, 2 May 2020 15:08:15 +0200
Subject: [PATCH] Removed adhoc tasks and use bootstrap

---
 test/build.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/test/build.xml b/test/build.xml
index 6593a73036..eb9b5d8365 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -30,22 +30,16 @@
     <resolvepath propertyName="phing.classes.dir.resolved" file="../classes"/>
     <resolvepath propertyName="phing.etc.dir.resolved" file="../etc"/>
 
-    <path id="incthis">
-        <pathelement dir="${tests.dir.resolved}"/>
-        <pathelement dir="${tests.classes.dir.resolved}"/>
-    </path>
+    <autoloader autoloaderpath="${tests.dir.resolved}/bootstrap.php"/>
+
+    <php expression="ini_set('error_reporting', -1);"/>
+    <php expression="ini_set('memory_limit', -1);"/>
+    <php expression="ini_set('date.timezone', 'UTC');"/>
 
     <target name="configure">
         <echo>-------------------------------------------------</echo>
         <echo>+++++ Running Phing unit tests</echo>
         <echo>-------------------------------------------------</echo>
-        <adhoc><![CDATA[
-			// Cannot use __FILE__ because that is the AdhocTask not this build.xml file
-			define('PHING_TEST_BASE', dirname($this->getProject()->getProperty('phing.file')));
-		]]></adhoc>
-
-        <!-- startup will have changed the include_path, so set it back now -->
-        <includepath classpathRef="incthis"/>
 
         <mkdir dir="${tests.reports.dir.resolved}/tests"/>
         <mkdir dir="${tests.reports.dir.resolved}/coverage"/>
@@ -59,7 +53,6 @@
     <target name="reports" depends="configure">
         <delete dir="tmp"/>
         <mkdir dir="tmp"/>
-        <adhoc><![CDATA[ @include_once 'PHPUnit/Autoload.php';  ]]></adhoc>
         <if>
             <equals arg1="${tests.codecoverage}" arg2="true"/>
             <then>