Refactor.

Author: Maikuolan

src/Cache.php

@@ -250,38 +250,35 @@ public function __destruct()
             $this->WorkingData->close();
             return;
         }
-        if ($this->Using === 'PDO') {
-            $this->clearExpiredPDO();
+        if (!\is_array($this->WorkingData)) {
             return;
         }
-        if (\is_array($this->WorkingData)) {
-            if ($this->clearExpired($this->WorkingData)) {
-                $this->Modified = true;
-            }
-            if ($this->FFDefault && $this->Modified && $this->Using === 'FF') {
-                $Handle = false;
-                $Start = \time();
-                while (true) {
-                    $Handle = \fopen($this->FFDefault, 'wb');
-                    if ($Handle !== false || (\time() - $Start) > self::FLOCK_TIMEOUT) {
-                        break;
-                    }
-                }
-                if ($Handle === false) {
-                    return;
-                }
-                $Locked = false;
-                while (true) {
-                    if ($Locked = \flock($Handle, \LOCK_EX | \LOCK_NB) || (\time() - $Start) > self::FLOCK_TIMEOUT) {
-                        break;
-                    }
+        if ($this->clearExpired($this->WorkingData)) {
+            $this->Modified = true;
+        }
+        if ($this->FFDefault && $this->Modified && $this->Using === 'FF') {
+            $Handle = false;
+            $Start = \time();
+            while (true) {
+                $Handle = \fopen($this->FFDefault, 'wb');
+                if ($Handle !== false || (\time() - $Start) > self::FLOCK_TIMEOUT) {
+                    break;
                 }
-                if ($Locked) {
-                    \fwrite($Handle, \serialize($this->WorkingData));
-                    \flock($Handle, LOCK_UN);
+            }
+            if ($Handle === false) {
+                return;
+            }
+            $Locked = false;
+            while (true) {
+                if ($Locked = \flock($Handle, \LOCK_EX | \LOCK_NB) || (\time() - $Start) > self::FLOCK_TIMEOUT) {
+                    break;
                 }
-                \fclose($Handle);
             }
+            if ($Locked) {
+                \fwrite($Handle, \serialize($this->WorkingData));
+                \flock($Handle, \LOCK_UN);
+            }
+            \fclose($Handle);
         }
     }
 

src/DelayedIO.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Delayed file IO class (last modified: 2026.03.17).
+ * Delayed file IO class (last modified: 2026.03.20).
  *
  * This file is a part of the "common classes package", utilised by a number of
  * packages and projects, including CIDRAM and phpMussel.
@@ -129,7 +129,7 @@ public function readFile(string $File = '', int $Lock = 0): string
             $Time = \time();
             $Unlocked = false;
             while (!$Unlocked) {
-                $Unlocked = \flock($Handle, LOCK_UN);
+                $Unlocked = \flock($Handle, \LOCK_UN);
                 if (!$Unlocked && (\time() - $Time) >= self::LOCK_TIMEOUT) {
                     break;
                 }