From: Jérémy Benoist Date: Tue, 28 Mar 2017 11:18:17 +0000 (+0200) Subject: Merge pull request #2861 from wallabag/2.3-droping-5.5 X-Git-Tag: 2.3.0~31^2~127^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=6ae579e43f6a4ffe607a6361191366410d19f806;hp=90f95027a8c713047fc436bce271cb3e52bc3dee;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2861 from wallabag/2.3-droping-5.5 Dropping PHP 5.5 --- diff --git a/.travis.yml b/.travis.yml index 29ca7dc3..77872f49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ cache: - $HOME/.npm php: - - 5.5 - 5.6 - 7.0 - 7.1 diff --git a/composer.json b/composer.json index c43d2dcf..ed0e30c1 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.5.9", + "php": ">=5.6.0", "ext-pcre": "*", "ext-dom": "*", "ext-curl": "*", @@ -130,7 +130,7 @@ "config": { "bin-dir": "bin", "platform": { - "php": "5.5.9" + "php": "5.6.0" } }, "minimum-stability": "dev", diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 0de6b6de..8393455a 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -4,7 +4,7 @@ Installation von wallabag Voraussetzungen --------------- -wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7. +wallabag ist kompatibel mit **PHP >= 5.6**, inkl. PHP 7. .. note:: diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 2b730b83..2c4b8749 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -4,7 +4,7 @@ Install wallabag Requirements ------------ -wallabag is compatible with PHP >= 5.5, including PHP 7. +wallabag is compatible with **PHP >= 5.6**, including PHP 7. .. note:: diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 5d29cb01..9dcb0efb 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -4,7 +4,7 @@ Installer wallabag Pré-requis ------------ -wallabag est compatible avec PHP >= 5.5, PHP 7 inclus. +wallabag est compatible avec **PHP >= 5.6**, PHP 7 inclus. .. note::