X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FStorage.php;h=d5af7c51356ece6e33f3f1e0ed1e429544050720;hb=7921766c59c1050737ff7fed7c242257e866d149;hp=09e062049ff21bcaadf87b738df1a88abfe63709;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/src/Console/Storage.php b/src/Console/Storage.php
index 09e062049f..d5af7c5135 100644
--- a/src/Console/Storage.php
+++ b/src/Console/Storage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,9 @@
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\Core\StorageManager;
+use Friendica\Core\Storage\Repository\StorageManager;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 
 /**
  * tool to manage storage backend and stored data from CLI
@@ -104,9 +106,9 @@ HELP;
 		$this->out(sprintf($rowfmt, 'Sel', 'Name'));
 		$this->out('-----------------------');
 		$isregisterd = false;
-		foreach ($this->storageManager->listBackends() as $name => $class) {
+		foreach ($this->storageManager->listBackends() as $name) {
 			$issel = ' ';
-			if ($current::getName() == $name) {
+			if ($current && $current::getName() == $name) {
 				$issel = '*';
 				$isregisterd = true;
 			};
@@ -126,23 +128,23 @@ HELP;
 
 	protected function doSet()
 	{
-		if (count($this->args) !== 2) {
+		if (count($this->args) !== 2 || empty($this->args[1])) {
 			throw new CommandArgsException('Invalid arguments');
 		}
 
 		$name = $this->args[1];
-		$class = $this->storageManager->getByName($name);
+		try {
+			$class = $this->storageManager->getWritableStorageByName($name);
 
-		if ($class === '') {
+			if (!$this->storageManager->setBackend($class)) {
+				$this->out($class . ' is not a valid backend storage class.');
+				return -1;
+			}
+		} catch (ReferenceStorageException $exception) {
 			$this->out($name . ' is not a registered backend.');
 			return -1;
 		}
 
-		if (!$this->storageManager->setBackend($class)) {
-			$this->out($class . ' is not a valid backend storage class.');
-			return -1;
-		}
-
 		return 0;
 	}
 
@@ -165,6 +167,10 @@ HELP;
 		$current = $this->storageManager->getBackend();
 		$total = 0;
 
+		if (is_null($current)) {
+			throw new StorageException(sprintf("Cannot move to legacy storage. Please select a storage backend."));
+		}
+
 		do {
 			$moved = $this->storageManager->move($current, $tables, $this->getOption('n', 5000));
 			if ($moved) {