From 14cc437ea093d053bd894de73eca1433def92ef4 Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Thu, 7 Apr 2016 10:10:25 +0200
Subject: [PATCH 1/3] Add support for Drupal 8.1.

---
 composer.json                | 4 ++--
 doc/_static/composer.json.d8 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index e1241894..86262e84 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
     "behat/behat": "~3.1.0-rc2",
     "behat/mink-extension": "~2.0",
     "drupal/drupal-driver": "dev-master",
-    "symfony/dependency-injection": "2.7.*",
-    "symfony/event-dispatcher": "2.7.*"
+    "symfony/dependency-injection": "~2.7",
+    "symfony/event-dispatcher": "~2.7"
   },
   "require-dev": {
     "phpspec/phpspec": "~2.0",
diff --git a/doc/_static/composer.json.d8 b/doc/_static/composer.json.d8
index f7ec30f4..482b76ef 100644
--- a/doc/_static/composer.json.d8
+++ b/doc/_static/composer.json.d8
@@ -19,8 +19,8 @@
     "behat/mink-extension": "~2.0",
     "drupal/drupal-driver": "dev-master",
     "guzzlehttp/guzzle" : "^6.0@dev",
-    "symfony/dependency-injection": "2.8.2",
-    "symfony/event-dispatcher": "2.8.2"
+    "symfony/dependency-injection": "~2.8.2",
+    "symfony/event-dispatcher": "~2.8.2"
   },
   "require-dev": {
     "phpspec/phpspec": "~2.0",

From 7aebed731b1480b8e84ced440c5cdfd89223b8cb Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Fri, 8 Apr 2016 16:59:13 +0300
Subject: [PATCH 2/3] Stick to the same version as Drupal core uses for now.

There are some compatibility problems between Symfony 2.8.2 and higher.

See https://www.drupal.org/node/2702677.

This partially reverts 14cc437ea093d053bd894de73eca1433def92ef4.
---
 doc/_static/composer.json.d8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/_static/composer.json.d8 b/doc/_static/composer.json.d8
index 482b76ef..f7ec30f4 100644
--- a/doc/_static/composer.json.d8
+++ b/doc/_static/composer.json.d8
@@ -19,8 +19,8 @@
     "behat/mink-extension": "~2.0",
     "drupal/drupal-driver": "dev-master",
     "guzzlehttp/guzzle" : "^6.0@dev",
-    "symfony/dependency-injection": "~2.8.2",
-    "symfony/event-dispatcher": "~2.8.2"
+    "symfony/dependency-injection": "2.8.2",
+    "symfony/event-dispatcher": "2.8.2"
   },
   "require-dev": {
     "phpspec/phpspec": "~2.0",

From 156e36891687dd5775e9a1d8bcbd4eb27df08649 Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Fri, 8 Apr 2016 17:45:33 +0300
Subject: [PATCH 3/3] Stick with Drush 8 for now.

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

diff --git a/.travis.yml b/.travis.yml
index 16449209..5a324f48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ install:
   - test ${DRUPAL_VERSION} -ne 8 || (cp doc/_static/composer.json.d8 ./composer.json && composer require --prefer-source drush-ops/behat-drush-endpoint drupal/drupal-driver:dev-master)
   - composer install
   # Drush version must vary depending on environment and version of core.
-  - test ${TRAVIS_PHP_VERSION} == "5.3" && composer global require drush/drush:~6.0 || composer global require drush/drush:dev-master
+  - test ${TRAVIS_PHP_VERSION} == "5.3" && composer global require drush/drush:~6.0 || composer global require drush/drush:~8.0
   # Install the Behat Drush Endpoint for Drupal 7 tests.
   - test ${DRUPAL_VERSION} -ne 7 || (git clone https://github.com/drush-ops/behat-drush-endpoint.git drush/behat-drush-endpoint && (cd drush/behat-drush-endpoint && composer install))
   # PHP 5.3 requires the cgi extension for runserver.