Small simplifications

Author: flack

lib/midcom/helper/nav/node.php

@@ -133,11 +133,7 @@ protected function prepare_data() : array
 
     private function load_data() : ?array
     {
-        if (empty($this->topic)) {
-            $topic = new midcom_core_dbaproxy($this->topic_id, midcom_db_topic::class);
-        } else {
-            $topic = $this->topic;
-        }
+        $topic = $this->topic ?? new midcom_core_dbaproxy($this->topic_id, midcom_db_topic::class);
 
         // Retrieve a NAP instance
         $nap = $this->get_component_nap($topic);

lib/midcom/helper/reflector/main.php

@@ -403,23 +403,15 @@ public static function resolve_baseclass(string|object $classname) : string
 
         $classname = ClassUtils::getRealClass($classname);
 
-        if (isset($cached[$classname])) {
-            return $cached[$classname];
-        }
+        if (!isset($cached[$classname])) {
+            $class_instance ??= new $classname();
 
-        if (!isset($class_instance)) {
-            $class_instance = new $classname();
-        }
+            // Check for decorators first
+            $parent_class = $class_instance->__mgdschema_class_name__ ?? $classname;
 
-        // Check for decorators first
-        if (!empty($class_instance->__mgdschema_class_name__)) {
-            $parent_class = $class_instance->__mgdschema_class_name__;
-        } else {
-            $parent_class = $classname;
+            $cached[$classname] = self::class_rewrite($parent_class);
         }
 
-        $cached[$classname] = self::class_rewrite($parent_class);
-
         return $cached[$classname];
     }
 

lib/midgard/admin/asgard/navigation.php

@@ -286,11 +286,10 @@ private function _process_root_types() : array
         if (   ($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', $selected, $regs)) {
             $types = array_flip($regs[1]);
-            if ($exclude) {
-                $label_mapping = array_diff_key($label_mapping, $types);
-            } else {
-                $label_mapping = array_intersect_key($label_mapping, $types);
-            }
+            $label_mapping = match ($exclude) {
+                true => array_diff_key($label_mapping, $types),
+                false => array_intersect_key($label_mapping, $types)
+            };
         }
 
         // Get the possible regular expression