From b2afd719fde71229afa1e2082baa5ca7e6dbcceb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:31:07 +0900 Subject: [PATCH] refactor: rename PageCache to ResponseCache --- .../Cache/{PageCache.php => ResponseCache.php} | 2 +- system/CodeIgniter.php | 6 +++--- system/Config/BaseService.php | 4 ++-- system/Config/Services.php | 12 ++++++------ .../{PageCacheTest.php => ResponseCacheTest.php} | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) rename system/Cache/{PageCache.php => ResponseCache.php} (99%) rename tests/system/Cache/{PageCacheTest.php => ResponseCacheTest.php} (94%) diff --git a/system/Cache/PageCache.php b/system/Cache/ResponseCache.php similarity index 99% rename from system/Cache/PageCache.php rename to system/Cache/ResponseCache.php index ad52f02433..a04b369b34 100644 --- a/system/Cache/PageCache.php +++ b/system/Cache/ResponseCache.php @@ -20,7 +20,7 @@ use Exception; /** * Web Page Caching */ -class PageCache +class ResponseCache { /** * Whether to take the URL query string into consideration when generating diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 1d4ccd12fe..5ce7ac69b2 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -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(); } /** diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index f98ec91928..133805a6a5 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -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) diff --git a/system/Config/Services.php b/system/Config/Services.php index 14c9b122cc..c8ded80342 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -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); } /** diff --git a/tests/system/Cache/PageCacheTest.php b/tests/system/Cache/ResponseCacheTest.php similarity index 94% rename from tests/system/Cache/PageCacheTest.php rename to tests/system/Cache/ResponseCacheTest.php index d95c9f10f9..75038e2753 100644 --- a/tests/system/Cache/PageCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -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');