From c5b02e2f16c318ef27e93d7837ae5b88303e36ad Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Sun, 26 Feb 2017 14:03:14 +0100
Subject: [PATCH] Cleanup

---
 .travis.yml            | 30 +++++++++++++++++-------------
 LICENSE                |  2 +-
 build.xml              | 28 +++++++++++-----------------
 composer.json          |  8 ++++----
 phpunit.xml.dist       | 21 ---------------------
 tests/ExporterTest.php |  4 +++-
 6 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 phpunit.xml.dist

diff --git a/.travis.yml b/.travis.yml
index 657519b..7fc8996 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,27 @@
 language: php
 
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
 php:
-  - 5.3.3
   - 5.3
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
+  - 7.0
+  - 7.0snapshot
+  - 7.1
+  - 7.1snapshot
+  - master
+
+sudo: false
+
+before_install:
+  - composer self-update
+  - composer clear-cache
+
+install:
+  - travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable
+
+script:
+  - ./vendor/bin/phpunit
 
 notifications:
   email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/LICENSE b/LICENSE
index 55a13d4..de602c1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Exporter
 
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2002-2017, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/build.xml b/build.xml
index e66a71a..489b986 100644
--- a/build.xml
+++ b/build.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="exporter">
+<project name="exporter" default="setup">
+ <target name="setup" depends="clean,composer"/>
+
  <target name="clean" description="Cleanup build artifacts">
   <delete dir="${basedir}/vendor"/>
   <delete file="${basedir}/composer.lock"/>
  </target>
 
  <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
+  <exec executable="composer" taskname="composer">
+   <arg value="update"/>
+   <arg value="--no-interaction"/>
+   <arg value="--no-progress"/>
+   <arg value="--no-ansi"/>
+   <arg value="--no-suggest"/>
+   <arg value="--optimize-autoloader"/>
+   <arg value="--prefer-stable"/>
   </exec>
  </target>
 </project>
-
diff --git a/composer.json b/composer.json
index 62b94bd..891568c 100644
--- a/composer.json
+++ b/composer.json
@@ -27,11 +27,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "sebastian/recursion-context": "~1.0"
+        "php": "^5.3.3 || ^7.0",
+        "sebastian/recursion-context": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
+        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0",
         "ext-mbstring": "*"
     },
     "autoload": {
@@ -41,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3.x-dev"
+            "dev-master": "1.2.x-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 8d85af6..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         forceCoversAnnotation="true"
-         verbose="true">
- <testsuites>
-  <testsuite name="exporter">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
-
diff --git a/tests/ExporterTest.php b/tests/ExporterTest.php
index b0546f1..f7aba6d 100644
--- a/tests/ExporterTest.php
+++ b/tests/ExporterTest.php
@@ -10,10 +10,12 @@
 
 namespace SebastianBergmann\Exporter;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers SebastianBergmann\Exporter\Exporter
  */
-class ExporterTest extends \PHPUnit_Framework_TestCase
+class ExporterTest extends TestCase
 {
     /**
      * @var Exporter