From 26fcdc7064c15d78a24f3092d775d198552dd825 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sat, 21 Oct 2017 15:03:58 +0200
Subject: [PATCH 1/2] Add PHP 7.1 to composer.json & .travis.yml

---
 .travis.yml   | 11 ++++-------
 composer.json |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a52492..2fe3db2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,15 @@
 language: php
 php:
+  - 7.1
   - 7.0
   - 5.6
 env:
-  - M2_VERSION=2.1.5
-  - M2_VERSION=2.1.3
-  - M2_VERSION=2.1.2
-  - M2_VERSION=2.1.1
-  - M2_VERSION=2.1.0
-  - M2_VERSION=2.0.13
+  - M2_VERSION=2.1.9
+  - M2_VERSION=2.0.16
 matrix:
   include:
     - php: 5.5
-      env: M2_VERSION=2.0.13
+      env: M2_VERSION=2.0.16
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/composer.json b/composer.json
index f7156c0..ecbf2f4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "AGPL-3.0+"
     ],
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0"
+        "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0"
     },
     "autoload": {
         "files": ["registration.php"],

From d390f06b3c928f8004ab0f65f549a1c70bed559e Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sat, 21 Oct 2017 15:59:50 +0200
Subject: [PATCH 2/2] CI build hack for PHP < 7.1 support

---
 dev/ci/build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev/ci/build.sh b/dev/ci/build.sh
index 0958b95..54dcf31 100755
--- a/dev/ci/build.sh
+++ b/dev/ci/build.sh
@@ -57,6 +57,12 @@ set -x
   magento/project-community-edition \
   "$BUILD_DIR" "$M2_VERSION"
 
+# Downgrade doctrine/instantiator for PHP < 7.1 support
+"$COMPOSER_BIN" require \
+  --working-dir="$BUILD_DIR" \
+  --ignore-platform-reqs \
+  doctrine/instantiator:v1.0.5
+
 # Copy module into Magento
 mkdir -p "$(dirname "$MODULE_DST_DIR")"
 cp -r "$MODULE_SRC_DIR" "$MODULE_DST_DIR"