diff options
author | Mario Vavti <mario@mariovavti.com> | 2025-02-20 11:29:06 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2025-02-20 11:29:06 +0100 |
commit | d9b262348facf0f5591a73a8f2518ea9e837691e (patch) | |
tree | ffc12e4544b54693b7df1cbaf5705736fe2dd2f0 /vendor/simplepie | |
parent | 5d55006be835d766d49b57afb1afdde2f0f970a4 (diff) | |
download | volse-hubzilla-d9b262348facf0f5591a73a8f2518ea9e837691e.tar.gz volse-hubzilla-d9b262348facf0f5591a73a8f2518ea9e837691e.tar.bz2 volse-hubzilla-d9b262348facf0f5591a73a8f2518ea9e837691e.zip |
update composer libs
Diffstat (limited to 'vendor/simplepie')
77 files changed, 88 insertions, 133 deletions
diff --git a/vendor/simplepie/simplepie/.php-cs-fixer.dist.php b/vendor/simplepie/simplepie/.php-cs-fixer.dist.php index d26f7c6c6..ed111568f 100644 --- a/vendor/simplepie/simplepie/.php-cs-fixer.dist.php +++ b/vendor/simplepie/simplepie/.php-cs-fixer.dist.php @@ -14,6 +14,8 @@ return (new PhpCsFixer\Config()) '@PHP71Migration:risky' => true, 'void_return' => false, '@PHPUnit84Migration:risky' => true, + 'declare_strict_types' => false, ]) + ->setRiskyAllowed(true) ->setFinder($finder) ; diff --git a/vendor/simplepie/simplepie/CHANGELOG.md b/vendor/simplepie/simplepie/CHANGELOG.md index dba92bbf7..afc58588b 100644 --- a/vendor/simplepie/simplepie/CHANGELOG.md +++ b/vendor/simplepie/simplepie/CHANGELOG.md @@ -5,7 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/simplepie/simplepie/compare/1.8.0...master) +## [Unreleased](https://github.com/simplepie/simplepie/compare/1.8.1...one-dot-eight) + +Nothing yet. + +## [1.8.1](https://github.com/simplepie/simplepie/compare/1.8.0...1.8.1) - 2024-10-01 + +### Changed + +- Disable Composer lockfile by @jrfnl in [#887](https://github.com/simplepie/simplepie/pull/887), backported in [#895](https://github.com/simplepie/simplepie/pull/895) + +### Fixed + +- Fixes for PHP 8.4 deprecations by @Girgias, @jrfnl and @jtojnar, backported in [#875](https://github.com/simplepie/simplepie/pull/875) +- Fix locator with website missing `Content-Type` header by @jtojnar in [#891](https://github.com/simplepie/simplepie/pull/891) +- Fix `encode` argument of `SimplePie::strip_htmltags()` @jtojnar in [#894](https://github.com/simplepie/simplepie/pull/894), backported in [#898](https://github.com/simplepie/simplepie/pull/898) +- Reverted `strict_types` by @jtojnar in [#842](https://github.com/simplepie/simplepie/pull/842) ## [1.8.0](https://github.com/simplepie/simplepie/compare/1.7.0...1.8.0) - 2023-01-20 diff --git a/vendor/simplepie/simplepie/README.markdown b/vendor/simplepie/simplepie/README.markdown index 5500f03c2..ee8d08672 100644 --- a/vendor/simplepie/simplepie/README.markdown +++ b/vendor/simplepie/simplepie/README.markdown @@ -18,6 +18,22 @@ Requirements * PCRE support +PSR-16: Caching support +-------------- + +Since SimplePie 1.8.0 you can use the [PSR-16](https://www.php-fig.org/psr/psr-16/) cache from +[Symfony](https://symfony.com/doc/current/components/cache.html) +or [every other implementation](https://packagist.org/providers/psr/simple-cache-implementation). + +```php +$simplepie = new \SimplePie\SimplePie(); +$simplepie->set_cache( + new \Symfony\Component\Cache\Psr16Cache( + new \Symfony\Component\Cache\Adapter\FilesystemAdapter() + ), +); +``` + What comes in the package? -------------------------- 1. `src/` - SimplePie classes for use with the autoloader diff --git a/vendor/simplepie/simplepie/autoloader.php b/vendor/simplepie/simplepie/autoloader.php index a19c25476..b1635ff15 100644 --- a/vendor/simplepie/simplepie/autoloader.php +++ b/vendor/simplepie/simplepie/autoloader.php @@ -88,7 +88,7 @@ spl_autoload_register(array(new SimplePie_Autoloader(), 'autoload')); if (!class_exists('SimplePie')) { - trigger_error('Autoloader not registered properly', E_USER_ERROR); + exit('Autoloader not registered properly'); } /** diff --git a/vendor/simplepie/simplepie/composer.json b/vendor/simplepie/simplepie/composer.json index cfede2b53..f0a800c80 100644 --- a/vendor/simplepie/simplepie/composer.json +++ b/vendor/simplepie/simplepie/composer.json @@ -57,6 +57,7 @@ }, "config": { "bin-dir": "bin", + "lock": false, "sort-packages": true }, "scripts": { diff --git a/vendor/simplepie/simplepie/library/SimplePie.php b/vendor/simplepie/simplepie/library/SimplePie.php index 8a2b334e1..14f5380c2 100755 --- a/vendor/simplepie/simplepie/library/SimplePie.php +++ b/vendor/simplepie/simplepie/library/SimplePie.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Author.php b/vendor/simplepie/simplepie/library/SimplePie/Author.php index 3b3ab50e6..b4b7aaf8d 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Author.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Author.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache.php b/vendor/simplepie/simplepie/library/SimplePie/Cache.php index 9f2883ed6..6e453d510 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php index 2988ce7c8..f59928bb8 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php index 4fb8d2c65..0393df331 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php index cd5646f20..7c224ed38 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php index a5e088f00..3c0cbc653 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php index aef5b953a..ccf68e592 100755 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php index 01ea48cbb..6215e952b 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php index 7d68c9795..6a96c1e29 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php @@ -1,7 +1,5 @@ <?php -declare(strict_types=1); - /** * SimplePie Redis Cache Extension * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Caption.php b/vendor/simplepie/simplepie/library/SimplePie/Caption.php index 6e96e11b2..1f3a475c8 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Caption.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Caption.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Category.php b/vendor/simplepie/simplepie/library/SimplePie/Category.php index 7bdf595df..fad39f069 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Category.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Category.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php index 016755753..dc30fc8c8 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php index fd50d702c..dcb2d4a83 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Core.php b/vendor/simplepie/simplepie/library/SimplePie/Core.php index 7f3313345..5abf38a0a 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Core.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Core.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Credit.php b/vendor/simplepie/simplepie/library/SimplePie/Credit.php index 14a197224..b88c3f484 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Credit.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Credit.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php b/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php index 496c7bf52..dba7688ea 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php index a0e057511..51e75d3d5 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Exception.php b/vendor/simplepie/simplepie/library/SimplePie/Exception.php index 218a8e3c4..5a2a600cb 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Exception.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Exception.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/File.php b/vendor/simplepie/simplepie/library/SimplePie/File.php index 99f14fa6b..803080dd9 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/File.php +++ b/vendor/simplepie/simplepie/library/SimplePie/File.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php index 65f6c9f6d..d70131591 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/IRI.php b/vendor/simplepie/simplepie/library/SimplePie/IRI.php index 561cfca06..b947d63bf 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/IRI.php +++ b/vendor/simplepie/simplepie/library/SimplePie/IRI.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Item.php b/vendor/simplepie/simplepie/library/SimplePie/Item.php index 13c51c3b7..b0d7820b9 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Item.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Item.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Locator.php b/vendor/simplepie/simplepie/library/SimplePie/Locator.php index 77f83d6af..e975851e4 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Locator.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Locator.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Misc.php b/vendor/simplepie/simplepie/library/SimplePie/Misc.php index d357b040c..5f33c3406 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Misc.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Misc.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php index 8d125e3a0..f8b402343 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php index e55c2f468..da1033b0c 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/Parser.php index 1a1ff9ab4..e281e107e 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Rating.php b/vendor/simplepie/simplepie/library/SimplePie/Rating.php index c096850c4..00d99492f 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Rating.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Rating.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Registry.php b/vendor/simplepie/simplepie/library/SimplePie/Registry.php index eaf32c05a..6788c0614 100755 --- a/vendor/simplepie/simplepie/library/SimplePie/Registry.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Registry.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php index 28a1ebfb2..566dee29c 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php index 36c59ebce..849edb472 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/Source.php b/vendor/simplepie/simplepie/library/SimplePie/Source.php index d2205e5dd..24b0f7c46 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Source.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Source.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php index 3bedaabe2..7ccc73178 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php index dea37ed47..c428194b7 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php +++ b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Author.php b/vendor/simplepie/simplepie/src/Author.php index f82a021e2..2cb7ad9ed 100644 --- a/vendor/simplepie/simplepie/src/Author.php +++ b/vendor/simplepie/simplepie/src/Author.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache.php b/vendor/simplepie/simplepie/src/Cache.php index 740091f08..8ed7038b4 100644 --- a/vendor/simplepie/simplepie/src/Cache.php +++ b/vendor/simplepie/simplepie/src/Cache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/Base.php b/vendor/simplepie/simplepie/src/Cache/Base.php index 134d097fc..674fe8c10 100644 --- a/vendor/simplepie/simplepie/src/Cache/Base.php +++ b/vendor/simplepie/simplepie/src/Cache/Base.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/BaseDataCache.php b/vendor/simplepie/simplepie/src/Cache/BaseDataCache.php index b8b239195..44dbd66d4 100644 --- a/vendor/simplepie/simplepie/src/Cache/BaseDataCache.php +++ b/vendor/simplepie/simplepie/src/Cache/BaseDataCache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -86,12 +85,12 @@ final class BaseDataCache implements DataCache { $data = $this->cache->load(); - if (! is_array($data)) { + if (!is_array($data)) { return $default; } // ignore data if internal cache expiration time is not set - if (! array_key_exists('__cache_expiration_time', $data)) { + if (!array_key_exists('__cache_expiration_time', $data)) { return $default; } diff --git a/vendor/simplepie/simplepie/src/Cache/DB.php b/vendor/simplepie/simplepie/src/Cache/DB.php index 7994e3210..a5357b26d 100644 --- a/vendor/simplepie/simplepie/src/Cache/DB.php +++ b/vendor/simplepie/simplepie/src/Cache/DB.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -80,13 +79,13 @@ abstract class DB implements Base } if (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0])) { - $channel =& $data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0]; + $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0]; } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0])) { - $channel =& $data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0]; + $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0]; } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0])) { - $channel =& $data->data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0]; + $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0]; } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['channel'][0])) { - $channel =& $data->data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['channel'][0]; + $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['channel'][0]; } else { $channel = null; } diff --git a/vendor/simplepie/simplepie/src/Cache/DataCache.php b/vendor/simplepie/simplepie/src/Cache/DataCache.php index bf3aebe90..e75413243 100644 --- a/vendor/simplepie/simplepie/src/Cache/DataCache.php +++ b/vendor/simplepie/simplepie/src/Cache/DataCache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/File.php b/vendor/simplepie/simplepie/src/Cache/File.php index 248d41a8a..0ffcdf9e2 100644 --- a/vendor/simplepie/simplepie/src/Cache/File.php +++ b/vendor/simplepie/simplepie/src/Cache/File.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/Memcache.php b/vendor/simplepie/simplepie/src/Cache/Memcache.php index aeabd51b3..d20f9bfcf 100644 --- a/vendor/simplepie/simplepie/src/Cache/Memcache.php +++ b/vendor/simplepie/simplepie/src/Cache/Memcache.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/Memcached.php b/vendor/simplepie/simplepie/src/Cache/Memcached.php index 4aa3701b5..8a8d31e7b 100644 --- a/vendor/simplepie/simplepie/src/Cache/Memcached.php +++ b/vendor/simplepie/simplepie/src/Cache/Memcached.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Cache/MySQL.php b/vendor/simplepie/simplepie/src/Cache/MySQL.php index 62abb12cd..1d7986bfc 100644 --- a/vendor/simplepie/simplepie/src/Cache/MySQL.php +++ b/vendor/simplepie/simplepie/src/Cache/MySQL.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -290,13 +289,13 @@ class MySQL extends DB if ($items !== 0) { if (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0])) { - $feed =& $data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0]; + $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0]; } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0])) { - $feed =& $data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0]; + $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0]; } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0])) { - $feed =& $data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0]; + $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0]; } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0])) { - $feed =& $data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]; + $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]; } else { $feed = null; } diff --git a/vendor/simplepie/simplepie/src/Cache/Psr16.php b/vendor/simplepie/simplepie/src/Cache/Psr16.php index 710996b4d..15fe6db92 100644 --- a/vendor/simplepie/simplepie/src/Cache/Psr16.php +++ b/vendor/simplepie/simplepie/src/Cache/Psr16.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -94,7 +93,7 @@ final class Psr16 implements DataCache { $data = $this->cache->get($key, $default); - if (! is_array($data) || $data === $default) { + if (!is_array($data) || $data === $default) { return $default; } diff --git a/vendor/simplepie/simplepie/src/Cache/Redis.php b/vendor/simplepie/simplepie/src/Cache/Redis.php index 0effccadb..5997668c0 100644 --- a/vendor/simplepie/simplepie/src/Cache/Redis.php +++ b/vendor/simplepie/simplepie/src/Cache/Redis.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Caption.php b/vendor/simplepie/simplepie/src/Caption.php index 467183239..ef72c0b7a 100644 --- a/vendor/simplepie/simplepie/src/Caption.php +++ b/vendor/simplepie/simplepie/src/Caption.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Category.php b/vendor/simplepie/simplepie/src/Category.php index b49b4fd96..d7da8e683 100644 --- a/vendor/simplepie/simplepie/src/Category.php +++ b/vendor/simplepie/simplepie/src/Category.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php b/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php index 33c27b64b..8c7e089ac 100644 --- a/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php +++ b/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Copyright.php b/vendor/simplepie/simplepie/src/Copyright.php index 878e4ffa4..150362f01 100644 --- a/vendor/simplepie/simplepie/src/Copyright.php +++ b/vendor/simplepie/simplepie/src/Copyright.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Credit.php b/vendor/simplepie/simplepie/src/Credit.php index 6b1402266..947f231e8 100644 --- a/vendor/simplepie/simplepie/src/Credit.php +++ b/vendor/simplepie/simplepie/src/Credit.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Enclosure.php b/vendor/simplepie/simplepie/src/Enclosure.php index 065577653..e7dcb2527 100644 --- a/vendor/simplepie/simplepie/src/Enclosure.php +++ b/vendor/simplepie/simplepie/src/Enclosure.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -725,7 +724,7 @@ class Enclosure { $length = $this->get_length(); if ($length !== null) { - return round($length/1048576, 2); + return round($length / 1048576, 2); } return null; @@ -812,7 +811,7 @@ class Enclosure * @param array|string $options See first parameter to {@see embed} * @return string HTML string to output */ - public function native_embed($options='') + public function native_embed($options = '') { return $this->embed($options, true); } @@ -943,9 +942,9 @@ class Enclosure if ($height === 'auto') { $width = 480; } elseif ($widescreen) { - $width = round((intval($height)/9)*16); + $width = round((intval($height) / 9) * 16); } else { - $width = round((intval($height)/3)*4); + $width = round((intval($height) / 3) * 4); } } else { $width = '100%'; @@ -963,9 +962,9 @@ class Enclosure $height = 360; } } elseif ($widescreen) { - $height = round((intval($width)/16)*9); + $height = round((intval($width) / 16) * 9); } else { - $height = round((intval($width)/4)*3); + $height = round((intval($width) / 4) * 3); } } else { $height = 376; @@ -1115,7 +1114,7 @@ class Enclosure $type = 'audio/x-ms-wma'; break; - // Video mime-types + // Video mime-types case '3gp': case '3gpp': $type = 'video/3gpp'; @@ -1178,7 +1177,7 @@ class Enclosure $type = 'video/x-ms-wvx'; break; - // Flash mime-types + // Flash mime-types case 'spl': $type = 'application/futuresplash'; break; diff --git a/vendor/simplepie/simplepie/src/Exception.php b/vendor/simplepie/simplepie/src/Exception.php index a20681f55..ae67ae38c 100644 --- a/vendor/simplepie/simplepie/src/Exception.php +++ b/vendor/simplepie/simplepie/src/Exception.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/File.php b/vendor/simplepie/simplepie/src/File.php index bdbf56927..fac7aabc1 100644 --- a/vendor/simplepie/simplepie/src/File.php +++ b/vendor/simplepie/simplepie/src/File.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Gzdecode.php b/vendor/simplepie/simplepie/src/Gzdecode.php index 67cbfefe0..acb120126 100644 --- a/vendor/simplepie/simplepie/src/Gzdecode.php +++ b/vendor/simplepie/simplepie/src/Gzdecode.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -182,7 +181,7 @@ class Gzdecode */ public function __set($name, $value) { - trigger_error("Cannot write property $name", E_USER_ERROR); + throw new Exception("Cannot write property $name"); } /** diff --git a/vendor/simplepie/simplepie/src/HTTP/Parser.php b/vendor/simplepie/simplepie/src/HTTP/Parser.php index 15c46ebe8..524885a1a 100644 --- a/vendor/simplepie/simplepie/src/HTTP/Parser.php +++ b/vendor/simplepie/simplepie/src/HTTP/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/IRI.php b/vendor/simplepie/simplepie/src/IRI.php index ce4c2c211..dfd5eaa8a 100644 --- a/vendor/simplepie/simplepie/src/IRI.php +++ b/vendor/simplepie/simplepie/src/IRI.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Item.php b/vendor/simplepie/simplepie/src/Item.php index f25b50d04..3ec8f2f98 100644 --- a/vendor/simplepie/simplepie/src/Item.php +++ b/vendor/simplepie/simplepie/src/Item.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -878,12 +877,12 @@ class Item implements RegistryAware if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) { if (isset($this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key])) { $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]); - $this->data['links'][$key] =& $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]; + $this->data['links'][$key] = &$this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]; } else { - $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key]; } } elseif (substr($key, 0, 41) === \SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY) { - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + $this->data['links'][substr($key, 41)] = &$this->data['links'][$key]; } $this->data['links'][$key] = array_unique($this->data['links'][$key]); } diff --git a/vendor/simplepie/simplepie/src/Locator.php b/vendor/simplepie/simplepie/src/Locator.php index 1dc005b47..e17b3a376 100644 --- a/vendor/simplepie/simplepie/src/Locator.php +++ b/vendor/simplepie/simplepie/src/Locator.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Misc.php b/vendor/simplepie/simplepie/src/Misc.php index 87d7f6e2c..cc5db8aea 100644 --- a/vendor/simplepie/simplepie/src/Misc.php +++ b/vendor/simplepie/simplepie/src/Misc.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Net/IPv6.php b/vendor/simplepie/simplepie/src/Net/IPv6.php index da25f8353..a68dc169a 100644 --- a/vendor/simplepie/simplepie/src/Net/IPv6.php +++ b/vendor/simplepie/simplepie/src/Net/IPv6.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Parse/Date.php b/vendor/simplepie/simplepie/src/Parse/Date.php index 4792bc5e6..3254cca3c 100644 --- a/vendor/simplepie/simplepie/src/Parse/Date.php +++ b/vendor/simplepie/simplepie/src/Parse/Date.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Parser.php b/vendor/simplepie/simplepie/src/Parser.php index 4987825e6..baf70d2bd 100644 --- a/vendor/simplepie/simplepie/src/Parser.php +++ b/vendor/simplepie/simplepie/src/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -151,9 +150,8 @@ class Parser implements RegistryAware $xml = xml_parser_create_ns($this->encoding, $this->separator); xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1); xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0); - xml_set_object($xml, $this); - xml_set_character_data_handler($xml, 'cdata'); - xml_set_element_handler($xml, 'tag_open', 'tag_close'); + xml_set_character_data_handler($xml, [$this, 'cdata']); + xml_set_element_handler($xml, [$this, 'tag_open'], [$this, 'tag_close']); // Parse! $wrapper = @is_writable(sys_get_temp_dir()) ? 'php://temp' : 'php://memory'; @@ -303,8 +301,8 @@ class Parser implements RegistryAware $this->data['data'] .= '>'; } } else { - $this->datas[] =& $this->data; - $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][]; + $this->datas[] = &$this->data; + $this->data = &$this->data['child'][end($this->namespace)][end($this->element)][]; $this->data = ['data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang)]; if ((end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_ATOM_03 && in_array(end($this->element), ['title', 'tagline', 'copyright', 'info', 'summary', 'content']) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml') || (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_ATOM_10 && in_array(end($this->element), ['rights', 'subtitle', 'summary', 'info', 'title', 'content']) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml') @@ -334,7 +332,7 @@ class Parser implements RegistryAware } } if ($this->current_xhtml_construct === -1) { - $this->data =& $this->datas[count($this->datas) - 1]; + $this->data = &$this->datas[count($this->datas) - 1]; array_pop($this->datas); } diff --git a/vendor/simplepie/simplepie/src/Rating.php b/vendor/simplepie/simplepie/src/Rating.php index f4f303d99..24c27337f 100644 --- a/vendor/simplepie/simplepie/src/Rating.php +++ b/vendor/simplepie/simplepie/src/Rating.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Registry.php b/vendor/simplepie/simplepie/src/Registry.php index 8e2ea13e3..6040d8bf3 100644 --- a/vendor/simplepie/simplepie/src/Registry.php +++ b/vendor/simplepie/simplepie/src/Registry.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -156,7 +155,7 @@ class Registry $type = $this->legacyTypes[$type]; } - if (! array_key_exists($type, $this->default)) { + if (!array_key_exists($type, $this->default)) { return false; } @@ -197,7 +196,7 @@ class Registry $type = $this->legacyTypes[$type]; } - if (! array_key_exists($type, $this->default)) { + if (!array_key_exists($type, $this->default)) { return null; } diff --git a/vendor/simplepie/simplepie/src/RegistryAware.php b/vendor/simplepie/simplepie/src/RegistryAware.php index 9d60bdd0f..525d93140 100644 --- a/vendor/simplepie/simplepie/src/RegistryAware.php +++ b/vendor/simplepie/simplepie/src/RegistryAware.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Restriction.php b/vendor/simplepie/simplepie/src/Restriction.php index 42b456a1c..d3cae11f1 100644 --- a/vendor/simplepie/simplepie/src/Restriction.php +++ b/vendor/simplepie/simplepie/src/Restriction.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * diff --git a/vendor/simplepie/simplepie/src/Sanitize.php b/vendor/simplepie/simplepie/src/Sanitize.php index 7416c88e4..5c22d9c6f 100644 --- a/vendor/simplepie/simplepie/src/Sanitize.php +++ b/vendor/simplepie/simplepie/src/Sanitize.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -133,7 +132,7 @@ class Sanitize implements RegistryAware $this->registry = $registry; } - public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie\Cache', DataCache $cache = null) + public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie\Cache', ?DataCache $cache = null) { if (isset($enable_cache)) { $this->enable_cache = (bool) $enable_cache; @@ -143,7 +142,7 @@ class Sanitize implements RegistryAware $this->cache_location = (string) $cache_location; } - if (! is_string($cache_name_function) && ! is_object($cache_name_function) && ! $cache_name_function instanceof NameFilter) { + if (!is_string($cache_name_function) && !is_object($cache_name_function) && !$cache_name_function instanceof NameFilter) { throw new InvalidArgumentException(sprintf( '%s(): Argument #3 ($cache_name_function) must be of type %s', __METHOD__, @@ -297,7 +296,7 @@ class Sanitize implements RegistryAware foreach ($domains as $domain) { $domain = trim($domain, ". \t\n\r\0\x0B"); $segments = array_reverse(explode('.', $domain)); - $node =& $this->https_domains; + $node = &$this->https_domains; foreach ($segments as $segment) {//Build a tree if ($node === true) { break; @@ -305,7 +304,7 @@ class Sanitize implements RegistryAware if (!isset($node[$segment])) { $node[$segment] = []; } - $node =& $node[$segment]; + $node = &$node[$segment]; } $node = true; } @@ -316,16 +315,12 @@ class Sanitize implements RegistryAware */ protected function is_https_domain($domain) { - - // https://github.com/simplepie/simplepie/issues/852 - $domain = (string) $domain; - $domain = trim($domain, '. '); $segments = array_reverse(explode('.', $domain)); - $node =& $this->https_domains; + $node = &$this->https_domains; foreach ($segments as $segment) {//Explore the tree if (isset($node[$segment])) { - $node =& $node[$segment]; + $node = &$node[$segment]; } else { break; } diff --git a/vendor/simplepie/simplepie/src/SimplePie.php b/vendor/simplepie/simplepie/src/SimplePie.php index 1dfa39fad..a0f6c17f4 100644 --- a/vendor/simplepie/simplepie/src/SimplePie.php +++ b/vendor/simplepie/simplepie/src/SimplePie.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -71,7 +70,7 @@ class SimplePie /** * SimplePie Version */ - public const VERSION = '1.8.0'; + public const VERSION = '1.8.1'; /** * SimplePie Website URL @@ -691,8 +690,7 @@ class SimplePie public function __construct() { if (version_compare(PHP_VERSION, '7.2', '<')) { - trigger_error('Please upgrade to PHP 7.2 or newer.'); - die(); + exit('Please upgrade to PHP 7.2 or newer.'); } $this->set_useragent(); @@ -803,7 +801,7 @@ class SimplePie if ($file instanceof \SimplePie\File) { $this->feed_url = $file->url; $this->permanent_url = $this->feed_url; - $this->file =& $file; + $this->file = &$file; return true; } return false; @@ -1375,7 +1373,7 @@ class SimplePie } $this->sanitize->strip_htmltags($tags); if ($encode !== null) { - $this->sanitize->encode_instead_of_strip($tags); + $this->sanitize->encode_instead_of_strip($encode); } } @@ -1666,7 +1664,7 @@ class SimplePie // Cache the file if caching is enabled $this->data['cache_expiration_time'] = $this->cache_duration + time(); - if ($cache && ! $cache->set_data($this->get_cache_filename($this->feed_url), $this->data, $this->cache_duration)) { + if ($cache && !$cache->set_data($this->get_cache_filename($this->feed_url), $this->data, $this->cache_duration)) { trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); } return true; @@ -1716,7 +1714,7 @@ class SimplePie $cache = new BaseDataCache($cache); } - if ($cache !== false && ! $cache instanceof DataCache) { + if ($cache !== false && !$cache instanceof DataCache) { throw new InvalidArgumentException(sprintf( '%s(): Argument #1 ($cache) must be of type %s|false', __METHOD__, @@ -1774,7 +1772,7 @@ class SimplePie $headers['if-none-match'] = $this->data['headers']['etag']; } - $file = $this->registry->create(File::class, [$this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]); + $file = $this->registry->create(File::class, [$this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]); $this->status_code = $file->status_code; if ($file->success) { @@ -1811,7 +1809,7 @@ class SimplePie // If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it. if (!isset($file)) { if ($this->file instanceof \SimplePie\File && $this->file->url === $this->feed_url) { - $file =& $this->file; + $file = &$this->file; } else { $headers = [ 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', @@ -1833,7 +1831,7 @@ class SimplePie if (!$locate->is_feed($file)) { $copyStatusCode = $file->status_code; - $copyContentType = $file->headers['content-type']; + $copyContentType = $file->headers['content-type'] ?? ''; try { $microformats = false; if (class_exists('DOMXpath') && function_exists('Mf2\parse')) { @@ -2641,12 +2639,12 @@ class SimplePie if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) { if (isset($this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key])) { $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key]); - $this->data['links'][$key] =& $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key]; + $this->data['links'][$key] = &$this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key]; } else { - $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key]; } } elseif (substr($key, 0, 41) === self::IANA_LINK_RELATIONS_REGISTRY) { - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + $this->data['links'][substr($key, 41)] = &$this->data['links'][$key]; } $this->data['links'][$key] = array_unique($this->data['links'][$key]); } @@ -3103,7 +3101,7 @@ class SimplePie $trace = debug_backtrace(); $file = $trace[0]['file']; $line = $trace[0]['line']; - trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR); + throw new SimplePieException("Call to undefined method $class::$method() in $file on line $line"); } /** diff --git a/vendor/simplepie/simplepie/src/Source.php b/vendor/simplepie/simplepie/src/Source.php index c7ed11600..5a8f86de9 100644 --- a/vendor/simplepie/simplepie/src/Source.php +++ b/vendor/simplepie/simplepie/src/Source.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * @@ -348,12 +347,12 @@ class Source implements RegistryAware if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) { if (isset($this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key])) { $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]); - $this->data['links'][$key] =& $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]; + $this->data['links'][$key] = &$this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]; } else { - $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key]; } } elseif (substr($key, 0, 41) === \SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY) { - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + $this->data['links'][substr($key, 41)] = &$this->data['links'][$key]; } $this->data['links'][$key] = array_unique($this->data['links'][$key]); } diff --git a/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php b/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php index 5062e683f..59a0d83ee 100644 --- a/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php +++ b/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php @@ -1,6 +1,5 @@ <?php -declare(strict_types=1); /** * SimplePie * |