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

diff --git a/src/Console/Cache.php b/src/Console/Cache.php
index 5f508da7a8..afb549f4dc 100644
--- 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\Cache as CacheClass;
 use Friendica\Core\Cache\ICache;
-use Friendica\Core\Config\Configuration;
-use Friendica\Factory\CacheDriverFactory;
 use RuntimeException;
 
 /**
@@ -27,11 +26,6 @@ class Cache extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 
-	/**
-	 * @var string The cache driver name
-	 */
-	private $cacheDriverName;
-
 	/**
 	 * @var ICache
 	 */
@@ -71,13 +65,12 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, Configuration $config, ICache $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, ICache::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.");