From c0c9df7b0e33bae8489b52a2e8c65d70708fe539 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 3 Apr 2017 12:54:44 +0900
Subject: [PATCH] Pin PHPUnit version to avoid breaking unit tests for PHP 7+

---
 .gitignore    | 1 -
 composer.json | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95935f798..72b88e68a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Composer stuff
 vendor/
-composer.lock
 tests/cov/
 tests/temp
 
diff --git a/composer.json b/composer.json
index cfa4a712d..3776b81e1 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,8 @@
         "sabre/xml"    : ">=1.5 <3.0"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "*",
-        "sabre/cs"        : "^1.0.0"
+        "sabre/cs"        : "^1.0.0",
+        "phpunit/phpunit": "^5.7"
 
     },
     "suggest" : {