From 00d773bdc43020e48b01c7b8f4ec091263e95a29 Mon Sep 17 00:00:00 2001
From: Jop Peters <jop@mastercoding.nl>
Date: Tue, 16 Jan 2018 10:17:28 +0100
Subject: [PATCH 1/9] Sf4 support

---
 build.lint.xml     | 64 +++++++++++++++++++++++-----------------------
 build.phpunit.xml  |  2 +-
 build.symfony.xml  |  5 ++--
 build.symfony3.xml | 45 --------------------------------
 build.symfony4.xml |  2 +-
 5 files changed, 36 insertions(+), 82 deletions(-)
 delete mode 100644 build.symfony3.xml

diff --git a/build.lint.xml b/build.lint.xml
index 1ca7cfd..371c86a 100644
--- a/build.lint.xml
+++ b/build.lint.xml
@@ -11,62 +11,62 @@
             depends="lint-twig,lint-yml"
             description="Performs static analysis" />
 
-            <!-- This executes the PHP internal linter (php -l) -->
+    <!-- This executes the PHP internal linter (php -l) -->
     <target name="lint-php"
             unless="lint-php.done"
             description="Perform syntax check of sourcecode files">
-    <apply executable="php" taskname="lint" failonerror="true">
-        <arg value="-l" />
+        <apply executable="php" taskname="lint" failonerror="true">
+            <arg value="-l" />
 
-        <fileset dir="${basedir}/src" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/src" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-        <fileset dir="${basedir}/tests" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/tests" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-        <fileset dir="${basedir}/app" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/app" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-    </apply>
+        </apply>
 
-    <property name="lint-php.done" value="true"/>
+        <property name="lint-php.done" value="true"/>
     </target>
 
-            <!-- Executes the symfony provided twig linter -->
+    <!-- Executes the symfony provided twig linter -->
     <target name="lint-twig"
             unless="lint-twig.done"
             description="Perform syntax check of twig files"
             depends="-check-symfony-console"
             if="symfony-console.exists">
-    <apply executable="${symfony-console}" taskname="lint-twig" failonerror="true">
-        <arg value="lint:twig" />
-        <dirset dir = "${basedir}">
-            <include name="app" />
-            <include name="src" />
-        </dirset>
-    </apply>
+        <apply executable="${symfony4-console}" taskname="lint-twig" failonerror="true">
+            <arg value="lint:twig" />
+            <dirset dir = "${basedir}">
+                <include name="app" />
+                <include name="src" />
+            </dirset>
+        </apply>
 
-    <property name="lint-twig.done" value="true"/>
+        <property name="lint-twig.done" value="true"/>
     </target>
 
-            <!-- Executes the symfony provided yaml linter -->
+    <!-- Executes the symfony provided yaml linter -->
     <target name="lint-yml"
             unless="lint-yml.done"
             description="Perform syntax check of yml files"
             depends="-check-symfony-console"
             if="symfony-console.exists">
-    <apply executable="${symfony-console}" taskname="lint-yml" failonerror="true">
-        <arg value="lint:yaml" />
-        <dirset dir = "${basedir}">
-            <include name="app" />
-            <include name="src" />
-        </dirset>
-    </apply>
+        <apply executable="${symfony4-console}" taskname="lint-yml" failonerror="true">
+            <arg value="lint:yaml" />
+            <dirset dir = "${basedir}">
+                <include name="app" />
+                <include name="src" />
+            </dirset>
+        </apply>
 
-    <property name="lint-yml.done" value="true"/>
+        <property name="lint-yml.done" value="true"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/build.phpunit.xml b/build.phpunit.xml
index 8d7e878..e7d0d89 100644
--- a/build.phpunit.xml
+++ b/build.phpunit.xml
@@ -3,7 +3,7 @@
 
     <!-- We define the paths to the executables here, for easier
      modification -->
-    <property name="phpunit" value="${basedir}/vendor/bin/phpunit"/>
+    <property name="phpunit" value="${basedir}/vendor/bin/simple-phpunit"/>
 
     <!-- Check if composer is available -->
     <target name="check-phpunit">
diff --git a/build.symfony.xml b/build.symfony.xml
index c8cb462..adf9ff1 100644
--- a/build.symfony.xml
+++ b/build.symfony.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="randock.symfony">
-    <import file="./build.symfony3.xml" />
     <import file="./build.symfony4.xml"  />
 
-    <target name="symfony-prepare" depends="symfony3-prepare,symfony4-prepare" />
+    <target name="symfony-prepare" depends="symfony4-prepare" />
 
     <target name="symfony-change-owner"
-     depends="symfony3-change-owner,symfony4-change-owner" />
+            depends="symfony4-change-owner" />
 
 </project>
\ No newline at end of file
diff --git a/build.symfony3.xml b/build.symfony3.xml
deleted file mode 100644
index 7a35191..0000000
--- a/build.symfony3.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="randock.symfony3">
-
-    <!-- symfony console location -->
-    <property name="symfony3-console" value="bin/console"/>
-    <property name="symfony3-kernel" value="app/AppKernel.php" />
-
-    <!-- Check if symfony is available -->
-    <target name="symfony3-check">
-        <available file="${symfony3-kernel}" property="symfony3.available" />
-    </target>
-
-    <target name="symfony3-prepare"
-            depends="symfony3-check"
-            if = "symfony3.available"
-             >
-        <antcall target = "symfony3-schema:update" />
-        <antcall target = "symfony3-assetic:dump" />
-        <antcall target = "symfony3-change-owner" />
-    </target>
-
-    <target name="symfony3-assetic:dump">
-        <exec executable="${symfony3-console}">
-            <arg value="assetic:dump" />
-            <arg value="--quiet" />
-        </exec>
-    </target>
-
-    <target name="symfony3-schema:update">
-        <exec executable="${symfony3-console}">
-            <arg value="doctrine:schema:update" />
-            <arg value="--force" />
-        </exec>
-    </target>
-
-    <target name="symfony3-change-owner"
-    depends="symfony3-check"
-    if="symfony3.available">
-        <exec executable="chmod">
-            <arg value = "-R" />
-            <arg value = "0777" />
-            <arg value = "var" />
-        </exec>
-    </target>
-</project>
\ No newline at end of file
diff --git a/build.symfony4.xml b/build.symfony4.xml
index 0a1d595..5ad44bf 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -33,7 +33,7 @@
     <target name="symfony4-change-owner"
             depends="symfony4-check"
             if="symfony4.available">
-    <exec executable="chmod">
+        <exec executable="chmod">
             <arg value = "-R" />
             <arg value = "0777" />
             <arg value = "var" />

From 9d8bd286e9b7d54f62f4b5ea8a94ce687a51bc13 Mon Sep 17 00:00:00 2001
From: Jop Peters <jop@mastercoding.nl>
Date: Tue, 16 Jan 2018 12:25:34 +0100
Subject: [PATCH 2/9] Webpack fixes

---
 build.symfony4.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.symfony4.xml b/build.symfony4.xml
index 5ad44bf..996b413 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -7,9 +7,13 @@
 
     <!-- Check if symfony is available -->
     <target name="symfony4-check">
-        <available file="${yarn}" property="symfony4.available" />
+        <available file="${symfony4-console}" property="symfony4.available" />
     </target>
 
+    <!-- Check if yarn is available -->
+    <target name="yarn-check">
+        <available file="${yarn}" property="yarn.available" />
+    </target>
     <target name="symfony4-prepare"
             depends="symfony4-check"
             if="symfony4.available">
@@ -17,7 +21,10 @@
         <antcall target= "symfony4-webpack:build" />
         <antcall target= "symfony4-change-owner" />
     </target>
-    <target name="symfony4-webpack:build">
+
+    <target name="symfony4-webpack:build"
+            depends="yarn-check"
+            if="yarn.available">
         <exec executable="${yarn}">
             <arg value="build" />
         </exec>

From 32a3b3ec9f5e8e3613e2d520ab8d06451713b07f Mon Sep 17 00:00:00 2001
From: Jop Peters <jop@mastercoding.nl>
Date: Tue, 16 Jan 2018 12:42:34 +0100
Subject: [PATCH 3/9] Yarn install

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

diff --git a/build.symfony4.xml b/build.symfony4.xml
index 996b413..1aa4858 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -25,6 +25,9 @@
     <target name="symfony4-webpack:build"
             depends="yarn-check"
             if="yarn.available">
+        <exec executable="${yarn}">
+            <arg value="install" />
+        </exec>
         <exec executable="${yarn}">
             <arg value="build" />
         </exec>

From 5885d50678b704fc26df61d122790ced9f996c27 Mon Sep 17 00:00:00 2001
From: Diego Hervas <diego.diguin91@gmail.com>
Date: Wed, 21 Feb 2018 11:43:15 +0100
Subject: [PATCH 4/9] Webpack build with environment check

---
 build.symfony4.xml | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/build.symfony4.xml b/build.symfony4.xml
index 1aa4858..c9c4c86 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -22,7 +22,28 @@
         <antcall target= "symfony4-change-owner" />
     </target>
 
-    <target name="symfony4-webpack:build"
+    <target name="symfony4-webpack:build">
+        <antcall target="symfony4-webpack:build:prod-with-check"/>
+        <antcall target="symfony4-webpack:build:dev-with-check"/>
+    </target>
+
+    <target name="symfony4-webpack:build:prod-with-check" depends="symfony-environment-check" if="symfony.prod">
+        <antcall target="symfony4-webpack:build:prod"/>
+    </target>
+    <target name="symfony4-webpack:build:dev-with-check" depends="symfony-environment-check" if="symfony.dev">
+        <antcall target="symfony4-webpack:build:dev"/>
+    </target>
+
+    <target name="symfony-environment-check">
+        <condition property="symfony.prod">
+            <equals arg1="${env.APP_ENV}" arg2="prod"/>
+        </condition>
+        <condition property="symfony.dev">
+            <equals arg1="${env.APP_ENV}" arg2="dev"/>
+        </condition>
+    </target>
+
+    <target name="symfony4-webpack:build:prod"
             depends="yarn-check"
             if="yarn.available">
         <exec executable="${yarn}">
@@ -33,6 +54,18 @@
         </exec>
     </target>
 
+    <target name="symfony4-webpack:build:dev"
+            depends="yarn-check"
+            if="yarn.available">
+        <exec executable="${yarn}">
+            <arg value="install" />
+        </exec>
+        <exec executable="${yarn}">
+            <arg value="encore" />
+            <arg value="dev" />
+        </exec>
+    </target>
+
     <target name="symfony4-schema:update">
         <exec executable="${symfony4-console}">
             <arg value="doctrine:schema:update" />
@@ -49,4 +82,4 @@
             <arg value = "var" />
         </exec>
     </target>
-</project>
\ No newline at end of file
+</project>

From 27327c60e1b3a84bd9b1eae11b0f3d5c460a3326 Mon Sep 17 00:00:00 2001
From: Diego Hervas <diego.diguin91@gmail.com>
Date: Wed, 21 Feb 2018 12:22:40 +0100
Subject: [PATCH 5/9] Get access to environment variables

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

diff --git a/build.symfony4.xml b/build.symfony4.xml
index c9c4c86..6846f03 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -4,6 +4,7 @@
     <!-- symfony console location -->
     <property name="symfony4-console" value="bin/console" />
     <property name="yarn" value="/usr/bin/yarn" />
+    <property environment="env"/>
 
     <!-- Check if symfony is available -->
     <target name="symfony4-check">

From 5dc0e44c37460d62d3883cc016305fb59742ef43 Mon Sep 17 00:00:00 2001
From: Jop Peters <jop@mastercoding.nl>
Date: Sun, 1 Apr 2018 00:21:43 +0200
Subject: [PATCH 6/9] php version

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

diff --git a/build.xdebug.xml b/build.xdebug.xml
index 89c57dc..3cfc5fd 100644
--- a/build.xdebug.xml
+++ b/build.xdebug.xml
@@ -4,7 +4,7 @@
     <!-- Disable xdebug for faster execution of some tasks-->
     <target name = "xdebug-disable">
         <exec executable="rm">
-            <arg value = "/etc/php/7.1/cli/conf.d/20-xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/cli/conf.d/20-xdebug.ini" />
             <arg value = "--force" />
         </exec>
     </target>
@@ -14,8 +14,8 @@
         <antcall target = "xdebug-disable" />
         <exec executable="ln">
             <arg value = "-s" />
-            <arg value = "/etc/php/7.1/mods-available/xdebug.ini" />
-            <arg value = "/etc/php/7.1/cli/conf.d/20-xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/mods-available/xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/cli/conf.d/20-xdebug.ini" />
         </exec>
     </target>
 </project>
\ No newline at end of file

From 4e34b0ea4dd7355e7b8cb7cdb83fe550d8eb3d7d Mon Sep 17 00:00:00 2001
From: Diego Hervas <diego.diguin91@gmail.com>
Date: Thu, 13 Sep 2018 13:27:51 +0200
Subject: [PATCH 7/9] Add webpack execution for test environment

---
 build.symfony4.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.symfony4.xml b/build.symfony4.xml
index 6846f03..7c3802c 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -26,6 +26,7 @@
     <target name="symfony4-webpack:build">
         <antcall target="symfony4-webpack:build:prod-with-check"/>
         <antcall target="symfony4-webpack:build:dev-with-check"/>
+        <antcall target="symfony4-webpack:build:test-with-check"/>
     </target>
 
     <target name="symfony4-webpack:build:prod-with-check" depends="symfony-environment-check" if="symfony.prod">
@@ -34,6 +35,9 @@
     <target name="symfony4-webpack:build:dev-with-check" depends="symfony-environment-check" if="symfony.dev">
         <antcall target="symfony4-webpack:build:dev"/>
     </target>
+    <target name="symfony4-webpack:build:test-with-check" depends="symfony-environment-check" if="symfony.test">
+        <antcall target="symfony4-webpack:build:test"/>
+    </target>
 
     <target name="symfony-environment-check">
         <condition property="symfony.prod">

From 6943507f83388807814c801c40fb97dd90c41fe6 Mon Sep 17 00:00:00 2001
From: Diego Hervas <diego.diguin91@gmail.com>
Date: Thu, 13 Sep 2018 13:40:58 +0200
Subject: [PATCH 8/9] Add symfony test condition

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

diff --git a/build.symfony4.xml b/build.symfony4.xml
index 7c3802c..d3e9e2a 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -46,6 +46,9 @@
         <condition property="symfony.dev">
             <equals arg1="${env.APP_ENV}" arg2="dev"/>
         </condition>
+        <condition property="symfony.test">
+            <equals arg1="${env.APP_ENV}" arg2="test"/>
+        </condition>
     </target>
 
     <target name="symfony4-webpack:build:prod"

From 803562b2fc51a9f11464a3a4d8f97c34f56d62ad Mon Sep 17 00:00:00 2001
From: Diego Hervas <diego.diguin91@gmail.com>
Date: Thu, 13 Sep 2018 13:48:36 +0200
Subject: [PATCH 9/9] Fix web pack test

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

diff --git a/build.symfony4.xml b/build.symfony4.xml
index d3e9e2a..060a290 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -36,7 +36,7 @@
         <antcall target="symfony4-webpack:build:dev"/>
     </target>
     <target name="symfony4-webpack:build:test-with-check" depends="symfony-environment-check" if="symfony.test">
-        <antcall target="symfony4-webpack:build:test"/>
+        <antcall target="symfony4-webpack:build:dev"/>
     </target>
 
     <target name="symfony-environment-check">