CacheFileProvider renamed to FileCacheProvider.

CacheIdleProvider renamed to IdleCacheProvider.

Author: meet-aleksey

src/AppBuilder.php

@@ -160,7 +160,7 @@ private static function init() {
         }
 
         if (empty(self::$config['cacheProvider'])) {
-            self::$config['cacheProvider'] = new CacheIdleProvider();
+            self::$config['cacheProvider'] = new IdleCacheProvider();
         }
         elseif (!self::$config['cacheProvider'] instanceof CacheProvider) {
             throw new \Exception('The $cacheProvider type must be the base of "\PhpMvc\CacheProvider".');

src/CacheFileProvider.php renamed to src/FileCacheProvider.php

@@ -4,7 +4,7 @@
 /**
  * Represents a standard cache provider for storing the cache in the file system.
  */
-final class CacheFileProvider implements CacheProvider {
+final class FileCacheProvider implements CacheProvider {
 
     /**
      * The path to the cache files directory.
@@ -28,13 +28,13 @@ final class CacheFileProvider implements CacheProvider {
     private $hash;
 
     /**
-     * Initializes a new instance of the CacheFileProvider class.
+     * Initializes a new instance of the FileCacheProvider class.
      * 
-     * @param CacheFileProviderConfig $config Cache settings.
+     * @param FileCacheProviderConfig $config Cache settings.
      */
     public function __construct($config = null) {
         if (!isset($config)) {
-            $config = new CacheFileProviderConfig();
+            $config = new FileCacheProviderConfig();
         }
         elseif (is_array($config)) {
             $config = InternalHelper::arrayToObject($config);

src/CacheFileProviderConfig.php renamed to src/FileCacheProviderConfig.php

@@ -4,7 +4,7 @@
 /**
  * Represents a standard cache provider for storing the cache in the file system.
  */
-final class CacheFileProviderConfig {
+final class FileCacheProviderConfig {
 
     /**
      * The path to the cache files directory.

src/CacheIdleProvider.php renamed to src/IdleCacheProvider.php

@@ -4,7 +4,7 @@
 /**
  * Represents a cache provider that does nothing.
  */
-final class CacheIdleProvider implements CacheProvider {
+final class IdleCacheProvider implements CacheProvider {
 
     /**
      * Inserts a cache entry into the cache.

tests/CacheFileProviderTest.php renamed to tests/FileCacheProviderTest.php

@@ -5,10 +5,10 @@
 
 use PHPUnit\Framework\TestCase;
 
-use PhpMvc\CacheFileProviderConfig;
-use PhpMvc\CacheFileProvider;
+use PhpMvc\FileCacheProviderConfig;
+use PhpMvc\FileCacheProvider;
 
-final class CacheFileProviderTest extends TestCase
+final class FileCacheProviderTest extends TestCase
 {
 
     public function __construct($name = null, array $data = [], $dataName = '') {
@@ -26,7 +26,7 @@ public function __construct($name = null, array $data = [], $dataName = '') {
     }
 
     public function testDefault(): void {
-        $cache = new CacheFileProvider();
+        $cache = new FileCacheProvider();
 
         $cache->clear();
 
@@ -107,7 +107,7 @@ public function testDefault(): void {
     }
 
     public function testRegion(): void {
-        $cache = new CacheFileProvider();
+        $cache = new FileCacheProvider();
 
         $cache->clear();
 
@@ -159,7 +159,7 @@ public function testRegion(): void {
     }
 
     public function testKeys(): void {
-        $cache = new CacheFileProvider();
+        $cache = new FileCacheProvider();
 
         $cache->clear();
 
@@ -172,7 +172,7 @@ public function testKeys(): void {
 
         $this->assertNull($cache->get('!@#/#$%@&*(/\\'));
 
-        $cache = new CacheFileProvider(array('hash' => 'sha1'));
+        $cache = new FileCacheProvider(array('hash' => 'sha1'));
 
         $this->assertEquals('Hello, World!', $cache->getOrAdd('!@#/#$%@&*(/\\', function() { return 'Hello, World!'; }, 5));
         $this->assertEquals(123, $cache->getOrAdd('!@####!/#$%@&*(/\\', function() { return 123; }, 5));
@@ -186,7 +186,7 @@ public function testKeys(): void {
     }
 
     public function testAccess(): void {
-        $cache = new CacheFileProvider();
+        $cache = new FileCacheProvider();
 
         $cache->clear();
 

tests/HttpContext.php

@@ -1,7 +1,7 @@
 <?php
 use PhpMvc\InternalHelper;
 use PhpMvc\HttpContextBase;
-use PhpMvc\CacheIdleProvider;
+use PhpMvc\IdleCacheProvider;
 use PhpMvc\DefaultRouteProvider;
 
 require_once 'HttpRequest.php';
@@ -16,7 +16,7 @@ public function __construct($info) {
         }
 
         if ($info->cacheProvider === null) {
-            $info->cacheProvider = new CacheIdleProvider();
+            $info->cacheProvider = new IdleCacheProvider();
         }
 
         $info->request = new HttpRequest($info->serverVariables, $info->get, $info->post);

tests/OutputCacheTest.php

@@ -7,7 +7,7 @@
 
 use PhpMvc\Route;
 use PhpMvc\RouteCollection;
-use PhpMvc\CacheFileProvider;
+use PhpMvc\FileCacheProvider;
 use PhpMvc\DefaultRouteProvider;
 use PhpMvc\UrlParameter;
 use PhpMvc\AppBuilder;
@@ -37,7 +37,7 @@ public function __construct($name = null, array $data = [], $dataName = '') {
         AppBuilder::useNamespace('PhpMvcTest');
         AppBuilder::useBasePath($basePath);
 
-        $this->cacheProvider = new CacheFileProvider();
+        $this->cacheProvider = new FileCacheProvider();
     }
 
     public function testNoCache(): void {