namespace Friendica\Core;
use Exception;
-use Friendica\Core\Config\IConfiguration;
-use Friendica\Core\L10n\L10n;
+use Friendica\Core\Config\IConfig;
use Friendica\Database\Database;
use Friendica\Model\Storage;
use Psr\Log\LoggerInterface;
/**
- * @brief Manage storage backends
+ * Manage storage backends
*
* Core code uses this class to get and set current storage backend class.
* Addons use this class to register and unregister additional backends.
/** @var Database */
private $dba;
- /** @var IConfiguration */
+ /** @var IConfig */
private $config;
/** @var LoggerInterface */
private $logger;
/**
* @param Database $dba
- * @param IConfiguration $config
+ * @param IConfig $config
* @param LoggerInterface $logger
* @param L10n $l10n
*/
- public function __construct(Database $dba, IConfiguration $config, LoggerInterface $logger, L10n $l10n)
+ public function __construct(Database $dba, IConfig $config, LoggerInterface $logger, L10n $l10n)
{
$this->dba = $dba;
$this->config = $config;
}
/**
- * @brief Return current storage backend class
+ * Return current storage backend class
*
* @return Storage\IStorage|null
*/
}
/**
- * @brief Return storage backend class by registered name
+ * Return storage backend class by registered name
*
* @param string|null $name Backend name
* @param boolean $onlyUserBackend True, if just user specific instances should be returrned (e.g. not SystemResource)
*/
public function getByName(string $name = null, $onlyUserBackend = false)
{
+ // @todo 2020.09 Remove this call after 2 releases
+ $name = $this->checkLegacyBackend($name);
+
// If there's no cached instance create a new instance
if (!isset($this->backendInstances[$name])) {
// If the current name isn't a valid backend (or the SystemResource instance) create it
}
/**
- * @brief Set current storage backend class
+ * Check for legacy backend storage class names (= full model class name)
+ *
+ * @todo 2020.09 Remove this function after 2 releases, because there shouldn't be any legacy backend classes left
+ *
+ * @param string|null $name a potential, legacy storage name ("Friendica\Model\Storage\...")
+ *
+ * @return string|null The current storage name
+ */
+ private function checkLegacyBackend(string $name = null)
+ {
+ if (stristr($name, 'Friendica\Model\Storage\\')) {
+ $this->logger->notice('Using deprecated storage class value', ['name' => $name]);
+ return substr($name, 24);
+ }
+
+ return $name;
+ }
+
+ /**
+ * Set current storage backend class
*
* @param string $name Backend class name
*
}
/**
- * @brief Get registered backends
+ * Get registered backends
*
* @return array
*/
}
/**
- * @brief Unregister a storage backend class
+ * Unregister a storage backend class
*
* @param string $class Backend class name
*
}
/**
- * @brief Move up to 5000 resources to storage $dest
+ * Move up to 5000 resources to storage $dest
*
* Copy existing data to destination storage and delete from source.
* This method cannot move to legacy in-table `data` field.
*/
public function move(Storage\IStorage $destination, array $tables = self::TABLES, int $limit = 5000)
{
- if ($destination === null) {
- throw new Storage\StorageException('Can\'t move to NULL storage backend');
+ if (!$this->isValidBackend($destination, true)) {
+ throw new Storage\StorageException(sprintf("Can't move to storage backend '%s'", $destination::getName()));
}
$moved = 0;