Merge pull request #2048 from wallabag/travis-php-7.1

Run PHP 7.1 on Travis

diff --git a/.travis.yml b/.travis.yml
index 7fe15c5f7b64a3f1b269cefdf8996a5561b05be2..1a33198a283ada9edf0a7c446f788eaa6dfc6bef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - nightly
     - hhvm
 
 env:

diff --git a/bin/symfony_requirements b/bin/symfony_requirements
index 7cd559a4517cb0c85fcca8ef3d81b7a143f98f5a..8825a964676ae774fab136ca2670799ec64a415d 100755 (executable)
--- a/bin/symfony_requirements
+++ b/bin/symfony_requirements
@@ -13,7 +13,7 @@ echo '> PHP is using the following php.ini file:'.PHP_EOL;
 if ($iniPath) {
     echo_style('green', '  '.$iniPath);
 } else {
-    echo_style('warning', '  WARNING: No configuration file (php.ini) used by PHP!');
+    echo_style('yellow', '  WARNING: No configuration file (php.ini) used by PHP!');
 }
 
 echo PHP_EOL.PHP_EOL;

diff --git a/composer.json b/composer.json
index f3bd7893ef781e28f9f1e16d9c2b3c7560a77056..c7830a1487d8927f9009bbde8457b59f5d15ca59 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
         "kphoen/rulerz-bundle": "~0.10",
-        "guzzlehttp/guzzle": "^5.2.0",
+        "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "paragonie/random_compat": "~1.0",
         "craue/config-bundle": "~1.4",