keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename bool flag for user backend

Browse source
This commit is contained in:
nupplaPhil 2020-01-17 20:23:30 +01:00
parent 9bb5891645
commit 0af83e6f7c
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Core/StorageManager.php
View file

@ -79,19 +79,19 @@ class StorageManager
/** /**
* @brief Return storage backend class by registered name * @brief Return storage backend class by registered name
* *
* @param string|null $name Backend name * @param string|null $name Backend name
* @param boolean $userBackend True, if just user specific instances should be returrned (e.g. not SystemResource) * @param boolean $onlyUserBackend True, if just user specific instances should be returrned (e.g. not SystemResource)
* *
* @return Storage\IStorage|null null if no backend registered at $name * @return Storage\IStorage|null null if no backend registered at $name
* *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function getByName(string $name = null, $userBackend = false) public function getByName(string $name = null, $onlyUserBackend = false)
{ {
// 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, $userBackend)) { if ($this->isValidBackend($name, $onlyUserBackend)) {
switch ($name) { switch ($name) {
// Try the filesystem backend // Try the filesystem backend
case Storage\Filesystem::getName(): case Storage\Filesystem::getName():
@ -103,11 +103,11 @@ class StorageManager
break; break;
// at least, try if there's an addon for the backend // at least, try if there's an addon for the backend
case Storage\SystemResource::getName(): case Storage\SystemResource::getName():
$this->backendInstances[$name] = new Storage\SystemResource(); $this->backendInstances[$name] = new Storage\SystemResource();
break; break;
default: default:
$data = [ $data = [
'name' => $name, 'name' => $name,
'storage' => null, 'storage' => null,
]; ];
Hook::callAll('storage_instance', $data); Hook::callAll('storage_instance', $data);
@ -129,15 +129,15 @@ class StorageManager
/** /**
* Checks, if the storage is a valid backend * Checks, if the storage is a valid backend
* *
* @param string|null $name The name or class of the backend * @param string|null $name The name or class of the backend
* @param boolean $userBackend True, if just user backend should get returned (e.g. not SystemResource) * @param boolean $onlyUserBackend True, if just user backend should get returned (e.g. not SystemResource)
* *
* @return boolean True, if the backend is a valid backend * @return boolean True, if the backend is a valid backend
*/ */
public function isValidBackend(string $name = null, bool $userBackend = false) public function isValidBackend(string $name = null, bool $onlyUserBackend = false)
{ {
return array_key_exists($name, $this->backends) || return array_key_exists($name, $this->backends) ||
(!$userBackend && $name === Storage\SystemResource::getName()); (!$onlyUserBackend && $name === Storage\SystemResource::getName());
} }
/** /**
@ -185,7 +185,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 */
$backends = $this->backends; $backends = $this->backends;
$backends[$class::getName()] = $class; $backends[$class::getName()] = $class;
if ($this->config->set('storage', 'backends', $backends)) { if ($this->config->set('storage', 'backends', $backends)) {
@ -214,7 +214,7 @@ class StorageManager
unset($this->backends[$class::getName()]); unset($this->backends[$class::getName()]);
if ($this->currentBackend instanceof $class) { if ($this->currentBackend instanceof $class) {
$this->config->set('storage', 'name', null); $this->config->set('storage', 'name', null);
$this->currentBackend = null; $this->currentBackend = null;
} }