From 487c692e68bdc75adddb23d342fd77d9418688d2 Mon Sep 17 00:00:00 2001 From: Dag Date: Tue, 23 Jan 2024 23:02:06 +0100 Subject: [PATCH] fix: a few deprecation notices on php 8.2 (#3917) * fix: a few deprecation notices on php 8.2 * tweak --- bridges/AllegroBridge.php | 19 ++++++++++++++++--- bridges/EBayBridge.php | 6 +++++- bridges/ErowallBridge.php | 2 +- bridges/NintendoBridge.php | 8 ++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/bridges/AllegroBridge.php b/bridges/AllegroBridge.php index be240857..7cad11f1 100644 --- a/bridges/AllegroBridge.php +++ b/bridges/AllegroBridge.php @@ -35,10 +35,23 @@ class AllegroBridge extends BridgeAbstract public function getName() { - parse_str(parse_url($this->getInput('url'), PHP_URL_QUERY), $fields); + $url = $this->getInput('url'); + if (!$url) { + return parent::getName(); + } + $parsedUrl = parse_url($url, PHP_URL_QUERY); + if (!$parsedUrl) { + return parent::getName(); + } + parse_str($parsedUrl, $fields); - if ($query = array_key_exists('string', $fields) ? urldecode($fields['string']) : false) { - return $query; + if (array_key_exists('string', $fields)) { + $f = urldecode($fields['string']); + } else { + $f = false; + } + if ($f) { + return $f; } return parent::getName(); diff --git a/bridges/EBayBridge.php b/bridges/EBayBridge.php index 66fad10c..507930ea 100644 --- a/bridges/EBayBridge.php +++ b/bridges/EBayBridge.php @@ -31,7 +31,11 @@ class EBayBridge extends BridgeAbstract public function getName() { - $urlQueries = explode('&', parse_url($this->getInput('url'), PHP_URL_QUERY)); + $url = $this->getInput('url'); + if (!$url) { + return parent::getName(); + } + $urlQueries = explode('&', parse_url($url, PHP_URL_QUERY)); $searchQuery = array_reduce($urlQueries, function ($q, $p) { if (preg_match('/^_nkw=(.+)$/i', $p, $matches)) { diff --git a/bridges/ErowallBridge.php b/bridges/ErowallBridge.php index bf206df9..5b3197e2 100644 --- a/bridges/ErowallBridge.php +++ b/bridges/ErowallBridge.php @@ -98,7 +98,7 @@ class ErowallBridge extends BridgeAbstract $ret .= 'dat/'; break; default: - $tag = $this->getInput('tag'); + $tag = $this->getInput('tag') ?? ''; $ret .= 'teg/' . str_replace(' ', '+', $tag); } diff --git a/bridges/NintendoBridge.php b/bridges/NintendoBridge.php index 1f463e91..1c2ef71a 100644 --- a/bridges/NintendoBridge.php +++ b/bridges/NintendoBridge.php @@ -365,7 +365,11 @@ class NintendoBridge extends XPathAbstract public function getURI() { $category = $this->getInput('category'); - return 'all' === $category ? self::URI : $this->getSourceUrl(); + if ('all' === $category) { + return self::URI; + } else { + return $this->getSourceUrl(); + } } protected function provideFeedTitle(\DOMXPath $xpath) @@ -377,7 +381,7 @@ class NintendoBridge extends XPathAbstract protected function getSourceUrl() { - $country = $this->getInput('country'); + $country = $this->getInput('country') ?? ''; $category = $this->getCurrentCategory(); return str_replace(self::PARAMETERS['']['country']['defaultValue'], $country, self::FEED_SOURCE_URL[$category]); }