From 9dd4102c7fe2ddfc67f91ad9034d734a4458cc01 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 4 Aug 2024 15:42:11 +0000 Subject: Replace basic 'isset()' cases with the null coalescing operator. --- classes/PluginHost.php | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'classes/PluginHost.php') diff --git a/classes/PluginHost.php b/classes/PluginHost.php index 2098be4e6..f3febc431 100644 --- a/classes/PluginHost.php +++ b/classes/PluginHost.php @@ -586,11 +586,7 @@ class PluginHost { $method = strtolower($method); if (isset($this->handlers[$handler])) { - if (isset($this->handlers[$handler]["*"])) { - return $this->handlers[$handler]["*"]; - } else { - return $this->handlers[$handler][$method]; - } + return $this->handlers[$handler]["*"] ?? $this->handlers[$handler][$method]; } return false; @@ -752,15 +748,8 @@ class PluginHost { if ($profile_id) { $idx = get_class($sender); - $this->load_data(); - - if (isset($this->storage[$idx][$profile_id][$name])) { - return $this->storage[$idx][$profile_id][$name]; - } else { - return $default_value; - } - + return $this->storage[$idx][$profile_id][$name] ?? $default_value; } else { return $this->get($sender, $name, $default_value); } @@ -772,14 +761,8 @@ class PluginHost { */ function get(Plugin $sender, string $name, $default_value = false) { $idx = get_class($sender); - $this->load_data(); - - if (isset($this->storage[$idx][$name])) { - return $this->storage[$idx][$name]; - } else { - return $default_value; - } + return $this->storage[$idx][$name] ?? $default_value; } /** -- cgit v1.2.3-54-g00ecf