From ea32d5941b03e7b89381b20f7db9fd6b38ab84c9 Mon Sep 17 00:00:00 2001
From: MichaelC <m@michaelcullum.com>
Date: Mon, 4 Feb 2019 23:21:22 +0000
Subject: [PATCH 1/3] Add composer install step

---
 build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index b88bb8d55..fa806828e 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,11 @@
 <project name="joindin-responsive" default="build" basedir=".">
  <property name="basedir" value="."/>
 
- <target name="build" depends="phplint,jsvalidate,phpunit,phpcs" />
+ <target name="build" depends="composer,phplint,jsvalidate,phpunit,phpcs" />
+
+  <target name="composer" description="Run composer">
+     <exec command="composer install" logoutput="/dev/stdout" checkreturn="true" />
+  </target>
 
  <target name="phplint" description="Run php -l over the fileset">
    <phplint haltonfailure="true">

From 415baef8b2d298a20fa4710052521bcdaa6abe29 Mon Sep 17 00:00:00 2001
From: MichaelC <m@michaelcullum.com>
Date: Mon, 4 Feb 2019 23:23:19 +0000
Subject: [PATCH 2/3] Fix spacing

---
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index fa806828e..95454a1cb 100644
--- a/build.xml
+++ b/build.xml
@@ -5,9 +5,9 @@
 
  <target name="build" depends="composer,phplint,jsvalidate,phpunit,phpcs" />
 
-  <target name="composer" description="Run composer">
-     <exec command="composer install" logoutput="/dev/stdout" checkreturn="true" />
-  </target>
+ <target name="composer" description="Run composer">
+   <exec command="composer install" logoutput="/dev/stdout" checkreturn="true" />
+ </target>
 
  <target name="phplint" description="Run php -l over the fileset">
    <phplint haltonfailure="true">

From 02e08f94d0e73037962564a106d0c95ac84509c3 Mon Sep 17 00:00:00 2001
From: MichaelC <m@michaelcullum.com>
Date: Mon, 4 Feb 2019 23:24:21 +0000
Subject: [PATCH 3/3] Specify exact path to phpunit

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 95454a1cb..a3e757298 100644
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,7 @@
  </target>
 
  <target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
-  <exec command="phpunit -c tests/phpunit.xml" logoutput="/dev/stdout" checkreturn="true" />
+  <exec command="vendor/bin/phpunit -c tests/phpunit.xml" logoutput="/dev/stdout" checkreturn="true" />
  </target>
 
  <target name="jsvalidate" description="Use jsvalidate to lint check the JS">