From 68710bb55a4ca39f31136c29369b49b8ee082c99 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 23 Dec 2012 19:57:30 +0100
Subject: [PATCH 01/11] [ticket/11291] phing: Make sure composer is available
 before calling it.

Older versions of the tree didn't use it.

PHPBB3-11291
---
 build/build.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 28dd36bea8..cd7f8594d4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -162,9 +162,18 @@
 			command="git archive ${revision} | tar -xf - -C ../${dir}"
 			checkreturn="true" />
 
-		<exec dir="${dir}"
-			command="php ../composer.phar install"
-			passthru="true" />
+		<!--
+			Make sure composer is available before calling it.
+			Older versions of the tree didn't use it.
+		-->
+		<if>
+			<available file='${dir}/../composer.phar' type='file' />
+			<then>
+				<exec dir="${dir}"
+					command="php ../composer.phar install"
+					passthru="true" />
+			</then>
+		</if>
 
 		<delete file="${dir}/config.php" />
 		<delete dir="${dir}/develop" />

From f6315dafb78b4164dd1a1be32d2dc3117616df30 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:41:01 +0100
Subject: [PATCH 02/11] [ticket/11291] phing: Correct dependencies of composer
 target.

This command runs composer in the phpBB tree and does not write to the build
folders. Thus, it does not have to depend on prepare and clean targets.

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

diff --git a/build/build.xml b/build/build.xml
index cd7f8594d4..f77635b586 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -43,7 +43,7 @@
 		<delete dir="build/save" />
 	</target>
 
-	<target name="composer" depends="clean,prepare">
+	<target name="composer">
 		<exec dir="./phpBB/"
 			command="php ../composer.phar install"
 			passthru="true" />

From c9cc5a00dcbf8e10daf350591044df1a2aca3a05 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:43:04 +0100
Subject: [PATCH 03/11] [ticket/11291] phing: Add --dev to composer install.

The composer target runs composer in the phpBB tree in order to load
dependencies for testing. The testing framework may have additional
development dependencies (e.g. goutte). We also have to load those.

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

diff --git a/build/build.xml b/build/build.xml
index f77635b586..bc83cc0953 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -45,7 +45,7 @@
 
 	<target name="composer">
 		<exec dir="./phpBB/"
-			command="php ../composer.phar install"
+			command="php ../composer.phar install --dev"
 			passthru="true" />
 	</target>
 

From e775e7fc91817cb353251d2406dea810565ffb18 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:50:18 +0100
Subject: [PATCH 04/11] [ticket/11291] phing: Add description for composer
 target.

PHPBB3-11291
---
 build/build.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index bc83cc0953..56179bbbe2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -43,6 +43,11 @@
 		<delete dir="build/save" />
 	</target>
 
+	<!--
+		This target basically just runs composer in the phpBB tree to ensure
+		all dependencies are loaded. Additional development dependencies are
+		loaded because testing framework may depend on them.
+	-->
 	<target name="composer">
 		<exec dir="./phpBB/"
 			command="php ../composer.phar install --dev"

From 357feeac2ee53570f530c4e53a4ae65bdf934115 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:51:41 +0100
Subject: [PATCH 05/11] [ticket/11291] phing: Adjust directory format of
 composer exec.

Adjust the directory format to what all the other exec calls are using.

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

diff --git a/build/build.xml b/build/build.xml
index 56179bbbe2..8807f77379 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -49,7 +49,7 @@
 		loaded because testing framework may depend on them.
 	-->
 	<target name="composer">
-		<exec dir="./phpBB/"
+		<exec dir="phpBB"
 			command="php ../composer.phar install --dev"
 			passthru="true" />
 	</target>

From 316bfc20c0ff388bf399657af59171e73d7e8cd1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:55:20 +0100
Subject: [PATCH 06/11] [ticket/11291] phing: The package target does not
 depend on composer.

The packaging process does not require running composer in the phpBB tree.
It does however require running composer on the git exports, but this is not
what the composer target does.

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

diff --git a/build/build.xml b/build/build.xml
index 8807f77379..0cddf613f8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -11,7 +11,7 @@
 	<property name="versions" value="${oldversions}, ${newversion}" />
 
 	<!-- These are the main targets which you will probably want to use -->
-	<target name="package" depends="clean,prepare,composer,create-package" />
+	<target name="package" depends="clean,prepare,create-package" />
 	<target name="all" depends="clean,prepare,composer,test,docs,create-package" />
 	<target name="build" depends="clean,prepare,composer,test,docs" />
 

From 370e3c31e86406eef2b5b292782f05fd1bf6c659 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 03:59:55 +0100
Subject: [PATCH 07/11] [ticket/11291] phing: Remove no longer needed
 create-package target.

PHPBB3-11291
---
 build/build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 0cddf613f8..ae36413d2f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -11,8 +11,7 @@
 	<property name="versions" value="${oldversions}, ${newversion}" />
 
 	<!-- These are the main targets which you will probably want to use -->
-	<target name="package" depends="clean,prepare,create-package" />
-	<target name="all" depends="clean,prepare,composer,test,docs,create-package" />
+	<target name="all" depends="clean,prepare,composer,test,docs,package" />
 	<target name="build" depends="clean,prepare,composer,test,docs" />
 
 	<target name="prepare">
@@ -127,7 +126,7 @@
 
 	</target>
 
-	<target name="create-package" depends="prepare-new-version,old-version-diffs">
+	<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
 		<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
 		<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
 

From 46a752ee628fc4b08f2d5e26b159dca41b816277 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 04:38:16 +0100
Subject: [PATCH 08/11] [ticket/11291] phing packaging: Export composer.phar
 and install dependencies.

PHPBB3-11291
---
 build/build.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index ae36413d2f..393343d677 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -167,15 +167,21 @@
 			checkreturn="true" />
 
 		<!--
-			Make sure composer is available before calling it.
-			Older versions of the tree didn't use it.
+			If composer.phar exists in this version of the tree, also export
+			it into ${dir}, install dependencies, then delete it again.
 		-->
+		<exec dir="."
+			command="git ls-tree ${revision} composer.phar"
+			outputProperty='composer-ls-tree-output' />
 		<if>
-			<available file='${dir}/../composer.phar' type='file' />
+			<not><equals arg1="${composer-ls-tree-output}" arg2="" trim="true" /></not>
 			<then>
+				<exec dir="."
+					command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" />
 				<exec dir="${dir}"
-					command="php ../composer.phar install"
+					command="php composer.phar install"
 					passthru="true" />
+				<delete file="${dir}/composer.phar" />
 			</then>
 		</if>
 

From 1fc103e3f322991e1f1877146219b0efeca3f458 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 04:53:33 +0100
Subject: [PATCH 09/11] [ticket/11291] phing: Exclude vendor folder from diffs.

Otherwise we end up with very huge diffs and the build process is severely
slowed down.

PHPBB3-11291
---
 build/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build.xml b/build/build.xml
index 393343d677..df65967e2a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -206,6 +206,7 @@
 		<delete dir="${dir}/files" />
 		<delete dir="${dir}/install" />
 		<delete dir="${dir}/store" />
+		<delete dir="${dir}/vendor" />
 	</target>
 
 </project>

From b36050983d34de0ecdb242816d5d9daf297cfea1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 13:30:25 +0100
Subject: [PATCH 10/11] [ticket/11291] phing: Add checkreturn="true" to all new
 commands.

PHPBB3-11291
---
 build/build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index df65967e2a..25bed7de0c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -172,14 +172,17 @@
 		-->
 		<exec dir="."
 			command="git ls-tree ${revision} composer.phar"
+			checkreturn="true"
 			outputProperty='composer-ls-tree-output' />
 		<if>
 			<not><equals arg1="${composer-ls-tree-output}" arg2="" trim="true" /></not>
 			<then>
 				<exec dir="."
-					command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" />
+					command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
+					checkreturn="true" />
 				<exec dir="${dir}"
 					command="php composer.phar install"
+					checkreturn="true"
 					passthru="true" />
 				<delete file="${dir}/composer.phar" />
 			</then>

From 6951356a87564511595be85f45b9ff88ab495bd0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Dec 2012 13:38:40 +0100
Subject: [PATCH 11/11] [ticket/11291] phing: Also add checkreturn="true" to
 composer execution.

PHPBB3-11291
---
 build/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build.xml b/build/build.xml
index 25bed7de0c..9576407296 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -50,6 +50,7 @@
 	<target name="composer">
 		<exec dir="phpBB"
 			command="php ../composer.phar install --dev"
+			checkreturn="true"
 			passthru="true" />
 	</target>