From 30bdcc5dc3d987c87e9a4828bc1f218864a584f3 Mon Sep 17 00:00:00 2001
From: Abagail Yost <yabbagail@gmail.com>
Date: Wed, 5 Aug 2015 15:28:38 +1000
Subject: [PATCH] Explicitly don't support PHP7

---
 .travis.yml   | 3 ---
 composer.json | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0f46cd4a..0feb4ce58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ env:
 matrix:
   allow_failures:
     - php: hhvm
-    - php: 7.0
     - php: nightly
 
   include:
@@ -37,8 +36,6 @@ matrix:
       env: DB=MYSQL BEHAT_TEST=1
     - php: 5.3
       env: DB=MYSQL
-    - php: 7.0
-      env: DB=MYSQL
     - php: nightly
       env: DB=MYSQL
     - php: hhvm
diff --git a/composer.json b/composer.json
index 65ee367fc..3f7541eb7 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.2",
+		"php": ">=5.3.2,<7",
 		"composer/installers": "*"
 	},
 	"require-dev": {