Merge branch 'master' into v1.0.0-dev, resolving conflicts

# Conflicts: # composer.json
tedious · Feb 1, 2016 · b10e2f5 · b10e2f5
2 parents 6415e06 + 3489b13
commit b10e2f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,11 @@
 
 * Fixed bug where the default filesystem driver path would be created even when a path was specified.
 
+* Updated development dependencies.
+
+* Required PHP7 tests to pass.
+
+
 ### 0.13.1
 
 * Dropped support for PHP 5.3.

diff --git a/composer.json b/composer.json
@@ -25,13 +25,13 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
+    "php": "^5.4|^7.0",
     "psr/cache": "~1.0"
   },
   "require-dev": {
     "fabpot/php-cs-fixer": "^1.9",
     "phpunit/phpunit": "4.8.*",
-    "satooshi/php-coveralls": "dev-master"
+    "satooshi/php-coveralls": "1.0.*"
   },
   "autoload": {
     "psr-4": {