Apply review recommendations

Author: MGatner

system/Cache/Handlers/BaseHandler.php

@@ -23,8 +23,7 @@ abstract class BaseHandler implements CacheInterface
 {
 	/**
 	 * Reserved characters that cannot be used in a key or tag.
-	 *
-	 * @see https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
+	 * From https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
 	 */
 	public const RESERVED_CHARACTERS = '{}()/\@:';
 
@@ -44,13 +43,12 @@ abstract class BaseHandler implements CacheInterface
 	/**
 	 * Validates a cache key according to PSR-6.
 	 * Keys that exceed MAX_KEY_LENGTH are hashed.
+	 * From https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
 	 *
 	 * @param string $key    The key to validate
 	 * @param string $prefix Optional prefix to include in length calculations
 	 *
 	 * @throws InvalidArgumentException When $key is not valid
-	 *
-	 * @see https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
 	 */
 	public static function validateKey($key, $prefix = ''): string
 	{

system/Cache/Handlers/FileHandler.php

@@ -23,7 +23,7 @@ class FileHandler extends BaseHandler
 	/**
 	 * Maximum key length.
 	 */
-	public const MAX_KEY_LENGTH = 255;
+	public const MAX_KEY_LENGTH = PHP_MAXPATHLEN;
 
 	/**
 	 * Where to store cached files on the disk.

system/Cache/Handlers/WincacheHandler.php

@@ -51,10 +51,10 @@ public function initialize()
 	 */
 	public function get(string $key)
 	{
-		$key     = static::validateKey($key);
+		$key     = static::validateKey($key, $this->prefix);
 		$success = false;
 
-		$data = wincache_ucache_get($this->prefix . $key, $success);
+		$data = wincache_ucache_get($key, $success);
 
 		// Success returned by reference from wincache_ucache_get()
 		return $success ? $data : null;
@@ -73,9 +73,9 @@ public function get(string $key)
 	 */
 	public function save(string $key, $value, int $ttl = 60)
 	{
-		$key = static::validateKey($key);
+		$key = static::validateKey($key, $this->prefix);
 
-		return wincache_ucache_set($this->prefix . $key, $value, $ttl);
+		return wincache_ucache_set($key, $value, $ttl);
 	}
 
 	//--------------------------------------------------------------------
@@ -89,9 +89,9 @@ public function save(string $key, $value, int $ttl = 60)
 	 */
 	public function delete(string $key)
 	{
-		$key = static::validateKey($key);
+		$key = static::validateKey($key, $this->prefix);
 
-		return wincache_ucache_delete($this->prefix . $key);
+		return wincache_ucache_delete($key);
 	}
 
 	//--------------------------------------------------------------------
@@ -120,9 +120,9 @@ public function deleteMatching(string $pattern)
 	 */
 	public function increment(string $key, int $offset = 1)
 	{
-		$key = static::validateKey($key);
+		$key = static::validateKey($key, $this->prefix);
 
-		return wincache_ucache_inc($this->prefix . $key, $offset);
+		return wincache_ucache_inc($key, $offset);
 	}
 
 	//--------------------------------------------------------------------
@@ -137,9 +137,9 @@ public function increment(string $key, int $offset = 1)
 	 */
 	public function decrement(string $key, int $offset = 1)
 	{
-		$key = static::validateKey($key);
+		$key = static::validateKey($key, $this->prefix);
 
-		return wincache_ucache_dec($this->prefix . $key, $offset);
+		return wincache_ucache_dec($key, $offset);
 	}
 
 	//--------------------------------------------------------------------
@@ -183,9 +183,9 @@ public function getCacheInfo()
 	 */
 	public function getMetaData(string $key)
 	{
-		$key = static::validateKey($key);
+		$key = static::validateKey($key, $this->prefix);
 
-		if ($stored = wincache_ucache_info(false, $this->prefix . $key))
+		if ($stored = wincache_ucache_info(false, $key))
 		{
 			$age      = $stored['ucache_entries'][1]['age_seconds'];
 			$ttl      = $stored['ucache_entries'][1]['ttl_seconds'];

tests/system/Cache/Handlers/BaseHandlerTest.php

@@ -14,7 +14,7 @@ public function testValidateKeyInvalidType($input)
 		$this->expectException('InvalidArgumentException');
 		$this->expectExceptionMessage('Cache key must be a string');
 
-		BaseHandler::validateKey(false);
+		BaseHandler::validateKey($input);
 	}
 
 	public function invalidTypeProvider(): array

tests/system/Cache/Handlers/FileHandlerTest.php

@@ -129,7 +129,7 @@ public function testSave()
 
 	public function testSaveExcessiveKeyLength()
 	{
-		$key  = str_repeat('a', 300);
+		$key  = str_repeat('a', PHP_MAXPATHLEN + 10);
 		$file = $this->config->file['storePath'] . DIRECTORY_SEPARATOR . md5($key);
 
 		$this->assertTrue($this->fileHandler->save($key, 'value'));