Small simplifications

flack · Jan 18, 2024 · 9e8e87d · 9e8e87d
1 parent 8740f6b
commit 9e8e87d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/lib/midcom/application.php b/lib/midcom/application.php
@@ -64,10 +64,7 @@ public function __construct(string $environment, bool $debug)
 
     private function get_request() : Request
     {
-        if (!$this->request) {
-            $this->request = Request::createFromGlobals();
-        }
-        return $this->request;
+        return $this->request ?? Request::createFromGlobals();
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)

diff --git a/lib/midcom/core/account.php b/lib/midcom/core/account.php
@@ -194,9 +194,7 @@ private function _update() : bool
 
         if (   !empty($this->_old_username)
             && $this->_old_username !== $new_username) {
-            if (!$history = @unserialize($this->_person->get_parameter('midcom', 'username_history'))) {
-                $history = [];
-            }
+            $history = @unserialize($this->_person->get_parameter('midcom', 'username_history')) ?: [];
             $history[time()] = ['old' => $this->_old_username, 'new' => $new_username];
             $this->_person->set_parameter('midcom', 'username_history', serialize($history));
         }

diff --git a/lib/midcom/core/dbaobject.php b/lib/midcom/core/dbaobject.php
@@ -299,17 +299,11 @@ public function is_locked() : bool
     }
     public function lock() : bool
     {
-        if ($this->__object->is_locked()) {
-            return true;
-        }
-        return $this->__object->lock();
+        return $this->__object->is_locked() || $this->__object->lock();
     }
     public function unlock() : bool
     {
-        if (!$this->__object->is_locked()) {
-            return true;
-        }
-        return $this->__object->unlock();
+        return !$this->__object->is_locked() || $this->__object->unlock();
     }
     public function is_approved() : bool
     {