Merge branch '7.2'

sebastianbergmann · Jun 3, 2018 · dac2085 · dac2085
2 parents 4aef2cd + 36caa65
commit dac2085
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 142 deletions.
diff --git a/build.xml b/build.xml
@@ -372,10 +372,21 @@
         <exec executable="${basedir}/build/version.php" outputproperty="version" />
     </target>
 
-    <target name="generate-project-documentation" depends="-phploc,-checkstyle,-phpmd,-phpunit">
+    <target name="generate-project-documentation" depends="-phploc,-checkstyle,-phpunit">
         <exec executable="${basedir}/build/tools/phpdox" dir="${basedir}/build" taskname="phpdox"/>
     </target>
 
+    <target name="update-tools">
+        <exec executable="phive">
+            <arg value="--no-progress"/>
+            <arg value="update"/>
+        </exec>
+
+        <exec executable="${basedir}/build/tools/composer">
+            <arg value="self-update"/>
+        </exec>
+    </target>
+
     <target name="-phploc" depends="prepare">
         <exec executable="${basedir}/build/tools/phploc" output="/dev/null" taskname="phploc">
             <arg value="--count-tests"/>
@@ -395,16 +406,6 @@
         </exec>
     </target>
 
-    <target name="-phpmd" depends="prepare">
-        <exec executable="${basedir}/build/tools/phpmd" taskname="phpmd">
-            <arg path="${basedir}/src"/>
-            <arg value="xml"/>
-            <arg path="${basedir}/build/phpmd.xml"/>
-            <arg value="--reportfile"/>
-            <arg path="${basedir}/build/logfiles/pmd.xml"/>
-        </exec>
-    </target>
-
     <target name="-phpunit" depends="setup">
         <exec executable="${basedir}/phpunit" taskname="phpunit">
             <arg value="--coverage-xml"/>

diff --git a/build/phpcs.xml b/build/phpcs.xml
diff --git a/build/phpdox.xml b/build/phpdox.xml
@@ -11,7 +11,6 @@
                 <source type="git" />
                 <source type="phploc" />
                 <source type="checkstyle" />
-                <source type="pmd" />
                 <source type="phpunit" />
             </enrich>
 

diff --git a/build/phpmd.xml b/build/phpmd.xml
diff --git a/build/tools/php-cs-fixer b/build/tools/php-cs-fixer
diff --git a/build/tools/phpdox b/build/tools/phpdox
diff --git a/build/tools/phpmd b/build/tools/phpmd
diff --git a/phive.xml b/phive.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpab" version="^1.24.1" installed="1.24.1" location="./build/tools/phpab" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.12.0" installed="2.12.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>