Now using only a single array

[friendica.git] / src / Console / Cache.php

diff --git a/src/Console/Cache.php b/src/Console/Cache.php
index 7596ae6d51acf63ea48f1869f14484917d960f9e..afb549f4dc68733c66fa853b4ba698f8751f086a 100644 (file)
--- a/src/Console/Cache.php
+++ b/src/Console/Cache.php
@@ -4,9 +4,8 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core\Cache\ICacheDriver;
-use Friendica\Core\Config\Configuration;
-use Friendica\Factory\CacheDriverFactory;
+use Friendica\Core\Cache\Cache as CacheClass;
+use Friendica\Core\Cache\ICache;
 use RuntimeException;
 
 /**
@@ -28,12 +27,7 @@ class Cache extends \Asika\SimpleConsole\Console
        private $appMode;
 
        /**
-        * @var string The cache driver name
-        */
-       private $cacheDriverName;
-
-       /**
-        * @var ICacheDriver
+        * @var ICache
         */
        private $cache;
 
@@ -71,13 +65,12 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, Configuration $config, ICacheDriver $cache, array $argv = null)
+       public function __construct(App\Mode $appMode, ICache $cache, array $argv = null)
        {
                parent::__construct($argv);
 
                $this->appMode = $appMode;
-               $this->cache = $cache;
-               $this->cacheDriverName = $config->get('system', 'cache_driver', CacheDriverFactory::DEFAULT_DRIVER);
+               $this->cache   = $cache;
        }
 
        protected function doExecute()
@@ -94,7 +87,7 @@ HELP;
                }
 
                if ($this->getOption('v')) {
-                       $this->out('Cache Driver Name: ' . $this->cacheDriverName);
+                       $this->out('Cache Driver Name: ' . $this->cache->getName());
                        $this->out('Cache Driver Class: ' . get_class($this->cache));
                }
 
@@ -127,7 +120,7 @@ HELP;
        private function executeList()
        {
                $prefix = $this->getArgument(1);
-               $keys = $this->cache->getAllKeys($prefix);
+               $keys   = $this->cache->getAllKeys($prefix);
 
                if (empty($prefix)) {
                        $this->out('Listing all cache keys:');
@@ -147,7 +140,7 @@ HELP;
        private function executeGet()
        {
                if (count($this->args) >= 2) {
-                       $key = $this->getArgument(1);
+                       $key   = $this->getArgument(1);
                        $value = $this->cache->get($key);
 
                        $this->out("{$key} => " . var_export($value, true));
@@ -159,9 +152,9 @@ HELP;
        private function executeSet()
        {
                if (count($this->args) >= 3) {
-                       $key = $this->getArgument(1);
-                       $value = $this->getArgument(2);
-                       $duration = intval($this->getArgument(3, ICacheDriver::FIVE_MINUTES));
+                       $key      = $this->getArgument(1);
+                       $value    = $this->getArgument(2);
+                       $duration = intval($this->getArgument(3, CacheClass::FIVE_MINUTES));
 
                        if (is_array($this->cache->get($key))) {
                                throw new RuntimeException("$key is an array and can't be set using this command.");