Merge pull request #19 from henkelund/1.3.1

1.3.1
fnogatz · Oct 22, 2017 · 770c791 · 770c791
2 parents 81f1db0 + d390f06
commit 770c791
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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"],

diff --git 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"