浏览代码

rev.20 Delete Core\Cache

FileCache used without a wrapper
Visman 4 年之前
父节点
当前提交
ed26a085b6
共有 5 个文件被更改,包括 39 次插入6 次删除
  1. 12 0
      app/Controllers/Update.php
  2. 4 0
      app/Core/Cache.php
  3. 21 0
      app/Models/Pages/Admin/Update.php
  4. 1 1
      app/bootstrap.php
  5. 1 5
      app/config/main.dist.php

+ 12 - 0
app/Controllers/Update.php

@@ -37,6 +37,18 @@ class Update
 
             $this->c->config($confChange);
         }
+        if ($this->c->config->i_fork_revision < 20) {
+            $confChange = [
+                'shared' => [
+                    'Cache' => [
+                        'class'     => \ForkBB\Core\Cache\FileCache::class,
+                        'cache_dir' => '%DIR_CACHE%',
+                    ],
+                ],
+            ];
+
+            $this->c->config($confChange);
+        }
 
         $uri = $_SERVER['REQUEST_URI'];
         if (false !== ($pos = \strpos($uri, '?'))) {

+ 4 - 0
app/Core/Cache.php

@@ -4,6 +4,10 @@ namespace ForkBB\Core;
 
 use Psr\SimpleCache\CacheInterface;
 
+/**
+ * Класс не используется с rev.20
+ * Оставлен для возможности обновления с предыдущих ревизий
+ */
 class Cache
 {
     /**

+ 21 - 0
app/Models/Pages/Admin/Update.php

@@ -885,4 +885,25 @@ class Update extends Admin
 
         return null;
     }
+
+    /**
+     * rev.19 to rev.20
+     */
+    protected function stageNumber19(array $args): ?int
+    {
+        $coreConfig = new CoreConfig($this->c->DIR_CONFIG . '/' . self::CONFIG_FILE);
+
+        $result = $coreConfig->delete(
+            'shared=>FileCache',
+        );
+
+        $coreConfig->add(
+            'shared=>Cache',
+            $result
+        );
+
+        $coreConfig->save();
+
+        return null;
+    }
 }

+ 1 - 1
app/bootstrap.php

@@ -42,7 +42,7 @@ if (
 }
 $c->PUBLIC_URL = $c->BASE_URL . $forkPublicPrefix;
 
-$c->FORK_REVISION = 19;
+$c->FORK_REVISION = 20;
 $c->START         = $forkStart;
 $c->DIR_APP       = __DIR__;
 $c->DIR_PUBLIC    = $forkPublic;

+ 1 - 5
app/config/main.dist.php

@@ -58,14 +58,10 @@ return [
             'class' => \ForkBB\Core\Secury::class,
             'hmac'  => '%HMAC%',
         ],
-        'FileCache' => [
+        'Cache' => [
             'class'     => \ForkBB\Core\Cache\FileCache::class,
             'cache_dir' => '%DIR_CACHE%',
         ],
-        'Cache' => [
-            'class'    => \ForkBB\Core\Cache::class,
-            'provider' => '@FileCache',
-        ],
         'Validator' => \ForkBB\Core\Validator::class,
         'View' => [
             'class'     => \ForkBB\Core\View::class,