clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update src/Core/StorageManager.php 

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Philipp 2021-08-16 23:09:39 +02:00 committed by Philipp
parent 99239e3d99
commit db6fded5d2
No known key found for this signature in database
GPG Key ID: 9A28B7D4FF5667BD
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Core/StorageManager.php
View File

@ -112,11 +112,11 @@ class StorageManager
public function getWritableStorageByName(string $name): Storage\IWritableStorage public function getWritableStorageByName(string $name): Storage\IWritableStorage
{ {
$storage = $this->getByName($name, $this->validBackends); $storage = $this->getByName($name, $this->validBackends);
if ($storage instanceof Storage\IWritableStorage) { if (!$storage instanceof Storage\IWritableStorage) {
return $storage;
} else {
throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not writable', $name)); throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not writable', $name));
} }
return $storage;
} }
/** /**
@ -135,7 +135,10 @@ class StorageManager
// If there's no cached instance create a new instance // If there's no cached instance create a new instance
if (!isset($this->backendInstances[$name])) { if (!isset($this->backendInstances[$name])) {
// If the current name isn't a valid backend (or the SystemResource instance) create it // If the current name isn't a valid backend (or the SystemResource instance) create it
if ($this->isValidBackend($name, $validBackends)) { if (!$this->isValidBackend($name, $validBackends)) {
throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not valid', $name));
}
switch ($name) { switch ($name) {
// Try the filesystem backend // Try the filesystem backend
case Storage\Filesystem::getName(): case Storage\Filesystem::getName():
@ -159,19 +162,16 @@ class StorageManager
]; ];
try { try {
Hook::callAll('storage_instance', $data); Hook::callAll('storage_instance', $data);
if (($data['storage'] ?? null) instanceof Storage\IStorage) { if (!($data['storage'] ?? null) instanceof Storage\IStorage) {
$this->backendInstances[$data['name'] ?? $name] = $data['storage'];
} else {
throw new Storage\InvalidClassStorageException(sprintf('Backend %s was not found', $name)); throw new Storage\InvalidClassStorageException(sprintf('Backend %s was not found', $name));
} }
$this->backendInstances[$data['name'] ?? $name] = $data['storage'];
} catch (InternalServerErrorException $exception) { } catch (InternalServerErrorException $exception) {
throw new Storage\StorageException(sprintf('Failed calling hook::storage_instance for backend %s', $name), $exception); throw new Storage\StorageException(sprintf('Failed calling hook::storage_instance for backend %s', $name), $exception);
} }
break; break;
} }
} else {
throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not valid', $name));
}
} }
return $this->backendInstances[$name]; return $this->backendInstances[$name];
@ -236,7 +236,7 @@ class StorageManager
if (is_subclass_of($class, Storage\IStorage::class)) { if (is_subclass_of($class, Storage\IStorage::class)) {
/** @var Storage\IStorage $class */ /** @var Storage\IStorage $class */
if (array_search($class::getName(), $this->validBackends, true) !== false) { if ($this->isValidBackend($class::getName(), $this->validBackends)) {
return true; return true;
} }