Fixed new "user config" console feature

- Replaced "DI::" call with constructor injection
- Added return value for IPConfig::load() and PreloadPConfig::load()
This commit is contained in:
Philipp Holzer 2021-04-28 21:55:23 +02:00
parent e41283faff
commit d1d5cb2857
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
3 changed files with 10 additions and 4 deletions

View file

@ -52,6 +52,10 @@ class User extends \Asika\SimpleConsole\Console
* @var Database * @var Database
*/ */
private $dba; private $dba;
/**
* @var IPConfig
*/
private $pConfig;
protected function getHelp() protected function getHelp()
{ {
@ -89,13 +93,14 @@ HELP;
return $help; return $help;
} }
public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, array $argv = null) public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, IPConfig $pConfig, array $argv = null)
{ {
parent::__construct($argv); parent::__construct($argv);
$this->appMode = $appMode; $this->appMode = $appMode;
$this->l10n = $l10n; $this->l10n = $l10n;
$this->dba = $dba; $this->dba = $dba;
$this->pConfig = $pConfig;
} }
protected function doExecute() protected function doExecute()
@ -463,8 +468,7 @@ HELP;
} }
} }
$pconfig = \Friendica\DI::pConfig(); $values = $this->pConfig->load($user['uid'], $category);
$values = $pconfig->load($user['uid'], $category);
switch ($subCmd) { switch ($subCmd) {
case 'list': case 'list':

View file

@ -35,7 +35,7 @@ interface IPConfig
* @param int $uid The user_id * @param int $uid The user_id
* @param string $cat The category of the configuration value * @param string $cat The category of the configuration value
* *
* @return void * @return array The loaded config array
* @see Cache * @see Cache
* *
*/ */

View file

@ -68,6 +68,8 @@ class PreloadPConfig extends BasePConfig
// load the whole category out of the DB into the cache // load the whole category out of the DB into the cache
$this->configCache->load($uid, $config); $this->configCache->load($uid, $config);
return $config;
} }
/** /**