Merge pull request #342 from jjriv/task/php-7.1

[TASK] Add support for PHP 7.1
MyIntervals · Sep 18, 2016 · df46701 · df46701
2 parents fd6aff7 + 660e3f6
commit df46701
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,8 @@ matrix:
     env: CODE_SNIFFER=yes
   - php: 7.0
     env: CODE_SNIFFER=yes
+  - php: 7.1
+    env: CODE_SNIFFER=yes
   - php: hhvm
     env: CODE_SNIFFER=yes
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## 1.1.0 (unreleased)
 
 ### Added
+- Add support for PHP 7.1
+  ([#342](https://github.com/jjriv/emogrifier/pull/342))
 - Support the attr|=value selector
   ([#337](https://github.com/jjriv/emogrifier/pull/337))
 - Support the attr*=value selector

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.4.0,<=7.1.99"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "2.6.0",