Merge branch '4.0'

Author: sebastianbergmann

.gitignore

@@ -1,12 +1,6 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
 /tests/_files/tmp
 /vendor
 /composer.lock
-/composer.phar
 /.idea
 /.php_cs.cache
+

.travis.yml

@@ -1,21 +1,28 @@
 language: php
 
 php:
-    - 7.0
-    - 7.1
-    - nightly
+  - 7.0
+  - 7.1
+  - nightly
+
+env:
+  matrix:
+    - DEPENDENCIES="high"
+    - DEPENDENCIES="low"
 
 sudo: false
 
 before_install:
-    - composer self-update
+  - composer self-update
+  - composer clear-cache
 
 install:
-    - travis_retry composer install --no-interaction --prefer-source
+  - if [[ "$DEPENDENCIES" = 'high' ]]; then travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable; fi
+  - if [[ "$DEPENDENCIES" = 'low' ]]; then travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable --prefer-lowest; fi
 
 script:
 
-    - vendor/bin/phpunit --configuration build
+  - vendor/bin/phpunit
 
 notifications:
   email: false

build.xml

@@ -9,7 +9,6 @@
 
     <target name="composer" depends="clean" description="Install dependencies with Composer">
         <exec executable="composer" taskname="composer">
-            <env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
             <arg value="update"/>
             <arg value="--no-interaction"/>
             <arg value="--no-progress"/>

build/phpunit.xml renamed to phpunit.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.3/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
          backupGlobals="false"
          verbose="true">
     <testsuite>
-        <directory suffix="Test.php">../tests/tests</directory>
+        <directory suffix="Test.php">tests/tests</directory>
     </testsuite>
 
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">../src</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>
+