From 27d817860419e12449fd3bfa7666ee872846b711 Mon Sep 17 00:00:00 2001
From: Olivier Laviale <olivier.laviale@gmail.com>
Date: Sun, 6 Nov 2016 09:29:11 +0100
Subject: [PATCH] Updated Travis config

---
 .gitattributes   |  6 ++++--
 .travis.yml      | 14 ++++++++++----
 phpunit.xml      | 25 +++++++++++++++++++++++++
 phpunit.xml.dist | 25 -------------------------
 4 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 phpunit.xml
 delete mode 100644 phpunit.xml.dist

diff --git a/.gitattributes b/.gitattributes
index 4723185..ed7c766 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,9 @@
-.coveralls.yml export-ignore
+* text=auto
+
+.editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 Makefile export-ignore
-phpunit.xml.dist export-ignore
+phpunit.xml export-ignore
 tests/ export-ignore
diff --git a/.travis.yml b/.travis.yml
index 511fc7f..407cdfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,17 @@
 sudo: false
 
+cache:
+  directories:
+    - $COMPOSER_CACHE_DIR
+    - $HOME/.composer/cache
+
 language: php
 
 php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 matrix:
@@ -13,12 +19,12 @@ matrix:
     - php: hhvm
 
 before_script:
-  - travis_retry composer self-update
-  - composer require satooshi/php-coveralls --prefer-source
+  - if [[ $TRAVIS_PHP_VERSION != "5.5" ]]; then composer install --prefer-dist; fi
+  - if [[ $TRAVIS_PHP_VERSION = "5.5" ]]; then composer require satooshi/php-coveralls --prefer-dist; fi
 
 script:
   - mkdir -p build/logs
   - phpunit --coverage-clover build/logs/clover.xml
 
-after_script:
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then php vendor/bin/coveralls -v; fi;'
+after_success:
+  - if [[ "$TRAVIS_PHP_VERSION" = "5.5" ]]; then php vendor/bin/coveralls -v; fi
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..4b67cc5
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+	backupStaticAttributes="false"
+	colors="true"
+	convertErrorsToExceptions="true"
+	convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true"
+	processIsolation="false"
+	stopOnFailure="false"
+	syntaxCheck="false"
+	bootstrap="./tests/bootstrap.php"
+>
+	<testsuites>
+		<testsuite name="icanboogie/activerecord">
+			<directory>./tests</directory>
+		</testsuite>
+	</testsuites>
+
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">./lib</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 3e2eb69..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="ActiveRecord Test Suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
-</phpunit>