From 3a0476605a39a5d41129405314695e6b57d6090e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 15 Oct 2017 22:29:42 +0300
Subject: [PATCH 1/7] add php 7.1/7.2

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bccb184..81d40e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - nightly
   - hhvm
 

From 9821673ab3eb7d4cc98c5f2f7d0f9b0934b6eb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 15 Oct 2017 23:38:06 +0300
Subject: [PATCH 2/7] use build stages

---
 .travis.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81d40e8..a11ce9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,26 @@
 language: php
 sudo: false
+dist: trusty
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - nightly
-  - hhvm
-
-matrix:
+jobs:
   fast_finish: true
   allow_failures:
-    - php: 7.0
-    - php: nightly
-    - php: hhvm
+    - php: "7.0"
+    - php: "7.1"
+    - php: "7.2"
+    - php: "nightly"
+    - php: "hhvm"
+  include:
+    - php: "5.3"
+      dist: precise
+    - php: "5.4"
+    - php: "5.5"
+    - php: "5.6"
+    - php: "7.0"
+    - php: "7.1"
+    - php: "7.2"
+    - php: "nightly"
+    - php: "hhvm"
 
 cache:
   apt: true

From 1f8a8d683bede883b96da5b51e330024f2f83bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 15 Oct 2017 23:44:34 +0300
Subject: [PATCH 3/7] use PHPUnit\Framework\TestCase as base class

this allows testing with newer phpunit
---
 tests/TestCase.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 4a0639d..001ccfb 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -13,8 +13,6 @@
 
 namespace Eventum\RPC\Test;
 
-use PHPUnit_Framework_TestCase;
-
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
 }

From 4f578ce140ba97b89baba566639e4c456d0a05f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 15 Oct 2017 23:52:24 +0300
Subject: [PATCH 4/7] show phpunit version

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a11ce9d..4731413 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ install:
   - composer install --no-interaction --prefer-dist
 
 script:
-  - phpunit -v --debug
+  - phpunit --version
+  - phpunit --verbose
 
 # vim:ts=2:sw=2:et

From a21c007b175db8ec9885daaca9537f798c92b9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 15 Oct 2017 23:58:09 +0300
Subject: [PATCH 5/7] use phpunit from composer

this should pick best compatible version
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4731413..b025d4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ cache:
 
 install:
   - composer install --no-interaction --prefer-dist
+  - composer require --dev phpunit/phpunit
 
 script:
   - phpunit --version

From 74407feaa59d8451ed009a21adf73053e4060aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 16 Oct 2017 00:05:08 +0300
Subject: [PATCH 6/7] test pass on all php platforms

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b025d4c..7abf949 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,6 @@ dist: trusty
 jobs:
   fast_finish: true
   allow_failures:
-    - php: "7.0"
-    - php: "7.1"
-    - php: "7.2"
-    - php: "nightly"
     - php: "hhvm"
   include:
     - php: "5.3"

From eebb94c513116b38ab7b668de1c424e80c27beec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 16 Oct 2017 00:05:21 +0300
Subject: [PATCH 7/7] use phpunit from vendor

otherwise confusing phpunit versions be shown even if the system phpunit
actually runs phpunit from vendor, it reports it's own version
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7abf949..d60bbf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ install:
   - composer require --dev phpunit/phpunit
 
 script:
-  - phpunit --version
-  - phpunit --verbose
+  - vendor/bin/phpunit --version
+  - vendor/bin/phpunit --verbose
 
 # vim:ts=2:sw=2:et