#23 - Move cache configs into main config

Author: Jeckerson

cli/config/cache.php

@@ -76,14 +76,20 @@ private function clearFileCache()
     private function clearMemCached()
     {
         echo 'Clearing data cache' . PHP_EOL;
-        $options   = include appPath('cli/config/cache.php');
+        $options = [];
+        if (isset($this->getDI()->getShared('config')->get('cache')->options->libmemcached)) {
+            $options = $this->getDI()->getShared('config')->get('cache')->options->libmemcached;
+        }
+
         $servers   = $options['servers'] ?? [];
         $memcached = new \Memcached();
         foreach ($servers as $server) {
             $memcached->addServer($server['host'], $server['port'], $server['weight']);
         }
 
         $keys = $memcached->getAllKeys();
+        // 7.2 countable
+        $keys = $keys ?: [];
         echo sprintf('Found %s keys', count($keys)) . PHP_EOL;
         foreach ($keys as $key) {
             if ('api-data' === substr($key, 0, 8)) {

cli/tasks/ClearcacheTask.php

@@ -27,34 +27,24 @@
         'time'         => microtime(true),
     ],
     'cache'      => [
-        'data'     => [
-            'front' => [
-                'adapter' => 'Data',
-                'options' => [
-                    'lifetime' => envValue('CACHE_LIFETIME'),
-                ],
-            ],
-            'back'  => [
-                'dev'  => [
-                    'adapter' => 'File',
-                    'options' => [
-                        'cacheDir' => appPath('storage/cache/data/'),
+        'adapter' => envValue('CACHE_ADAPTER'),
+        'options' => [
+            'libmemcached' => [
+                'servers'  => [
+                    0 => [
+                        'host'   => envValue('DATA_API_MEMCACHED_HOST', '127.0.0.1'),
+                        'port'   => envValue('DATA_API_MEMCACHED_PORT', 11211),
+                        'weight' => envValue('DATA_API_MEMCACHED_WEIGHT', 100),
                     ],
                 ],
-                'prod' => [
-                    'adapter' => 'Libmemcached',
-                    'options' => [
-                        'servers' => [
-                            [
-                                'host'   => envValue('DATA_API_MEMCACHED_HOST'),
-                                'port'   => envValue('DATA_API_MEMCACHED_PORT'),
-                                'weight' => envValue('DATA_API_MEMCACHED_WEIGHT'),
-                            ],
-                        ],
-                    ],
+                'client'   => [
+                    \Memcached::OPT_PREFIX_KEY => 'api-',
                 ],
+                'lifetime' => envValue('CACHE_LIFETIME', 86400),
+                'prefix'   => 'data-',
             ],
         ],
+
         'metadata' => [
             'dev'  => [
                 'adapter' => 'Memory',

library/Core/config.php

@@ -14,27 +14,31 @@
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
+use Phalcon\Config;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\ServiceProviderInterface;
 use Phalcon\Storage\SerializerFactory;
-use function Phalcon\Api\Core\appPath;
 
 class CacheDataProvider implements ServiceProviderInterface
 {
     /**
-     * @param DiInterface $container
+     * @param DiInterface $di
      */
-    public function register(DiInterface $container): void
+    public function register(DiInterface $di): void
     {
-        $container->setShared(
+        /** @var Config $config */
+        $config = $di->getShared('config');
+
+        $di->setShared(
             'cache',
-            function () {
-                /** @var array $backOptions */
-                $options = include appPath('cli/config/cache.php');
+            function () use ($config) {
+                $cache = $config->get('cache')->toArray();
+                $adapter = $cache['adapter'];
+                $options = $cache['options'][$adapter] ?? [];
 
                 $serializerFactory = new SerializerFactory();
                 $adapterFactory = new AdapterFactory($serializerFactory);
-                $adapter = $adapterFactory->newInstance($options['adapter'], $options);
+                $adapter = $adapterFactory->newInstance($adapter, $options);
 
                 return new Cache($adapter);
             }