malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: rename PageCache to ResponseCache

Browse Source
This commit is contained in:
kenjis 2023-07-03 11:31:07 +09:00
parent 397194166a
commit b2afd719fd
No known key found for this signature in database
GPG Key ID: BD254878922AF198
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/Cache/PageCache.php → system/Cache/ResponseCache.php
View File

@ -20,7 +20,7 @@ use Exception;
/**
* Web Page Caching
*/
class PageCache
class ResponseCache
{
/**
* Whether to take the URL query string into consideration when generating

6
system/CodeIgniter.php
View File

@ -12,7 +12,7 @@
namespace CodeIgniter;
use Closure;
use CodeIgniter\Cache\PageCache;
use CodeIgniter\Cache\ResponseCache;
use CodeIgniter\Debug\Timer;
use CodeIgniter\Events\Events;
use CodeIgniter\Exceptions\FrameworkException;
@ -179,7 +179,7 @@ class CodeIgniter
/**
* Web Page Caching
*/
protected PageCache $pageCache;
protected ResponseCache $pageCache;
/**
* Constructor.
@ -189,7 +189,7 @@ class CodeIgniter
$this->startTime = microtime(true);
$this->config = $config;
$this->pageCache = Services::pagecache();
$this->pageCache = Services::responsecache();
}
/**

4
system/Config/BaseService.php
View File

@ -14,7 +14,7 @@ namespace CodeIgniter\Config;
use CodeIgniter\Autoloader\Autoloader;
use CodeIgniter\Autoloader\FileLocator;
use CodeIgniter\Cache\CacheInterface;
use CodeIgniter\Cache\PageCache;
use CodeIgniter\Cache\ResponseCache;
use CodeIgniter\CLI\Commands;
use CodeIgniter\CodeIgniter;
use CodeIgniter\Database\ConnectionInterface;
@ -112,13 +112,13 @@ use Config\View as ConfigView;
* @method static Logger logger($getShared = true)
* @method static MigrationRunner migrations(Migrations $config = null, ConnectionInterface $db = null, $getShared = true)
* @method static Negotiate negotiator(RequestInterface $request = null, $getShared = true)
* @method static PageCache pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true)
* @method static Pager pager(ConfigPager $config = null, RendererInterface $view = null, $getShared = true)
* @method static Parser parser($viewPath = null, ConfigView $config = null, $getShared = true)
* @method static RedirectResponse redirectresponse(App $config = null, $getShared = true)
* @method static View renderer($viewPath = null, ConfigView $config = null, $getShared = true)
* @method static IncomingRequest|CLIRequest request(App $config = null, $getShared = true)
* @method static ResponseInterface response(App $config = null, $getShared = true)
* @method static ResponseCache responsecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true)
* @method static Router router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true)
* @method static RouteCollection routes($getShared = true)
* @method static Security security(App $config = null, $getShared = true)

12
system/Config/Services.php
View File

@ -13,7 +13,7 @@ namespace CodeIgniter\Config;
use CodeIgniter\Cache\CacheFactory;
use CodeIgniter\Cache\CacheInterface;
use CodeIgniter\Cache\PageCache;
use CodeIgniter\Cache\ResponseCache;
use CodeIgniter\CLI\Commands;
use CodeIgniter\CodeIgniter;
use CodeIgniter\Database\ConnectionInterface;
@ -440,20 +440,20 @@ class Services extends BaseService
}
/**
* Return the PageCache.
* Return the ResponseCache.
*
* @return PageCache
* @return ResponseCache
*/
public static function pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true)
public static function responsecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true)
{
if ($getShared) {
return static::getSharedInstance('pagecache', $config, $cache);
return static::getSharedInstance('responsecache', $config, $cache);
}
$config ??= config(Cache::class);
$cache ??= AppServices::cache();
return new PageCache($config, $cache);
return new ResponseCache($config, $cache);
}
/**

16
tests/system/Cache/PageCacheTest.php → tests/system/Cache/ResponseCacheTest.php
View File

@ -30,7 +30,7 @@ use Exception;
*
* @group Others
*/
final class PageCacheTest extends CIUnitTestCase
final class ResponseCacheTest extends CIUnitTestCase
{
private AppConfig $appConfig;
@ -82,18 +82,18 @@ final class PageCacheTest extends CIUnitTestCase
return new CLIRequest($appConfig);
}
private function createPageCache(?CacheConfig $cacheConfig = null): pageCache
private function createResponseCache(?CacheConfig $cacheConfig = null): ResponseCache
{
$cache = mock(CacheFactory::class);
$cacheConfig ??= new CacheConfig();
return new PageCache($cacheConfig, $cache);
return new ResponseCache($cacheConfig, $cache);
}
public function testCachePageIncomingRequest()
{
$pageCache = $this->createPageCache();
$pageCache = $this->createResponseCache();
$request = $this->createIncomingRequest('foo/bar');
@ -133,7 +133,7 @@ final class PageCacheTest extends CIUnitTestCase
{
$cacheConfig = new CacheConfig();
$cacheConfig->cacheQueryString = true;
$pageCache = $this->createPageCache($cacheConfig);
$pageCache = $this->createResponseCache($cacheConfig);
$request = $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']);
@ -169,7 +169,7 @@ final class PageCacheTest extends CIUnitTestCase
public function testCachePageCLIRequest()
{
$pageCache = $this->createPageCache();
$pageCache = $this->createResponseCache();
$request = $this->createCLIRequest(['foo', 'bar']);
@ -202,7 +202,7 @@ final class PageCacheTest extends CIUnitTestCase
$cache = mock(CacheFactory::class);
$cacheConfig = new CacheConfig();
$pageCache = new PageCache($cacheConfig, $cache);
$pageCache = new ResponseCache($cacheConfig, $cache);
$request = $this->createIncomingRequest('foo/bar');
@ -228,7 +228,7 @@ final class PageCacheTest extends CIUnitTestCase
$cache = mock(CacheFactory::class);
$cacheConfig = new CacheConfig();
$pageCache = new PageCache($cacheConfig, $cache);
$pageCache = new ResponseCache($cacheConfig, $cache);
$request = $this->createIncomingRequest('foo/bar');