bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Improve impossible exception-handler for storage move

Browse source
This commit is contained in:
Philipp Holzer 2020-01-17 21:01:37 +01:00
parent 14c97f7b62
commit 732992a296
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/StorageManager.php
View file

@ -240,8 +240,8 @@ class StorageManager
*/ */
public function move(Storage\IStorage $destination, array $tables = self::TABLES, int $limit = 5000) public function move(Storage\IStorage $destination, array $tables = self::TABLES, int $limit = 5000)
{ {
if ($destination === null) { if (!$this->isValidBackend($destination, true)) {
throw new Storage\StorageException('Can\'t move to NULL storage backend'); throw new Storage\StorageException(sprintf("Can't move to storage backend '%s'", $destination::getName()));
} }
$moved = 0; $moved = 0;

13
tests/src/Core/StorageManagerTest.php
View file

@ -265,4 +265,17 @@ class StorageManagerTest extends DatabaseTest
$this->assertNotEmpty($data); $this->assertNotEmpty($data);
} }
} }
/**
* Test moving data to a WRONG storage
*
* @expectedException \Friendica\Model\Storage\StorageException
* @expectedExceptionMessageRegExp /Can't move to storage backend '.*'/
*/
public function testMoveStorageWrong()
{
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
$storage = $storageManager->getByName(Storage\SystemResource::getName());
$storageManager->move($storage);
}
} }