summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornashe <thomas@chauchefoin.fr>2017-07-08 00:38:16 +0100
committernashe <thomas@chauchefoin.fr>2017-07-08 00:38:16 +0100
commit6d86d08e68953733e659892b45d430733977d58a (patch)
tree89fd52d6cb9b854f844f4706bd019a01f0b8e64f
parent07203a1583f2141e1c931ef122f86e10a3fd8009 (diff)
downloadplanet-6d86d08e68953733e659892b45d430733977d58a.tar
planet-6d86d08e68953733e659892b45d430733977d58a.tar.gz
planet-6d86d08e68953733e659892b45d430733977d58a.tar.bz2
planet-6d86d08e68953733e659892b45d430733977d58a.tar.xz
planet-6d86d08e68953733e659892b45d430733977d58a.zip
Require PHP 5.6
Do not try to support EOL versions of PHP.
-rw-r--r--.travis.yml3
-rw-r--r--README.markdown2
-rw-r--r--composer.json10
-rw-r--r--composer.lock200
-rwxr-xr-xinstall.php8
5 files changed, 125 insertions, 98 deletions
diff --git a/.travis.yml b/.travis.yml
index 744698c..d89ed6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
language: php
php:
-- 5.4
-- 5.5
- 5.6
- 7.0
+- 7.1
- hhvm
- nightly
diff --git a/README.markdown b/README.markdown
index 68acf7f..747bea4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,7 +11,7 @@ It does not archive articles, it does not do comments nor votes.
Requirements
------------
-You will need a web hosting with at least PHP 5.4 (PHP 7 is also supported).
+You will need a web hosting with at least PHP 5.6 (PHP 7 is also supported).
If you are installing Moonmoon on a Linux private server (VPS, dedicated host), please not that you
will need to install the package `php-xml`.
diff --git a/composer.json b/composer.json
index 957fa34..4b5e203 100644
--- a/composer.json
+++ b/composer.json
@@ -12,14 +12,13 @@
],
"minimum-stability": "stable",
"require": {
- "php": ">= 5.4",
- "hhvm": "^3.0",
+ "php": "^5.6 || ^7.0",
"mustangostang/spyc": "0.5.1",
"simplepie/simplepie": "1.3.1"
},
"require-dev": {
- "guzzlehttp/guzzle": "5.*",
- "phpunit/phpunit": "^6.1"
+ "guzzlehttp/guzzle": "^6.0",
+ "phpunit/phpunit": "^5.7 || ^6.2"
},
"scripts": {
"test": ""
@@ -32,8 +31,5 @@
"app/lib/lib.opml.php",
"app/lib/Cache.php"
]
- },
- "conflict": {
- "hhvm": "*"
}
}
diff --git a/composer.lock b/composer.lock
index 7ba6c6e..9095acf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "c6bfe66dd36c74b2e37d52f577936119",
+ "content-hash": "b7778e7d1520b44eab8d00cca1a8255c",
"packages": [
{
"name": "mustangostang/spyc",
@@ -165,28 +165,41 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "5.3.1",
+ "version": "6.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8"
+ "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/70f1fa53b71c4647bf2762c09068a95f77e12fb8",
- "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+ "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"shasum": ""
},
"require": {
- "guzzlehttp/ringphp": "^1.1",
- "php": ">=5.4.0"
+ "guzzlehttp/promises": "^1.0",
+ "guzzlehttp/psr7": "^1.4",
+ "php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
- "phpunit/phpunit": "^4.0"
+ "phpunit/phpunit": "^4.0 || ^5.0",
+ "psr/log": "^1.0"
+ },
+ "suggest": {
+ "psr/log": "Required for using the Log middleware"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.2-dev"
+ }
+ },
"autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
"psr-4": {
"GuzzleHttp\\": "src/"
}
@@ -202,7 +215,7 @@
"homepage": "https://github.com/mtdowling"
}
],
- "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+ "description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
@@ -213,44 +226,41 @@
"rest",
"web service"
],
- "time": "2016-07-15T19:28:39+00:00"
+ "time": "2017-06-22T18:50:49+00:00"
},
{
- "name": "guzzlehttp/ringphp",
- "version": "1.1.0",
+ "name": "guzzlehttp/promises",
+ "version": "v1.3.1",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/RingPHP.git",
- "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
- "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
"shasum": ""
},
"require": {
- "guzzlehttp/streams": "~3.0",
- "php": ">=5.4.0",
- "react/promise": "~2.0"
+ "php": ">=5.5.0"
},
"require-dev": {
- "ext-curl": "*",
- "phpunit/phpunit": "~4.0"
- },
- "suggest": {
- "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ "phpunit/phpunit": "^4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
- "GuzzleHttp\\Ring\\": "src/"
- }
+ "GuzzleHttp\\Promise\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -263,25 +273,32 @@
"homepage": "https://github.com/mtdowling"
}
],
- "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
- "time": "2015-05-20T03:37:09+00:00"
+ "description": "Guzzle promises library",
+ "keywords": [
+ "promise"
+ ],
+ "time": "2016-12-20T10:07:11+00:00"
},
{
- "name": "guzzlehttp/streams",
- "version": "3.0.0",
+ "name": "guzzlehttp/psr7",
+ "version": "1.4.2",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/streams.git",
- "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
- "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
@@ -289,13 +306,16 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
- "GuzzleHttp\\Stream\\": "src/"
- }
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -306,15 +326,23 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
}
],
- "description": "Provides a simple abstraction over streams of data",
- "homepage": "http://guzzlephp.org/",
+ "description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
- "Guzzle",
- "stream"
- ],
- "time": "2014-10-12T19:18:40+00:00"
+ "http",
+ "message",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "time": "2017-03-20T17:10:46+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -921,16 +949,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "6.1.4",
+ "version": "6.2.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "42b7f394a8e009516582331b1e03a1aba40175d1"
+ "reference": "fa5711d0559fc4b64deba0702be52d41434cbcb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/42b7f394a8e009516582331b1e03a1aba40175d1",
- "reference": "42b7f394a8e009516582331b1e03a1aba40175d1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa5711d0559fc4b64deba0702be52d41434cbcb7",
+ "reference": "fa5711d0559fc4b64deba0702be52d41434cbcb7",
"shasum": ""
},
"require": {
@@ -975,7 +1003,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.1.x-dev"
+ "dev-master": "6.2.x-dev"
}
},
"autoload": {
@@ -1001,20 +1029,20 @@
"testing",
"xunit"
],
- "time": "2017-05-22T07:45:30+00:00"
+ "time": "2017-07-03T15:54:24+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "eabce450df194817a7d7e27e19013569a903a2bf"
+ "reference": "d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/eabce450df194817a7d7e27e19013569a903a2bf",
- "reference": "eabce450df194817a7d7e27e19013569a903a2bf",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4",
+ "reference": "d8833b396dce9162bb2eb5d59aee5a3ab3cfa5b4",
"shasum": ""
},
"require": {
@@ -1060,36 +1088,35 @@
"mock",
"xunit"
],
- "time": "2017-03-03T06:30:20+00:00"
+ "time": "2017-06-30T08:15:21+00:00"
},
{
- "name": "react/promise",
- "version": "v2.5.1",
+ "name": "psr/http-message",
+ "version": "1.0.1",
"source": {
"type": "git",
- "url": "https://github.com/reactphp/promise.git",
- "reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
- "reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.8"
+ "php": ">=5.3.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "React\\Promise\\": "src/"
- },
- "files": [
- "src/functions_include.php"
- ]
+ "Psr\\Http\\Message\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1097,16 +1124,21 @@
],
"authors": [
{
- "name": "Jan Sorgalla",
- "email": "jsorgalla@gmail.com"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
"keywords": [
- "promise",
- "promises"
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
],
- "time": "2017-03-25T12:08:31+00:00"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -1271,16 +1303,16 @@
},
{
"name": "sebastian/environment",
- "version": "3.0.3",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3"
+ "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3",
- "reference": "02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+ "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
"shasum": ""
},
"require": {
@@ -1292,7 +1324,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "3.1.x-dev"
}
},
"autoload": {
@@ -1317,7 +1349,7 @@
"environment",
"hhvm"
],
- "time": "2017-05-18T10:10:00+00:00"
+ "time": "2017-07-01T08:51:00+00:00"
},
{
"name": "sebastian/exporter",
@@ -1764,7 +1796,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">= 5.4"
+ "php": "^5.6 || ^7.0"
},
"platform-dev": []
}
diff --git a/install.php b/install.php
index 6a206fc..07437d3 100755
--- a/install.php
+++ b/install.php
@@ -48,12 +48,12 @@ if (file_exists(__DIR__ . '/custom/config.yml') && isset($login) && isset($passw
} else {
// We start by malking sure we have PHP5 as a base requirement
- if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
- $strInstall = installStatus('Server is running at least PHP 5.4', 'OK',true);
+ if(version_compare(PHP_VERSION, '5.6.0') >= 0) {
+ $strInstall = installStatus('Server is running at least PHP 5.6', 'OK',true);
$strRecommendation = '';
} else {
- $strInstall = installStatus('Server is running at least PHP 5.4', 'FAIL',false);
- $strRecommendation = '<li>Check your server documentation to activate at least PHP 5.4</li>';
+ $strInstall = installStatus('Server is running at least PHP 5.6', 'FAIL',false);
+ $strRecommendation = '<li>Check your server documentation to activate at least PHP 5.6</li>';
}
// Writable file requirements