Remove deleteFromOpcodeCache & clearOpcodeCache

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

2 files changed, 2 insertions, 35 deletions

diff --git a/lib/private/Config.php b/lib/private/Config.php
index c881e485006..f462bebaf58 100644
--- a/lib/private/Config.php
+++ b/lib/private/Config.php
@@ -265,10 +265,8 @@ class Config {
 		flock($filePointer, LOCK_UN);
 		fclose($filePointer);
 
-		// Try invalidating the opcache just for the file we wrote...
-		if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
-			// But if that doesn't work, clear the whole cache.
-			\OC_Util::clearOpcodeCache();
+		if (function_exists('opcache_invalidate')) {
+			@opcache_invalidate($this->configFilePath, true);
 		}
 	}
 }
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index cd6ce0b64ae..af2d555b885 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -1324,37 +1324,6 @@ class OC_Util {
 	}
 
 	/**
-	 * Clear a single file from the opcode cache
-	 * This is useful for writing to the config file
-	 * in case the opcode cache does not re-validate files
-	 * Returns true if successful, false if unsuccessful:
-	 * caller should fall back on clearing the entire cache
-	 * with clearOpcodeCache() if unsuccessful
-	 *
-	 * @param string $path the path of the file to clear from the cache
-	 * @return bool true if underlying function returns true, otherwise false
-	 */
-	public static function deleteFromOpcodeCache($path): bool {
-		if (!empty($path) && function_exists('opcache_invalidate')) {
-			return @opcache_invalidate($path); // Zend OpCache >= 7.0.0, PHP >= 5.5.0
-		}
-		return false;
-	}
-
-	/**
-	 * Clear the opcode cache if one exists
-	 * This is necessary for writing to the config file
-	 * in case the opcode cache does not re-validate files
-	 *
-	 * @return void
-	 */
-	public static function clearOpcodeCache(): void {
-		if (function_exists('opcache_reset')) {
-			@opcache_reset(); // Opcache (PHP >= 5.5)
-		}
-	}
-
-	/**
 	 * Normalize a unicode string
 	 *
 	 * @param string $value a not normalized string