From c9a3b5117a03644d4bd2d5465b03f3b991298e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Fri, 26 Dec 2014 10:56:50 -0500 Subject: [PATCH] Update PicoFeed (avoid some PHP warnings) --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/installed.json | 8 ++++---- .../picofeed/lib/PicoFeed/Parser/XmlParser.php | 6 +++++- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index ace352c..fbc978c 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671::getLoader(); +return ComposerAutoloaderInitafa19cf4aabbde48e28a8081b9102b7e::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index bd6683f..866db95 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671 +class ComposerAutoloaderInitafa19cf4aabbde48e28a8081b9102b7e { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitafa19cf4aabbde48e28a8081b9102b7e', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitafa19cf4aabbde48e28a8081b9102b7e', 'loadClassLoader')); $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -42,14 +42,14 @@ class ComposerAutoloaderInitc9ebccb0a3ac2fed704b9ca3688ea671 $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequirec9ebccb0a3ac2fed704b9ca3688ea671($file); + composerRequireafa19cf4aabbde48e28a8081b9102b7e($file); } return $loader; } } -function composerRequirec9ebccb0a3ac2fed704b9ca3688ea671($file) +function composerRequireafa19cf4aabbde48e28a8081b9102b7e($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6e340b5..66d3390 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -162,18 +162,18 @@ "source": { "type": "git", "url": "https://github.com/fguillot/picoFeed.git", - "reference": "9bfc660ff57569ccc89b92de806c918e934d0c93" + "reference": "26a0824e3e0b4986f19facc961f21c8a70876b90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/9bfc660ff57569ccc89b92de806c918e934d0c93", - "reference": "9bfc660ff57569ccc89b92de806c918e934d0c93", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/26a0824e3e0b4986f19facc961f21c8a70876b90", + "reference": "26a0824e3e0b4986f19facc961f21c8a70876b90", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2014-12-24 23:02:34", + "time": "2014-12-26 15:54:33", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php index 0afc89d..687ce99 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php @@ -118,6 +118,10 @@ class XmlParser */ public static function getHtmlDocument($input) { + if (empty($input)) { + return new DomDocument; + } + if (version_compare(PHP_VERSION, '5.4.0', '>=')) { $callback = function ($in) { $dom = new DomDocument; @@ -237,7 +241,7 @@ class XmlParser foreach ($namespaces as $name => $url) { $namespace = $xml->children($namespaces[$name]); - if ($namespace->$property->count() > 0) { + if (isset($namespace->$property) && $namespace->$property->count() > 0) { if ($attribute) {