From 5697f7c92cbc7b2c23d2a8c6ba3d904734dd0739 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 22 Dec 2014 09:16:08 +0100 Subject: udpate picofeed --- .../picofeed/lib/PicoFeed/Filter/Attribute.php | 24 +++++++++++----------- .../picofeed/lib/PicoFeed/Filter/Filter.php | 15 ++------------ .../fguillot/picofeed/lib/PicoFeed/Filter/Html.php | 4 ++-- .../fguillot/picofeed/lib/PicoFeed/Filter/Tag.php | 2 +- 4 files changed, 17 insertions(+), 28 deletions(-) (limited to 'vendor/fguillot/picofeed/lib/PicoFeed/Filter') diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php index 66b3470f8..5948dec35 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php @@ -460,7 +460,7 @@ class Attribute * Check if an attribute name is an external resource * * @access public - * @param string $data Attribute name + * @param string $attribute Attribute name * @return boolean */ public function isResource($attribute) @@ -491,7 +491,7 @@ class Attribute * Detect if an url is blacklisted * * @access public - * @param string $resouce Attribute value (URL) + * @param string $resource Attribute value (URL) * @return boolean */ public function isBlacklistedMedia($resource) @@ -529,7 +529,7 @@ class Attribute * * @access public * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setWhitelistedAttributes(array $values) { @@ -542,7 +542,7 @@ class Attribute * * @access public * @param array $values List of scheme: ['http://', 'ftp://'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setSchemeWhitelist(array $values) { @@ -555,7 +555,7 @@ class Attribute * * @access public * @param array $values List of values: ['src', 'href'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setMediaAttributes(array $values) { @@ -568,7 +568,7 @@ class Attribute * * @access public * @param array $values List of tags: ['http://google.com/', '...'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setMediaBlacklist(array $values) { @@ -581,7 +581,7 @@ class Attribute * * @access public * @param array $values List of tags: ['img' => 'src'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setRequiredAttributes(array $values) { @@ -594,7 +594,7 @@ class Attribute * * @access public * @param array $values List of tags: ['a' => 'target="_blank"'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setAttributeOverrides(array $values) { @@ -607,7 +607,7 @@ class Attribute * * @access public * @param array $values List of tags: ['width', 'height'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setIntegerAttributes(array $values) { @@ -620,7 +620,7 @@ class Attribute * * @access public * @param array $values List of tags: ['http://www.youtube.com'] - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setIframeWhitelist(array $values) { @@ -635,7 +635,7 @@ class Attribute * * @access public * @param string $url Proxy URL - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setImageProxyUrl($url) { @@ -648,7 +648,7 @@ class Attribute * * @access public * @param \Closure $callback - * @return \PicoFeed\Filter\Filter + * @return Attribute */ public function setImageProxyCallback($callback) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php index 82289444b..0eb3f88ea 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php @@ -2,8 +2,6 @@ namespace PicoFeed\Filter; -use PicoFeed\Parser\XmlParser; - /** * Filter class * @@ -19,7 +17,7 @@ class Filter * @access public * @param string $html HTML content * @param string $website Site URL (used to build absolute URL) - * @return PicoFeed\Filter\Html + * @return Html */ public static function html($html, $website) { @@ -88,16 +86,7 @@ class Filter */ public static function stripHeadTags($data) { - $start = strpos($data, ''); - $end = strpos($data, ''); - - if ($start !== false && $end !== false) { - $before = substr($data, 0, $start); - $after = substr($data, $end + 7); - $data = $before.$after; - } - - return $data; + return preg_replace('@]*?>.*?@siu','', $data ); } /** diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php index f7816f1d2..7abd740b1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php @@ -150,7 +150,7 @@ class Html * * @access public * @param resource $parser XML parser - * @param string $name Tag name + * @param string $tag Tag name * @param array $attributes Tag attributes */ public function startTag($parser, $tag, array $attributes) @@ -178,7 +178,7 @@ class Html * * @access public * @param resource $parser XML parser - * @param string $name Tag name + * @param string $tag Tag name */ public function endTag($parser, $tag) { diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php index dbeffe7a4..40f7c6c98 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php @@ -163,7 +163,7 @@ class Tag * * @access public * @param array $values List of tags: ['video' => ['src', 'cover'], 'img' => ['src']] - * @return \PicoFeed\Filter + * @return Tag */ public function setWhitelistedTags(array $values) { -- cgit v1.2.3