From 127ccdb6f3036e785ab0b88e51873d60e89157b7 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 30 Sep 2024 15:45:06 +0400
Subject: [PATCH] Simplify Memory::loadData()

---
 src/Boot/src/Memory.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Boot/src/Memory.php b/src/Boot/src/Memory.php
index c897aa850..9024d6aba 100644
--- a/src/Boot/src/Memory.php
+++ b/src/Boot/src/Memory.php
@@ -34,29 +34,28 @@ public function loadData(string $section, string &$filename = null): mixed
             return null;
         }
 
+        $fp = false;
+        $lock = false;
+
         try {
             $fp = \fopen($filename, 'r');
             if ($fp === false) {
                 return null;
             }
 
-            if (!\flock($fp, \LOCK_SH | \LOCK_NB)) {
-                \fclose($fp);
+            $lock = \flock($fp, \LOCK_SH | \LOCK_NB);
+
+            if ($lock === false) {
                 return null;
             }
 
-            $data = include($filename);
-
-            \flock($fp, \LOCK_UN);
+            return include($filename);
         } catch (\Throwable) {
             return null;
         } finally {
-            if (isset($fp)) {
-                \fclose($fp);
-            }
+            $lock === false or \flock($fp, \LOCK_UN);
+            $fp === false or \fclose($fp);
         }
-
-        return $data;
     }
 
     public function saveData(string $section, mixed $data): void