Merge branch '3.2.x'

* 3.2.x:
  [ticket/14805] Ignore platform requirements while building packages
This commit is contained in:
Tristan Darricau 2016-10-02 17:14:58 +02:00
commit a0c508b926
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -49,7 +49,7 @@
--> -->
<target name="composer"> <target name="composer">
<exec dir="phpBB" <exec dir="phpBB"
command="php ../composer.phar install" command="php ../composer.phar install --ignore-platform-reqs"
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
</target> </target>
@ -267,7 +267,7 @@
command="git archive ${revision} composer.phar | tar -xf - -C ${dir}" command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
checkreturn="true" /> checkreturn="true" />
<exec dir="${dir}" <exec dir="${dir}"
command="php composer.phar install --no-dev --optimize-autoloader" command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
checkreturn="true" checkreturn="true"
passthru="true" /> passthru="true" />
<delete file="${dir}/composer.phar" /> <delete file="${dir}/composer.phar" />