Commit d2058ee1 authored by Klaus Weidenbach's avatar Klaus Weidenbach
Browse files

Update SimplePie library to 1.5.

There is a new stable release, so upgrade from the dev branch to the new
1.5 release.
parent d6a3f776
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"pixel418/markdownify": "^2.2", "pixel418/markdownify": "^2.2",
"bshaffer/oauth2-server-php": "^1.9", "bshaffer/oauth2-server-php": "^1.9",
"ezyang/htmlpurifier": "^4.9", "ezyang/htmlpurifier": "^4.9",
"simplepie/simplepie": ">=1.4.4 || dev-master" "simplepie/simplepie": "~1.5"
}, },
"require-dev" : { "require-dev" : {
"php" : ">=7.0", "php" : ">=7.0",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "62261cde663585403a8dd8fda5b85a95", "content-hash": "21511c39f481ecdc20210f885d840787",
"packages": [ "packages": [
{ {
"name": "bshaffer/oauth2-server-php", "name": "bshaffer/oauth2-server-php",
...@@ -671,16 +671,16 @@ ...@@ -671,16 +671,16 @@
}, },
{ {
"name": "simplepie/simplepie", "name": "simplepie/simplepie",
"version": "dev-master", "version": "1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/simplepie/simplepie.git", "url": "https://github.com/simplepie/simplepie.git",
"reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d" "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/59e7204610d3a8989822eba1c0cbf1d1680bd10d", "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab",
"reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d", "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -727,10 +727,10 @@ ...@@ -727,10 +727,10 @@
"rss" "rss"
], ],
"support": { "support": {
"source": "https://github.com/simplepie/simplepie/tree/master", "source": "https://github.com/simplepie/simplepie/tree/1.5",
"issues": "https://github.com/simplepie/simplepie/issues" "issues": "https://github.com/simplepie/simplepie/issues"
}, },
"time": "2017-04-06 03:36:48" "time": "2017-04-17T07:29:31+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
...@@ -3675,7 +3675,6 @@ ...@@ -3675,7 +3675,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"simplepie/simplepie": 20,
"behat/behat": 0, "behat/behat": 0,
"behat/mink-extension": 0, "behat/mink-extension": 0,
"behat/mink-goutte-driver": 0 "behat/mink-goutte-driver": 0
......
...@@ -840,6 +840,7 @@ return array( ...@@ -840,6 +840,7 @@ return array(
'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php',
'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php', 'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php',
'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php', 'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php',
'Zotlabs\\Module\\Ofeed' => $baseDir . '/Zotlabs/Module/Ofeed.php',
'Zotlabs\\Module\\Online' => $baseDir . '/Zotlabs/Module/Online.php', 'Zotlabs\\Module\\Online' => $baseDir . '/Zotlabs/Module/Online.php',
'Zotlabs\\Module\\Page' => $baseDir . '/Zotlabs/Module/Page.php', 'Zotlabs\\Module\\Page' => $baseDir . '/Zotlabs/Module/Page.php',
'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php', 'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php',
......
...@@ -977,6 +977,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d ...@@ -977,6 +977,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php',
'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php', 'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php',
'Zotlabs\\Module\\Oexchange' => __DIR__ . '/../..' . '/Zotlabs/Module/Oexchange.php', 'Zotlabs\\Module\\Oexchange' => __DIR__ . '/../..' . '/Zotlabs/Module/Oexchange.php',
'Zotlabs\\Module\\Ofeed' => __DIR__ . '/../..' . '/Zotlabs/Module/Ofeed.php',
'Zotlabs\\Module\\Online' => __DIR__ . '/../..' . '/Zotlabs/Module/Online.php', 'Zotlabs\\Module\\Online' => __DIR__ . '/../..' . '/Zotlabs/Module/Online.php',
'Zotlabs\\Module\\Page' => __DIR__ . '/../..' . '/Zotlabs/Module/Page.php', 'Zotlabs\\Module\\Page' => __DIR__ . '/../..' . '/Zotlabs/Module/Page.php',
'Zotlabs\\Module\\Pconfig' => __DIR__ . '/../..' . '/Zotlabs/Module/Pconfig.php', 'Zotlabs\\Module\\Pconfig' => __DIR__ . '/../..' . '/Zotlabs/Module/Pconfig.php',
......
...@@ -686,17 +686,17 @@ ...@@ -686,17 +686,17 @@
}, },
{ {
"name": "simplepie/simplepie", "name": "simplepie/simplepie",
"version": "dev-master", "version": "1.5",
"version_normalized": "9999999-dev", "version_normalized": "1.5.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/simplepie/simplepie.git", "url": "https://github.com/simplepie/simplepie.git",
"reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d" "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/59e7204610d3a8989822eba1c0cbf1d1680bd10d", "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab",
"reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d", "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -708,7 +708,7 @@ ...@@ -708,7 +708,7 @@
"suggest": { "suggest": {
"mf2/mf2": "Microformat module that allows for parsing HTML for microformats" "mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
}, },
"time": "2017-04-06T03:36:48+00:00", "time": "2017-04-17T07:29:31+00:00",
"type": "library", "type": "library",
"installation-source": "source", "installation-source": "source",
"autoload": { "autoload": {
...@@ -745,7 +745,7 @@ ...@@ -745,7 +745,7 @@
"rss" "rss"
], ],
"support": { "support": {
"source": "https://github.com/simplepie/simplepie/tree/master", "source": "https://github.com/simplepie/simplepie/tree/1.5",
"issues": "https://github.com/simplepie/simplepie/issues" "issues": "https://github.com/simplepie/simplepie/issues"
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* A PHP-Based RSS and Atom Feed Framework. * A PHP-Based RSS and Atom Feed Framework.
* Takes the hard work out of managing a complete RSS/Atom solution. * Takes the hard work out of managing a complete RSS/Atom solution.
* *
* Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors * Copyright (c) 2004-2017, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* @package SimplePie * @package SimplePie
* @version 1.4.3 * @version 1.5
* @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue * @copyright 2004-2017 Ryan Parman, Geoffrey Sneddon, Ryan McCue
* @author Ryan Parman * @author Ryan Parman
* @author Geoffrey Sneddon * @author Geoffrey Sneddon
* @author Ryan McCue * @author Ryan McCue
...@@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie'); ...@@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie');
/** /**
* SimplePie Version * SimplePie Version
*/ */
define('SIMPLEPIE_VERSION', '1.4.3'); define('SIMPLEPIE_VERSION', '1.5');
/** /**
* SimplePie Build * SimplePie Build
......
...@@ -56,7 +56,7 @@ class SimplePie_Category ...@@ -56,7 +56,7 @@ class SimplePie_Category
/** /**
* Category identifier * Category identifier
* *
* @var string * @var string|null
* @see get_term * @see get_term
*/ */
var $term; var $term;
...@@ -64,7 +64,7 @@ class SimplePie_Category ...@@ -64,7 +64,7 @@ class SimplePie_Category
/** /**
* Categorization scheme identifier * Categorization scheme identifier
* *
* @var string * @var string|null
* @see get_scheme() * @see get_scheme()
*/ */
var $scheme; var $scheme;
...@@ -72,23 +72,36 @@ class SimplePie_Category ...@@ -72,23 +72,36 @@ class SimplePie_Category
/** /**
* Human readable label * Human readable label
* *
* @var string * @var string|null
* @see get_label() * @see get_label()
*/ */
var $label; var $label;
/**
* Category type
*
* category for <category>
* subject for <dc:subject>
*
* @var string|null
* @see get_type()
*/
var $type;
/** /**
* Constructor, used to input the data * Constructor, used to input the data
* *
* @param string $term * @param string|null $term
* @param string $scheme * @param string|null $scheme
* @param string $label * @param string|null $label
* @param string|null $type
*/ */
public function __construct($term = null, $scheme = null, $label = null) public function __construct($term = null, $scheme = null, $label = null, $type = null)
{ {
$this->term = $term; $this->term = $term;
$this->scheme = $scheme; $this->scheme = $scheme;
$this->label = $label; $this->label = $label;
$this->type = $type;
} }
/** /**
...@@ -109,14 +122,7 @@ class SimplePie_Category ...@@ -109,14 +122,7 @@ class SimplePie_Category
*/ */
public function get_term() public function get_term()
{ {
if ($this->term !== null) return $this->term;
{
return $this->term;
}
else
{
return null;
}
} }
/** /**
...@@ -126,31 +132,32 @@ class SimplePie_Category ...@@ -126,31 +132,32 @@ class SimplePie_Category
*/ */
public function get_scheme() public function get_scheme()
{ {
if ($this->scheme !== null) return $this->scheme;
{
return $this->scheme;
}
else
{
return null;
}
} }
/** /**
* Get the human readable label * Get the human readable label
* *
* @param bool $strict
* @return string|null * @return string|null
*/ */
public function get_label() public function get_label($strict = false)
{ {
if ($this->label !== null) if ($this->label === null && $strict !== true)
{
return $this->label;
}
else
{ {
return $this->get_term(); return $this->get_term();
} }
return $this->label;
}
/**
* Get the category type
*
* @return string|null
*/
public function get_type()
{
return $this->type;
} }
} }
...@@ -206,9 +206,10 @@ class SimplePie_Item ...@@ -206,9 +206,10 @@ class SimplePie_Item
* *
* @since Beta 2 * @since Beta 2
* @param boolean $hash Should we force using a hash instead of the supplied ID? * @param boolean $hash Should we force using a hash instead of the supplied ID?
* @return string * @param string|false $fn User-supplied function to generate an hash
* @return string|null
*/ */
public function get_id($hash = false, $fn = '') public function get_id($hash = false, $fn = 'md5')
{ {
if (!$hash) if (!$hash)
{ {
...@@ -237,7 +238,15 @@ class SimplePie_Item ...@@ -237,7 +238,15 @@ class SimplePie_Item
return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT); return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
} }
} }
if ($fn === '' || !is_callable($fn)) $fn = 'md5'; if ($fn === false)
{
return null;
}
elseif (!is_callable($fn))
{
trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
$fn = 'md5';
}
return call_user_func($fn, return call_user_func($fn,
$this->get_permalink().$this->get_title().$this->get_content()); $this->get_permalink().$this->get_title().$this->get_content());
} }
...@@ -460,7 +469,8 @@ class SimplePie_Item ...@@ -460,7 +469,8 @@ class SimplePie_Item
{ {
$categories = array(); $categories = array();
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category) $type = 'category';
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, $type) as $category)
{ {
$term = null; $term = null;
$scheme = null; $scheme = null;
...@@ -477,9 +487,9 @@ class SimplePie_Item ...@@ -477,9 +487,9 @@ class SimplePie_Item
{ {
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_HTML); $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_HTML);
} }
$categories[] = $this->registry->create('Category', array($term, $scheme, $label)); $categories[] = $this->registry->create('Category', array($term, $scheme, $label, $type));
} }
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, $type) as $category)
{ {
// This is really the label, but keep this as the term also for BC. // This is really the label, but keep this as the term also for BC.
// Label will also work on retrieving because that falls back to term. // Label will also work on retrieving because that falls back to term.
...@@ -492,15 +502,17 @@ class SimplePie_Item ...@@ -492,15 +502,17 @@ class SimplePie_Item
{ {
$scheme = null; $scheme = null;
} }
$categories[] = $this->registry->create('Category', array($term, $scheme, null)); $categories[] = $this->registry->create('Category', array($term, $scheme, null, $type));
} }
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
$type = 'subject';
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, $type) as $category)
{ {
$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null)); $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null, $type));
} }
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, $type) as $category)
{ {
$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null)); $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null, $type));
} }
if (!empty($categories)) if (!empty($categories))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment