Merge pull request #1 from reinder83/add-trait-support

Add trait support

.gitignore

@@ -7,3 +7,4 @@
 /build/pdepend/
 /build/coverage/
 /cache.properties
+composer.lock

build.xml

@@ -6,26 +6,25 @@
     <property name="phpcpd"   value="${basedir}/vendor/bin/phpcpd"/>
     <property name="phpcbf"   value="${basedir}/vendor/bin/phpcbf"/>
     <property name="phpcs"    value="${basedir}/vendor/bin/phpcs"/>
-    <property name="phpdox"   value="${basedir}/vendor/bin/phpdox"/>
     <property name="phploc"   value="${basedir}/vendor/bin/phploc"/>
     <property name="phpmd"    value="${basedir}/vendor/bin/phpmd"/>
     <property name="composer" value="composer"/> <!-- composer should be installed global -->
     <property name="phpunit"  value="${basedir}/vendor/bin/phpunit"/>
 
     <target name="full-build"
-            depends="prepare,composer,static-analysis,phpunit,phpdox,-check-failure"
+            depends="prepare,composer,static-analysis,phpunit,-check-failure"
             description="Performs static analysis, runs the tests, and generates project documentation"/>
 
     <target name="precommit"
             depends="prepare,composer,phpunit,phpcbf,phpcs,phpcpd,phpmd,displayresult"
             description="Performs precommit checks"/>
 
     <target name="full-build-parallel"
-            depends="prepare,composer,static-analysis-parallel,phpunit,phpdox,-check-failure"
+            depends="prepare,composer,static-analysis-parallel,phpunit,-check-failure"
             description="Performs static analysis (executing the tools in parallel), runs the tests, and generates project documentation"/>
 
     <target name="travis"
-            depends="prepare,lint,phpunit-travis"
+            depends="prepare,composer,lint,phpunit-travis"
             description="Build specific for Travis CI" />
 
     <target name="quick-build"
@@ -59,7 +58,6 @@
         <delete dir="${basedir}/build/coverage"/>
         <delete dir="${basedir}/build/logs"/>
         <delete dir="${basedir}/build/pdepend"/>
-        <delete dir="${basedir}/build/phpdox"/>
         <property name="clean.done" value="true"/>
     </target>
 
@@ -71,7 +69,6 @@
         <mkdir dir="${basedir}/build/coverage"/>
         <mkdir dir="${basedir}/build/logs"/>
         <mkdir dir="${basedir}/build/pdepend"/>
-        <mkdir dir="${basedir}/build/phpdox"/>
         <property name="prepare.done" value="true"/>
     </target>
 
@@ -272,15 +269,6 @@
         <property name="phpunit.done" value="true"/>
     </target>
 
-    <target name="phpdox"
-            unless="phpdox.done"
-            depends="phploc-ci,phpcs-ci,phpmd-ci"
-            description="Generate project documentation using phpDox">
-        <exec executable="${phpdox}" dir="${basedir}/build" taskname="phpdox"/>
-
-        <property name="phpdox.done" value="true"/>
-    </target>
-
     <target name="displayresult"
             description="Display the coverage">
         <exec executable="/usr/bin/open" dir="${basedir}/build" spawn="true">

composer.json

@@ -19,12 +19,10 @@
     "phpmd/phpmd": "@stable",
     "sebastian/phpcpd": "*",
     "squizlabs/php_codesniffer": "2.*",
-    "phpunit/phpunit": "5.5.*",
+    "phpunit/phpunit": "^4.8 || ^5.5",
     "phploc/phploc": "*",
     "pdepend/pdepend": "2.2.4",
     "mayflower/php-codebrowser": "~1.1",
-    "nikic/php-parser": "3.0.x-dev",
-    "theseer/phpdox": "0.9.0",
     "johnkary/phpunit-speedtrap": "^1.0"
   },
   "autoload-dev": {