aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-07-19 11:24:26 +0200
committerGitHub <noreply@github.com>2016-07-19 11:24:26 +0200
commit0dc09439efeb01e8c56d3417922aa8fccce01ead (patch)
tree2d3a27d53df6e526171d8eafe2d098aff54a6353
parentab3eb4ba95e156bf5059d0bbb11e2cfde1119a4b (diff)
parent19738973056d027ebe6e55a97c181279b6ad2f60 (diff)
downloadwallabag-0dc09439efeb01e8c56d3417922aa8fccce01ead.tar.gz
wallabag-0dc09439efeb01e8c56d3417922aa8fccce01ead.tar.zst
wallabag-0dc09439efeb01e8c56d3417922aa8fccce01ead.zip
Merge pull request #2048 from wallabag/travis-php-7.1
Run PHP 7.1 on Travis
-rw-r--r--.travis.yml1
-rwxr-xr-xbin/symfony_requirements2
-rw-r--r--composer.json2
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 7fe15c5f..1a33198a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ php:
20 - 5.5 20 - 5.5
21 - 5.6 21 - 5.6
22 - 7.0 22 - 7.0
23 - nightly
23 - hhvm 24 - hhvm
24 25
25env: 26env:
diff --git a/bin/symfony_requirements b/bin/symfony_requirements
index 7cd559a4..8825a964 100755
--- a/bin/symfony_requirements
+++ b/bin/symfony_requirements
@@ -13,7 +13,7 @@ echo '> PHP is using the following php.ini file:'.PHP_EOL;
13if ($iniPath) { 13if ($iniPath) {
14 echo_style('green', ' '.$iniPath); 14 echo_style('green', ' '.$iniPath);
15} else { 15} else {
16 echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!'); 16 echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!');
17} 17}
18 18
19echo PHP_EOL.PHP_EOL; 19echo PHP_EOL.PHP_EOL;
diff --git a/composer.json b/composer.json
index f3bd7893..c7830a14 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
74 "grandt/phpepub": "~4.0", 74 "grandt/phpepub": "~4.0",
75 "wallabag/php-mobi": "~1.0.0", 75 "wallabag/php-mobi": "~1.0.0",
76 "kphoen/rulerz-bundle": "~0.10", 76 "kphoen/rulerz-bundle": "~0.10",
77 "guzzlehttp/guzzle": "^5.2.0", 77 "guzzlehttp/guzzle": "^5.3.1",
78 "doctrine/doctrine-migrations-bundle": "^1.0", 78 "doctrine/doctrine-migrations-bundle": "^1.0",
79 "paragonie/random_compat": "~1.0", 79 "paragonie/random_compat": "~1.0",
80 "craue/config-bundle": "~1.4", 80 "craue/config-bundle": "~1.4",