aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dag <me@dvikan.no> 2022-11-15 00:30:51 +0100
committerGravatar GitHub <noreply@github.com> 2022-11-15 00:30:51 +0100
commit95c199c2eb9f61355397ea7ad1d93e2084e1ed8c (patch)
treeba598c62c0f07bf9d57f750646a7b960aaacc1a2
parent734a5868b8b8ca72e00e700ab593bb7f3c1a9354 (diff)
downloadrss-bridge-95c199c2eb9f61355397ea7ad1d93e2084e1ed8c.tar.gz
rss-bridge-95c199c2eb9f61355397ea7ad1d93e2084e1ed8c.tar.zst
rss-bridge-95c199c2eb9f61355397ea7ad1d93e2084e1ed8c.zip
fix: various php notices (#3145)
* fix: notice * fix: Trying to get property content of non-object at bridges/PcGamerBridge.php line 36 * fix: better exception message * fix: strpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior
-rw-r--r--bridges/GelbooruBridge.php2
-rw-r--r--bridges/PcGamerBridge.php7
-rw-r--r--bridges/ReutersBridge.php2
-rw-r--r--bridges/WikipediaBridge.php4
-rw-r--r--lib/FeedExpander.php6
5 files changed, 13 insertions, 8 deletions
diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php
index d4d17fc9..5fc6b33c 100644
--- a/bridges/GelbooruBridge.php
+++ b/bridges/GelbooruBridge.php
@@ -67,7 +67,7 @@ class GelbooruBridge extends BridgeAbstract
. $thumbnailUri . '" /></a><br><br><b>Dimensions:</b> '
. strval($element->width) . ' x ' . strval($element->height) . '<br><br><b>Tags:</b> '
. $item['tags'];
- if (!is_null($element->source)) {
+ if (isset($element->source)) {
$item['content'] .= '<br><br><b>Source: </b><a href="' . $element->source . '">' . $element->source . '</a>';
}
diff --git a/bridges/PcGamerBridge.php b/bridges/PcGamerBridge.php
index 5ea15e8c..bac01ee8 100644
--- a/bridges/PcGamerBridge.php
+++ b/bridges/PcGamerBridge.php
@@ -28,7 +28,12 @@ class PcGamerBridge extends BridgeAbstract
$item['title'] = $articleHtml->find('meta[name=parsely-title]', 0)->content;
$item['content'] = html_entity_decode($articleHtml->find('meta[name=description]', 0)->content);
$item['author'] = $articleHtml->find('meta[name=parsely-author]', 0)->content;
- $item['enclosures'][] = $articleHtml->find('meta[name=parsely-image-url]', 0)->content;
+
+ $imageUrl = $articleHtml->find('meta[name=parsely-image-url]', 0);
+ if ($imageUrl) {
+ $item['enclosures'][] = $imageUrl->content;
+ }
+
/* I don't know why every article has two extra tags, but because
one matches another common tag, "guide," it needs to be removed. */
$item['categories'] = array_diff(
diff --git a/bridges/ReutersBridge.php b/bridges/ReutersBridge.php
index 77370d65..eceaddf7 100644
--- a/bridges/ReutersBridge.php
+++ b/bridges/ReutersBridge.php
@@ -420,7 +420,7 @@ class ReutersBridge extends BridgeAbstract
{
$description = '';
foreach ($contents as $content) {
- $data;
+ $data = '';
if (isset($content['content'])) {
$data = $content['content'];
}
diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php
index 30e551ed..28149d0f 100644
--- a/bridges/WikipediaBridge.php
+++ b/bridges/WikipediaBridge.php
@@ -277,7 +277,7 @@ class WikipediaBridge extends BridgeAbstract
switch ($subject) {
case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=mp-tfa]', 0);
- $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, -1);
+ $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, '...', -1);
break;
case WIKIPEDIA_SUBJECT_DYK:
$element = $html->find('div[id=mp-dyk]', 0);
@@ -296,7 +296,7 @@ class WikipediaBridge extends BridgeAbstract
switch ($subject) {
case WIKIPEDIA_SUBJECT_TFA:
$element = $html->find('div[id=main-tfa]', 0);
- $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, -1);
+ $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, '...', -1);
break;
case WIKIPEDIA_SUBJECT_DYK:
$element = $html->find('div[id=main-dyk]', 0);
diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php
index f537a76a..caface38 100644
--- a/lib/FeedExpander.php
+++ b/lib/FeedExpander.php
@@ -146,15 +146,15 @@ abstract class FeedExpander extends BridgeAbstract
$this->collectAtom1($rssContent, $maxItems);
break;
default:
- Debug::log('Unknown feed format/version');
- throw new \Exception('The feed format is unknown!');
+ Debug::log(sprintf('Unable to detect feed format from `%s`', $url));
+ throw new \Exception(sprintf('Unable to detect feed format from `%s`', $url));
}
return $this;
}
/**
- * Collect data from a RSS 1.0 compatible feed
+ * Collect data from an RSS 1.0 compatible feed
*
* @link http://web.resource.org/rss/1.0/spec RDF Site Summary (RSS) 1.0
*