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 eefb6cc60b1f422842a93c1383af399a89d620d8..afb549f4dc68733c66fa853b4ba698f8751f086a 100644 (file)
--- a/src/Console/Cache.php
+++ b/src/Console/Cache.php
@@ -4,7 +4,8 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core;
+use Friendica\Core\Cache\Cache as CacheClass;
+use Friendica\Core\Cache\ICache;
 use RuntimeException;
 
 /**
@@ -20,6 +21,16 @@ class Cache extends \Asika\SimpleConsole\Console
 {
        protected $helpOptions = ['h', 'help', '?'];
 
+       /**
+        * @var App\Mode
+        */
+       private $appMode;
+
+       /**
+        * @var ICache
+        */
+       private $cache;
+
        protected function getHelp()
        {
                $help = <<<HELP
@@ -54,10 +65,16 @@ HELP;
                return $help;
        }
 
-       protected function doExecute()
+       public function __construct(App\Mode $appMode, ICache $cache, array $argv = null)
        {
-               $a = \Friendica\BaseObject::getApp();
+               parent::__construct($argv);
+
+               $this->appMode = $appMode;
+               $this->cache   = $cache;
+       }
 
+       protected function doExecute()
+       {
                if ($this->getOption('v')) {
                        $this->out('Executable: ' . $this->executable);
                        $this->out('Class: ' . __CLASS__);
@@ -65,15 +82,13 @@ HELP;
                        $this->out('Options: ' . var_export($this->options, true));
                }
 
-               if ($a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!$this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
                        $this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
                }
 
-               Core\Cache::init();
-
                if ($this->getOption('v')) {
-                       $this->out('Cache Driver Name: ' . Core\Cache::$driver_name);
-                       $this->out('Cache Driver Class: ' . Core\Cache::$driver_class);
+                       $this->out('Cache Driver Name: ' . $this->cache->getName());
+                       $this->out('Cache Driver Class: ' . get_class($this->cache));
                }
 
                switch ($this->getArgument(0)) {
@@ -105,7 +120,7 @@ HELP;
        private function executeList()
        {
                $prefix = $this->getArgument(1);
-               $keys = Core\Cache::getAllKeys($prefix);
+               $keys   = $this->cache->getAllKeys($prefix);
 
                if (empty($prefix)) {
                        $this->out('Listing all cache keys:');
@@ -125,8 +140,8 @@ HELP;
        private function executeGet()
        {
                if (count($this->args) >= 2) {
-                       $key = $this->getArgument(1);
-                       $value = Core\Cache::get($key);
+                       $key   = $this->getArgument(1);
+                       $value = $this->cache->get($key);
 
                        $this->out("{$key} => " . var_export($value, true));
                } else {
@@ -137,17 +152,17 @@ HELP;
        private function executeSet()
        {
                if (count($this->args) >= 3) {
-                       $key = $this->getArgument(1);
-                       $value = $this->getArgument(2);
-                       $duration = intval($this->getArgument(3, Core\Cache::FIVE_MINUTES));
+                       $key      = $this->getArgument(1);
+                       $value    = $this->getArgument(2);
+                       $duration = intval($this->getArgument(3, CacheClass::FIVE_MINUTES));
 
-                       if (is_array(Core\Cache::get($key))) {
+                       if (is_array($this->cache->get($key))) {
                                throw new RuntimeException("$key is an array and can't be set using this command.");
                        }
 
-                       $result = Core\Cache::set($key, $value, $duration);
+                       $result = $this->cache->set($key, $value, $duration);
                        if ($result) {
-                               $this->out("{$key} <= " . Core\Cache::get($key));
+                               $this->out("{$key} <= " . $this->cache->get($key));
                        } else {
                                $this->out("Unable to set {$key}");
                        }
@@ -158,7 +173,7 @@ HELP;
 
        private function executeFlush()
        {
-               $result = Core\Cache::clear();
+               $result = $this->cache->clear();
                if ($result) {
                        $this->out('Cache successfully flushed');
                } else {
@@ -168,7 +183,7 @@ HELP;
 
        private function executeClear()
        {
-               $result = Core\Cache::clear(false);
+               $result = $this->cache->clear(false);
                if ($result) {
                        $this->out('Cache successfully cleared');
                } else {