aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dag <me@dvikan.no> 2023-07-11 16:54:59 +0200
committerGravatar GitHub <noreply@github.com> 2023-07-11 16:54:59 +0200
commit6c0e186d3fb469465ed991866abda9b146525c25 (patch)
tree34dc5796ae7adcf5d1787adce60dbd5850f103ba
parentc9a861e2595710e479d1c3b81591f743f15cd566 (diff)
downloadrss-bridge-2023-07-11.tar.gz
rss-bridge-2023-07-11.tar.zst
rss-bridge-2023-07-11.zip
fix(jornaln): Array to string conversion at lib/BridgeAbstract.php li… (#3523)2023-07-11
* fix(jornaln): Array to string conversion at lib/BridgeAbstract.php line 320 * yup
Diffstat (limited to '')
-rw-r--r--bridges/JornalNBridge.php5
-rw-r--r--lib/BridgeAbstract.php5
2 files changed, 6 insertions, 4 deletions
diff --git a/bridges/JornalNBridge.php b/bridges/JornalNBridge.php
index 7eadc025..2a9d6661 100644
--- a/bridges/JornalNBridge.php
+++ b/bridges/JornalNBridge.php
@@ -52,7 +52,10 @@ class JornalNBridge extends BridgeAbstract
public function getName()
{
- return !is_null($this->getKey('feed')) ? self::NAME . ' | ' . $this->getKey('feed') : self::NAME;
+ if ($this->getKey('feed')) {
+ return self::NAME . ' | ' . $this->getKey('feed');
+ }
+ return self::NAME;
}
public function getURI()
diff --git a/lib/BridgeAbstract.php b/lib/BridgeAbstract.php
index 3a2c47f2..f024393d 100644
--- a/lib/BridgeAbstract.php
+++ b/lib/BridgeAbstract.php
@@ -314,11 +314,10 @@ abstract class BridgeAbstract implements BridgeInterface
if (!isset($context)) {
$context = $this->queriedContext;
}
+
$needle = $this->inputs[$this->queriedContext][$input]['value'];
foreach (static::PARAMETERS[$context][$input]['values'] as $first_level_key => $first_level_value) {
- // todo: this cast emits error if it's an array
- $valueString = (string) $first_level_value;
- if ($needle === $valueString) {
+ if (!is_array($first_level_value) && $needle === (string)$first_level_value) {
return $first_level_key;
} elseif (is_array($first_level_value)) {
foreach ($first_level_value as $second_level_key => $second_level_value) {