upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

chore: Cleanup settings manager constructor and properties

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-09-22 17:55:26 +02:00
parent 480ef16946
commit 50684fa3b0
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 25 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
lib/private/Settings/Manager.php
View file

@ -23,53 +23,30 @@ use OCP\Settings\ISubAdminSettings;
use Psr\Log\LoggerInterface;
class Manager implements IManager {
/** @var LoggerInterface */
private $log;
/** @var IL10N */
private $l;
/** @var IFactory */
private $l10nFactory;
/** @var IURLGenerator */
private $url;
/** @var IServerContainer */
private $container;
/** @var AuthorizedGroupMapper $mapper */
private $mapper;
/** @var IGroupManager $groupManager */
private $groupManager;
/** @var ISubAdmin $subAdmin */
private $subAdmin;
public function __construct(
LoggerInterface $log,
IFactory $l10nFactory,
IURLGenerator $url,
IServerContainer $container,
AuthorizedGroupMapper $mapper,
IGroupManager $groupManager,
ISubAdmin $subAdmin,
) {
$this->log = $log;
$this->l10nFactory = $l10nFactory;
$this->url = $url;
$this->container = $container;
$this->mapper = $mapper;
$this->groupManager = $groupManager;
$this->subAdmin = $subAdmin;
}
private ?IL10N $l = null;
/** @var array<self::SETTINGS_*, list<class-string<IIconSection>>> */
protected $sectionClasses = [];
protected array $sectionClasses = [];
/** @var array<self::SETTINGS_*, array<string, IIconSection>> */
protected $sections = [];
protected array $sections = [];
/** @var array<class-string<ISettings>, self::SETTINGS_*> */
protected array $settingClasses = [];
/** @var array<self::SETTINGS_*, array<string, list<ISettings>>> */
protected array $settings = [];
public function __construct(
private LoggerInterface $log,
private IFactory $l10nFactory,
private IURLGenerator $url,
private IServerContainer $container,
private AuthorizedGroupMapper $mapper,
private IGroupManager $groupManager,
private ISubAdmin $subAdmin,
) {
}
/**
* @inheritdoc
@ -138,12 +115,6 @@ class Manager implements IManager {
], true);
}
/** @var array<class-string<ISettings>, self::SETTINGS_*> */
protected $settingClasses = [];
/** @var array<self::SETTINGS_*, array<string, list<ISettings>>> */
protected $settings = [];
/**
* @inheritdoc
*/
@ -188,14 +159,15 @@ class Manager implements IManager {
if ($filter !== null && !$filter($setting)) {
continue;
}
if ($setting->getSection() === null) {
$settingSection = $setting->getSection();
if ($settingSection === null) {
continue;
}
if (!isset($this->settings[$settingsType][$setting->getSection()])) {
$this->settings[$settingsType][$setting->getSection()] = [];
if (!isset($this->settings[$settingsType][$settingSection])) {
$this->settings[$settingsType][$settingSection] = [];
}
$this->settings[$settingsType][$setting->getSection()][] = $setting;
$this->settings[$settingsType][$settingSection][] = $setting;
unset($this->settingClasses[$class]);
}