summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornashe <thomas@chauchefoin.fr>2017-07-13 12:40:10 +0100
committernashe <thomas@chauchefoin.fr>2017-07-13 12:40:10 +0100
commit6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014 (patch)
tree646453d98f98dee54e4954cbe525614688201bb9
parentc0b51f5f9621c6063af8677637ea120e9bab8ab5 (diff)
downloadplanet-6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014.tar
planet-6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014.tar.gz
planet-6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014.tar.bz2
planet-6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014.tar.xz
planet-6f3a001bfa95b1a0ee3ecc867d1ab8a52051b014.zip
Update composer.json to use the last version of SimplePie
This version allows us to pass cURL options to SimplePie, this will be needed to correctly handle feeds over SSL/TLS but with invalid certificates.
-rw-r--r--composer.json2
-rw-r--r--composer.lock20
2 files changed, 14 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index 4b5e203..40f96ee 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"require": {
"php": "^5.6 || ^7.0",
"mustangostang/spyc": "0.5.1",
- "simplepie/simplepie": "1.3.1"
+ "simplepie/simplepie": "^1.5"
},
"require-dev": {
"guzzlehttp/guzzle": "^6.0",
diff --git a/composer.lock b/composer.lock
index c1074be..401830d 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": "b7778e7d1520b44eab8d00cca1a8255c",
+ "content-hash": "c383733b0c4add13fca36438730d209b",
"packages": [
{
"name": "mustangostang/spyc",
@@ -55,20 +55,26 @@
},
{
"name": "simplepie/simplepie",
- "version": "1.3.1",
+ "version": "1.5",
"source": {
"type": "git",
"url": "https://github.com/simplepie/simplepie.git",
- "reference": "ce53709778bc1e2e4deda1651b66e5081398d5cc"
+ "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplepie/simplepie/zipball/ce53709778bc1e2e4deda1651b66e5081398d5cc",
- "reference": "ce53709778bc1e2e4deda1651b66e5081398d5cc",
+ "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab",
+ "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4 || ~5"
+ },
+ "suggest": {
+ "mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
},
"type": "library",
"autoload": {
@@ -105,7 +111,7 @@
"feeds",
"rss"
],
- "time": "2012-10-30T17:54:03+00:00"
+ "time": "2017-04-17T07:29:31+00:00"
}
],
"packages-dev": [