Code review changes

Author: TheSyscall

library/Icinga/Web/Form/ConfigForm.php

@@ -106,11 +106,7 @@ protected function getConfigValue(string $name, mixed $default = null): mixed
      */
     protected function shouldRevertIfEmpty(string $elementName): bool
     {
-        $element = $this->getElement($elementName);
-        return match (true) {
-            $element instanceof PasswordElement => true,
-            default => false,
-        };
+        return $this->getElement($elementName) instanceof PasswordElement;
     }
 
     /**

library/Icinga/Web/Form/ConfigSectionForm.php

@@ -92,9 +92,8 @@ public function isValid(): bool
             if (! $this->hasElement('CSRFToken')) {
                 return true;
             }
-            $csrf = $this->getElement('CSRFToken');
 
-            return $csrf->isValid();
+            return $this->getElement('CSRFToken')->isValid();
         }
 
         return parent::isValid();
@@ -138,11 +137,7 @@ public function setAllowDeletion(bool $allowDeletion = true): static
      */
     public function allowDeletion(): bool
     {
-        if ($this->isCreateForm()) {
-            return false;
-        }
-
-        return $this->allowDeletion;
+        return ! $this->isCreateForm() && $this->allowDeletion;
     }
 
     /**
@@ -178,11 +173,7 @@ public function setAllowRename(bool $allowRename = true): static
      */
     public function allowRename(): bool
     {
-        if ($this->isCreateForm()) {
-            return false;
-        }
-
-        return $this->allowRename;
+        return ! $this->isCreateForm() && $this->allowRename;
     }
 
     /**
@@ -288,11 +279,7 @@ protected function addSectionNameElement(array $params = []): void
         $params['ignore'] = true;
         $params['label'] ??= $this->translate('Name');
         $params['validators'][] = new CallbackValidator(function ($value, CallbackValidator $validator) {
-            if (Str::isEmpty($value)) {
-                return true;
-            }
-
-            if ($value === $this->section) {
+            if (Str::isEmpty($value) || $value === $this->section) {
                 return true;
             }
 
@@ -309,11 +296,7 @@ protected function addSectionNameElement(array $params = []): void
 
     protected function getIniKeyFromName(string $name): ?array
     {
-        if ($this->section === null) {
-            return null;
-        }
-
-        return [$this->section, $name];
+        return $this->section === null ? null : [$this->section, $name];
     }
 
     protected function onSuccess(): void
@@ -407,19 +390,18 @@ protected function shouldRename(): bool
 
     protected function save(): void
     {
+        $configSection = $this->config->getSection($this->section);
         foreach ($this->getValues() as $element => $value) {
             if (Str::isEmpty($value) && $this->shouldRevertIfEmpty($element)) {
                 $value = $this->config->get($this->section, $element);
             }
-            $configSection = $this->config->getSection($this->section);
             if (Str::isEmpty($value)) {
                 unset($configSection[$element]);
             } else {
                 $configSection->$element = $value;
             }
-            $this->config->setSection($this->section, $configSection);
         }
-
+        $this->config->setSection($this->section, $configSection);
         $this->config->saveIni();
     }
 }