Merge branch '3.1.x' into 3.2.x

Conflicts:
	build/build.xml

build/build.xml

@@ -49,7 +49,7 @@
 	-->
 	<target name="composer">
 		<exec dir="phpBB"
-			command="php ../composer.phar install --dev"
+			command="php ../composer.phar install"
 			checkreturn="true"
 			passthru="true" />
 	</target>
@@ -143,6 +143,7 @@
 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
+			<property name="skip-composer" value="true" />
 		</phingcall>
 
 		<phingcall target="clean-diff-dir">
@@ -248,6 +249,9 @@
 			<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
 			<then>
 				<!-- We have non-dev composer dependencies -->
+				<if>
+					<not><isset property="skip-composer" /></not>
+					<then>
 						<exec dir="."
 							command="git ls-tree ${revision} composer.phar"
 							checkreturn="true"
@@ -267,9 +271,15 @@
 									checkreturn="true"
 									passthru="true" />
 								<delete file="${dir}/composer.phar" />
+
+								<phingcall target="clean-vendor-dir">
+									<property name="dir" value="${dir}" />
+								</phingcall>
 							</else>
 						</if>
 					</then>
+				</if>
+			</then>
 			<else>
 				<!-- We do not have composer dependencies, do not ship composer files -->
 				<delete file="${dir}/composer.json" />
@@ -286,10 +296,6 @@
 		<delete dir="${dir}/config/development" />
 		<delete dir="${dir}/config/test" />
 
-		<phingcall target="clean-vendor-dir">
-			<property name="dir" value="${dir}" />
-		</phingcall>
-
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />