diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-03-28 13:18:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-28 13:18:17 +0200 |
commit | 6ae579e43f6a4ffe607a6361191366410d19f806 (patch) | |
tree | b969e6eba21a6347b684c74786a2383f359e785b | |
parent | 90f95027a8c713047fc436bce271cb3e52bc3dee (diff) | |
parent | de0ab52a47ea91f7013d0cacd7240ecdc85026ed (diff) | |
download | wallabag-6ae579e43f6a4ffe607a6361191366410d19f806.tar.gz wallabag-6ae579e43f6a4ffe607a6361191366410d19f806.tar.zst wallabag-6ae579e43f6a4ffe607a6361191366410d19f806.zip |
Merge pull request #2861 from wallabag/2.3-droping-5.5
Dropping PHP 5.5
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | composer.json | 4 | ||||
-rw-r--r-- | docs/de/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 29ca7dc3..77872f49 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -24,7 +24,6 @@ cache: | |||
24 | - $HOME/.npm | 24 | - $HOME/.npm |
25 | 25 | ||
26 | php: | 26 | php: |
27 | - 5.5 | ||
28 | - 5.6 | 27 | - 5.6 |
29 | - 7.0 | 28 | - 7.0 |
30 | - 7.1 | 29 | - 7.1 |
diff --git a/composer.json b/composer.json index c43d2dcf..ed0e30c1 100644 --- a/composer.json +++ b/composer.json | |||
@@ -28,7 +28,7 @@ | |||
28 | "issues": "https://github.com/wallabag/wallabag/issues" | 28 | "issues": "https://github.com/wallabag/wallabag/issues" |
29 | }, | 29 | }, |
30 | "require": { | 30 | "require": { |
31 | "php": ">=5.5.9", | 31 | "php": ">=5.6.0", |
32 | "ext-pcre": "*", | 32 | "ext-pcre": "*", |
33 | "ext-dom": "*", | 33 | "ext-dom": "*", |
34 | "ext-curl": "*", | 34 | "ext-curl": "*", |
@@ -130,7 +130,7 @@ | |||
130 | "config": { | 130 | "config": { |
131 | "bin-dir": "bin", | 131 | "bin-dir": "bin", |
132 | "platform": { | 132 | "platform": { |
133 | "php": "5.5.9" | 133 | "php": "5.6.0" |
134 | } | 134 | } |
135 | }, | 135 | }, |
136 | "minimum-stability": "dev", | 136 | "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 | |||
4 | Voraussetzungen | 4 | Voraussetzungen |
5 | --------------- | 5 | --------------- |
6 | 6 | ||
7 | wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7. | 7 | wallabag ist kompatibel mit **PHP >= 5.6**, inkl. PHP 7. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
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 | |||
4 | Requirements | 4 | Requirements |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag is compatible with PHP >= 5.5, including PHP 7. | 7 | wallabag is compatible with **PHP >= 5.6**, including PHP 7. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
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 | |||
4 | Pré-requis | 4 | Pré-requis |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag est compatible avec PHP >= 5.5, PHP 7 inclus. | 7 | wallabag est compatible avec **PHP >= 5.6**, PHP 7 inclus. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||