aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-15 10:04:05 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-15 10:04:05 +0100
commit423ab02846286f94276d21e38ca1e296646618bf (patch)
tree5bce7bb86f6a0356023733571e356cbb4da271f9
parentcbfdcff2615e901bdc434d06f38a3da8eecbdf8b (diff)
downloadShaarli-423ab02846286f94276d21e38ca1e296646618bf.tar.gz
Shaarli-423ab02846286f94276d21e38ca1e296646618bf.tar.zst
Shaarli-423ab02846286f94276d21e38ca1e296646618bf.zip
PHP requirement increased to PHP 5.5 - See #599
-rw-r--r--.travis.yml2
-rw-r--r--CHANGELOG.md2
-rw-r--r--composer.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 9ffb3d00..88cc827d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ php:
7 - 7.0 7 - 7.0
8 - 5.6 8 - 5.6
9 - 5.5 9 - 5.5
10 - 5.4
11 - 5.3
12install: 10install:
13 - composer self-update 11 - composer self-update
14 - composer install --prefer-dist 12 - composer install --prefer-dist
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d5436c..cf5a85e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7 7
8## [v0.9.0](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0) - UNPUBLISHED 8## [v0.9.0](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0) - UNPUBLISHED
9 9
10**WARNING**: Shaarli now requires PHP 5.5+.
11
10### Added 12### Added
11 13
12### Changed 14### Changed
diff --git a/composer.json b/composer.json
index f7d26a31..40b725d3 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
10 }, 10 },
11 "keywords": ["bookmark", "link", "share", "web"], 11 "keywords": ["bookmark", "link", "share", "web"],
12 "require": { 12 "require": {
13 "php": ">=5.3.4", 13 "php": ">=5.5",
14 "shaarli/netscape-bookmark-parser": "1.*", 14 "shaarli/netscape-bookmark-parser": "1.*",
15 "erusev/parsedown": "1.6" 15 "erusev/parsedown": "1.6"
16 }, 16 },