X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FCache.php;h=afb549f4dc68733c66fa853b4ba698f8751f086a;hb=4dec002dcb0b4abfd08f8761b37295e602243d96;hp=e2e1dba6c01f8932279a275c8c48fd5cd0f1f8dd;hpb=a60eb9e33de785a855f1684d5bc1af1ac6baea89;p=friendica.git

diff --git a/src/Console/Cache.php b/src/Console/Cache.php
index e2e1dba6c0..afb549f4dc 100644
--- 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;
 
 /**
@@ -25,6 +26,11 @@ class Cache extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 
+	/**
+	 * @var ICache
+	 */
+	private $cache;
+
 	protected function getHelp()
 	{
 		$help = <<<HELP
@@ -59,11 +65,12 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, array $argv = null)
+	public function __construct(App\Mode $appMode, ICache $cache, array $argv = null)
 	{
 		parent::__construct($argv);
 
 		$this->appMode = $appMode;
+		$this->cache   = $cache;
 	}
 
 	protected function doExecute()
@@ -79,11 +86,9 @@ HELP;
 			$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)) {
@@ -115,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:');
@@ -135,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 {
@@ -147,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}");
 			}
@@ -168,7 +173,7 @@ HELP;
 
 	private function executeFlush()
 	{
-		$result = Core\Cache::clear();
+		$result = $this->cache->clear();
 		if ($result) {
 			$this->out('Cache successfully flushed');
 		} else {
@@ -178,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 {