Fix and add tests

Author: MGatner

system/Psr/Cache/Item.php

@@ -249,7 +249,8 @@ public function isExpired(): bool
 	{
 		if (isset($this->expiration))
 		{
-			return $this->expiration->isBefore(Time::now());
+			$now = Time::now();
+			return $this->expiration->isBefore($now) || $this->expiration->sameAs($now);
 		}
 
 		return false;

system/Psr/Cache/Pool.php

@@ -273,7 +273,7 @@ public function save(CacheItemInterface $item)
 		}
 
 		// Deteremine TTL
-		$ttl = ($expiration = $item->getExpiration()) ? Time::now()->difference($expiration)->getSeconds() : 0;
+		$ttl = ($expiration = $item->getExpiration()) ? Time::now()->difference($expiration)->getSeconds() : 60;
 
 		return $this->adapter->save($item->getKey(), $item->get(), $ttl);
 	}

tests/psr/CachePoolTest.php

@@ -1,12 +1,16 @@
 <?php
 
 use Cache\IntegrationTests\CachePoolTest as TestCase;
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Psr\Cache\Pool;
+use Config\Services;
 
 class CachePoolTest extends TestCase
 {
 	public function createCachePool()
 	{
+		Services::resetSingle('cache');
+		Time::setTestNow(null);
 		return new Pool();
 	}
 }

tests/psr/SimpleCacheTest.php

@@ -1,12 +1,16 @@
 <?php
 
 use Cache\IntegrationTests\SimpleCacheTest as TestCase;
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Psr\Cache\SimpleCache;
+use Config\Services;
 
 class SimpleCacheTest extends TestCase
 {
 	public function createSimpleCache()
 	{
+		Services::resetSingle('cache');
+		Time::setTestNow(null);
 		return new SimpleCache();
 	}
 }

tests/psr/SupportTraitTest.php

@@ -0,0 +1,56 @@
+<?php
+
+use CodeIgniter\Cache\Handlers\DummyHandler;
+use CodeIgniter\Psr\Cache\CacheArgumentException;
+use CodeIgniter\Psr\Cache\SimpleCache;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockCache;
+use Config\Cache;
+use Config\Services;
+
+class SupportTraitTest extends CIUnitTestCase
+{
+	public function setUp(): void
+	{
+		parent::setUp();
+
+		Services::resetSingle('cache');
+	}
+
+	public function testDefaultUsesSharedInstance()
+	{
+		Services::injectMock('cache', new MockCache());
+
+		$psr    = new SimpleCache();
+		$result = $this->getPrivateProperty($psr, 'adapter');
+
+		$this->assertInstanceOf(MockCache::class, $result);
+	}
+
+	public function testUsesConfig()
+	{
+		$config          = new Cache();
+		$config->handler = 'dummy';
+
+		$psr    = new SimpleCache($config);
+		$result = $this->getPrivateProperty($psr, 'adapter');
+
+		$this->assertInstanceOf(DummyHandler::class, $result);
+	}
+
+	public function testUsesHandler()
+	{
+		$psr    = new SimpleCache(new MockCache());
+		$result = $this->getPrivateProperty($psr, 'adapter');
+
+		$this->assertInstanceOf(MockCache::class, $result);
+	}
+
+	public function testThrowsException()
+	{
+		$this->expectException(CacheArgumentException::class);
+		$this->expectExceptionMessage('CodeIgniter\Psr\Cache\SimpleCache constructor only accepts an adapter or configuration');
+
+		$psr = new SimpleCache(42);
+	}
+}