Merge branch '6.5' into 7.5

sebastianbergmann · Jan 7, 2019 · be5f758 · be5f758
2 parents d44f244 + a33f8d2
commit be5f758
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/build.xml b/build.xml
@@ -395,10 +395,6 @@
         <exec executable="${basedir}/build/tools/composer">
             <arg value="self-update"/>
         </exec>
-
-        <exec executable="${basedir}/build/tools/php-cs-fixer" taskname="php-cs-fixer" failonerror="true">
-            <arg value="selfupdate"/>
-        </exec>
     </target>
 
     <target name="-phploc" depends="prepare">

diff --git a/phive.xml b/phive.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.24.1" installed="1.25.1" location="./build/tools/phpab" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.12.0" installed="2.14.0" location="./build/tools/php-cs-fixer" copy="true"/>
   <phar name="phpdox" version="^0.11.2" installed="0.11.2" location="./build/tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0.1" installed="4.0.1" location="./build/tools/phploc" copy="true"/>
 </phive>