Consolidate trait code

Author: MGatner

system/Psr/Cache/Item.php

@@ -11,10 +11,12 @@
 
 namespace CodeIgniter\Psr\Cache;
 
+use CodeIgniter\Cache\Handlers\BaseHandler;
 use CodeIgniter\I18n\Time;
 use DateInterval;
 use DateTime;
 use DateTimeInterface;
+use InvalidArgumentException;
 use Psr\Cache\CacheItemInterface;
 
 final class Item implements CacheItemInterface
@@ -54,28 +56,21 @@ final class Item implements CacheItemInterface
 	/**
 	 * Validates a cache key according to PSR-6.
 	 *
-	 * @param string $key The key to validate
+	 * @param mixed $key The key to validate
 	 *
 	 * @throws CacheArgumentException When $key is not valid
-	 *
-	 * @see https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
 	 */
-	public static function validateKey($key): string
+	public static function validateKey($key)
 	{
-		if (! is_string($key))
-		{
-			throw new CacheArgumentException('Cache key must be a string');
-		}
-		if ($key === '')
+		// Use the framework's Cache key validation
+		try
 		{
-			throw new CacheArgumentException('Cache key cannot be empty.');
+			BaseHandler::validateKey($key);
 		}
-		if (strpbrk($key, self::RESERVED_CHARACTERS) !== false)
+		catch (InvalidArgumentException $e)
 		{
-			throw new CacheArgumentException('Cache key contains reserved characters ' . self::RESERVED_CHARACTERS);
+			throw new CacheArgumentException($e->getMessage(), $e->getCode(), $e);
 		}
-
-		return $key;
 	}
 
 	/**

system/Psr/Cache/Pool.php

@@ -14,18 +14,12 @@
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\I18n\Time;
 use Config\Cache;
-use Config\Services;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 
 final class Pool implements CacheItemPoolInterface
 {
-	/**
-	 * The adapter to use.
-	 *
-	 * @var CacheInterface
-	 */
-	private $adapter;
+	use SupportTrait;
 
 	/**
 	 * Deferred Items to be saved.
@@ -34,35 +28,6 @@ final class Pool implements CacheItemPoolInterface
 	 */
 	private $deferred = [];
 
-	/**
-	 * Initializes the underlying adapter
-	 * from an existing instance or from the
-	 * Cache Service (with optional config).
-	 *
-	 * @param object|null $object
-	 *
-	 * @throws CacheArgumentException
-	 */
-	public function __construct($object = null)
-	{
-		if (is_null($object))
-		{
-			$this->adapter = Services::cache();
-		}
-		elseif ($object instanceof Cache)
-		{
-			$this->adapter = Services::cache($object, false);
-		}
-		elseif ($object instanceof CacheInterface)
-		{
-			$this->adapter = $object;
-		}
-		else
-		{
-			throw new CacheArgumentException('Cache Pool constructor only accepts an adapter or configuration');
-		}
-	}
-
 	/**
 	 * Commits any deferred Items.
 	 */

system/Psr/Cache/SimpleCache.php

@@ -33,7 +33,7 @@ final class SimpleCache implements CacheInterface
 	 */
 	public function get($key, $default = null)
 	{
-		self::validateKey($key);
+		Item::validateKey($key);
 
 		$meta = $this->adapter->getMetaData($key);
 
@@ -62,7 +62,7 @@ public function get($key, $default = null)
 	 */
 	public function set($key, $value, $ttl = null)
 	{
-		self::validateKey($key);
+		Item::validateKey($key);
 
 		// Get TTL as an integer (seconds)
 		if (is_null($ttl))
@@ -100,7 +100,7 @@ public function set($key, $value, $ttl = null)
 	 */
 	public function delete($key)
 	{
-		self::validateKey($key);
+		Item::validateKey($key);
 
 		// Nonexistant keys return true
 		if (! is_array($this->adapter->getMetaData($key)))
@@ -235,7 +235,7 @@ public function deleteMultiple($keys)
 	 */
 	public function has($key)
 	{
-		self::validateKey($key);
+		Item::validateKey($key);
 
 		$meta = $this->adapter->getMetaData($key);
 

system/Psr/Cache/SupportTrait.php

@@ -11,11 +11,8 @@
 
 namespace CodeIgniter\Psr\Cache;
 
-use CodeIgniter\Cache\Handlers\BaseHandler;
 use CodeIgniter\Cache\CacheInterface;
 use Config\Cache;
-use Config\Services;
-use InvalidArgumentException;
 
 /**
  * Cache Support Trait
@@ -32,26 +29,6 @@ trait SupportTrait
 	 */
 	private $adapter;
 
-	/**
-	 * Validates a cache key according to PSR-6.
-	 *
-	 * @param mixed $key The key to validate
-	 *
-	 * @throws CacheArgumentException When $key is not valid
-	 */
-	public static function validateKey($key)
-	{
-		// Use the framework's Cache key validation
-		try
-		{
-			BaseHandler::validateKey($key);
-		}
-		catch (InvalidArgumentException $e)
-		{
-			throw new CacheArgumentException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
 	/**
 	 * Initializes the underlying adapter
 	 * from an existing instance or from the
@@ -65,11 +42,11 @@ public function __construct($object = null)
 	{
 		if (is_null($object))
 		{
-			$this->adapter = Services::cache();
+			$this->adapter = service('cache');
 		}
 		elseif ($object instanceof Cache)
 		{
-			$this->adapter = Services::cache($object, false);
+			$this->adapter = service('cache', $object, false);
 		}
 		elseif ($object instanceof CacheInterface)
 		{