Cleanup namespaces

diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 8eb706fa03addb6df3950fa6ab755c30a7c2089d..dfee3d2365a63dc4c6354e8c48d61f818b96cc0d 100644 (file)
--- 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 c7b6569433facfc923870e81c04e53878b4757dc..0ba28af82bfa82d126d48af21a0a967241afd454 100644 (file)
--- 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 a01be343d2d4aa08ae57aac07537b8063727aee8..51beef6408e957a735606ec366517e1d30673537 100644 (file)
--- 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