From d778af0b0ee3462d6cff943e0a8d8a9a5364c67f Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 27 Oct 2021 20:16:34 +0200
Subject: [PATCH] Cleanup namespaces
---
src/Module/Admin/Storage.php | 3 +--
tests/src/Core/Storage/Repository/StorageManagerTest.php | 5 +++--
tests/src/Core/Storage/StorageConfigTest.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 8eb706fa03..dfee3d2365 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -40,7 +40,7 @@ class Storage extends BaseAdmin
$storagebackend = Strings::escapeTags(trim($parameters['name'] ?? ''));
try {
- /** @var \Friendica\Core\Storage\Capability\ICanConfigureStorage|false $newStorageConfig */
+ /** @var ICanConfigureStorage|false $newStorageConfig */
$newStorageConfig = DI::storageManager()->getConfigurationByName($storagebackend);
} catch (InvalidClassStorageException $storageException) {
notice(DI::l10n()->t('Storage backend, %s is invalid.', $storagebackend));
@@ -78,7 +78,6 @@ class Storage extends BaseAdmin
if (!empty($_POST['submit_save_set'])) {
try {
- /** @var \Friendica\Core\Storage\Capability\ICanWriteToStorage $newstorage */
$newstorage = DI::storageManager()->getWritableStorageByName($storagebackend);
if (!DI::storageManager()->setBackend($newstorage)) {
diff --git a/tests/src/Core/Storage/Repository/StorageManagerTest.php b/tests/src/Core/Storage/Repository/StorageManagerTest.php
index c7b6569433..0ba28af82b 100644
--- a/tests/src/Core/Storage/Repository/StorageManagerTest.php
+++ b/tests/src/Core/Storage/Repository/StorageManagerTest.php
@@ -31,6 +31,7 @@ use Friendica\Core\Session\Type\Memory;
use Friendica\Core\Storage\Exception\InvalidClassStorageException;
use Friendica\Core\Storage\Capability\ICanReadFromStorage;
use Friendica\Core\Storage\Capability\ICanWriteToStorage;
+use Friendica\Core\Storage\Exception\StorageException;
use Friendica\Core\Storage\Repository\StorageManager;
use Friendica\Core\Storage\Type\Filesystem;
use Friendica\Core\Storage\Type\SystemResource;
@@ -257,7 +258,7 @@ class StorageManagerTest extends DatabaseTest
$dice = (new Dice())
->addRules(include __DIR__ . '/../../../../../static/dependencies.config.php')
->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true])
- ->addRule(IHandleSessions::class, ['instanceOf' => Session\Type\Memory::class, 'shared' => true, 'call' => null]);
+ ->addRule(IHandleSessions::class, ['instanceOf' => Memory::class, 'shared' => true, 'call' => null]);
DI::init($dice);
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
@@ -308,7 +309,7 @@ class StorageManagerTest extends DatabaseTest
self::assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
- self::expectException(\Friendica\Core\Storage\Exception\StorageException::class);
+ self::expectException(StorageException::class);
self::expectExceptionMessage('Cannot unregister Sample Storage, because it\'s currently active.');
$storageManager->unregister(SampleStorageBackend::class);
diff --git a/tests/src/Core/Storage/StorageConfigTest.php b/tests/src/Core/Storage/StorageConfigTest.php
index a01be343d2..51beef6408 100644
--- a/tests/src/Core/Storage/StorageConfigTest.php
+++ b/tests/src/Core/Storage/StorageConfigTest.php
@@ -26,10 +26,10 @@ use Friendica\Test\MockedTest;
abstract class StorageConfigTest extends MockedTest
{
- /** @return \Friendica\Core\Storage\Capability\ICanConfigureStorage */
+ /** @return ICanConfigureStorage */
abstract protected function getInstance();
- abstract protected function assertOption(\Friendica\Core\Storage\Capability\ICanConfigureStorage $storage);
+ abstract protected function assertOption(ICanConfigureStorage $storage);
/**
* Test if the "getOption" is asserted
--
2.39.5