X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FCache.php;h=c5537169938c6042a16c91a64546d1ced3327d7c;hb=d27576059670faf87f80eaae2b4560f85b5310fc;hp=7596ae6d51acf63ea48f1869f14484917d960f9e;hpb=d56bd28a0762bb5ee293e2e944bdee5df9d24692;p=friendica.git

diff --git a/src/Console/Cache.php b/src/Console/Cache.php
index 7596ae6d51..c553716993 100644
--- a/src/Console/Cache.php
+++ b/src/Console/Cache.php
@@ -1,22 +1,38 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCache;
 use RuntimeException;
 
 /**
- * @brief tool to access the cache from the CLI
+ * tool to access the cache from the CLI
  *
  * With this script you can access the cache of your node from the CLI.
  * You can read current values stored in the cache and set new values
  * in cache keys.
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Cache extends \Asika\SimpleConsole\Console
 {
@@ -28,12 +44,7 @@ class Cache extends \Asika\SimpleConsole\Console
 	private $appMode;
 
 	/**
-	 * @var string The cache driver name
-	 */
-	private $cacheDriverName;
-
-	/**
-	 * @var ICacheDriver
+	 * @var ICanCache
 	 */
 	private $cache;
 
@@ -71,16 +82,15 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, Configuration $config, ICacheDriver $cache, array $argv = null)
+	public function __construct(App\Mode $appMode, ICanCache $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()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Executable: ' . $this->executable);
@@ -89,12 +99,12 @@ HELP;
 			$this->out('Options: ' . var_export($this->options, true));
 		}
 
-		if (!$this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
+		if (!$this->appMode->has(App\Mode::DBAVAILABLE)) {
 			$this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
 		}
 
 		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 +137,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 +157,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 +169,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, Duration::FIVE_MINUTES));
 
 			if (is_array($this->cache->get($key))) {
 				throw new RuntimeException("$key is an array and can't be set using this command.");