From 9dc7b6dc0cf06875f62a8311c7fcf3d6b823baca Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Fri, 5 Apr 2024 11:29:41 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B07405=20-=20:white=5Fcheck=5Fmark:=20Fix?=
 =?UTF-8?q?=20unit=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/apc-emulation.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/apc-emulation.php b/core/apc-emulation.php
index c1941353f..4e61fc2d7 100644
--- a/core/apc-emulation.php
+++ b/core/apc-emulation.php
@@ -60,14 +60,15 @@ function apc_store($key, $var = NULL, $ttl = 0)
  */
 function apc_fetch($key)
 {
-	if (is_array($key))
-	{
-		$aResult = array();
-		foreach($key as $sKey)
-		{
+	if (is_array($key)) {
+		$aResult = [];
+		foreach ($key as $sKey) {
 			$aResult[$sKey] = apcFile::FetchOneFile($sKey);
 		}
+
 		return $aResult;
+	} elseif (is_null($key)) {
+		return false;
 	}
 	return apcFile::FetchOneFile($key);
 }
@@ -214,7 +215,12 @@ class apcFile
 		if (empty($sKey)) {
 			return false;
 		}
-
+		if (is_file(self::GetCacheFileName($sKey))) {
+			@unlink(self::GetCacheFileName($sKey));
+		}
+		if (is_file(self::GetCacheFileName('-'.$sKey))) {
+			@unlink(self::GetCacheFileName('-'.$sKey));
+		}
 		if ($iTTL > 0) {
 			// hint for ttl management
 			$sKey = '-'.$sKey;