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 25

Refactor lib/private/App

Browse source 
Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>
This commit is contained in:
Hamid Dehnavi 2023-07-11 10:48:17 +03:30 committed by John Molakvoæ
parent a88c1bdfb6
commit 84749d53a9
10 changed files with 43 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/private/App/AppManager.php
View file

@ -74,14 +74,6 @@ class AppManager implements IAppManager {
'prevent_group_restriction',
];
private IUserSession $userSession;
private IConfig $config;
private AppConfig $appConfig;
private IGroupManager $groupManager;
private ICacheFactory $memCacheFactory;
private IEventDispatcher $dispatcher;
private LoggerInterface $logger;
/** @var string[] $appId => $enabled */
private array $installedAppsCache = [];
@ -104,20 +96,15 @@ class AppManager implements IAppManager {
/** @var array<string, true> */
private array $loadedApps = [];
public function __construct(IUserSession $userSession,
IConfig $config,
AppConfig $appConfig,
IGroupManager $groupManager,
ICacheFactory $memCacheFactory,
IEventDispatcher $dispatcher,
LoggerInterface $logger) {
$this->userSession = $userSession;
$this->config = $config;
$this->appConfig = $appConfig;
$this->groupManager = $groupManager;
$this->memCacheFactory = $memCacheFactory;
$this->dispatcher = $dispatcher;
$this->logger = $logger;
public function __construct(
private IUserSession $userSession,
private IConfig $config,
private AppConfig $appConfig,
private IGroupManager $groupManager,
private ICacheFactory $memCacheFactory,
private IEventDispatcher $dispatcher,
private LoggerInterface $logger,
) {
}
/**

7
lib/private/App/AppStore/Bundles/Bundle.php
View file

@ -26,14 +26,13 @@ namespace OC\App\AppStore\Bundles;
use OCP\IL10N;
abstract class Bundle {
/** @var IL10N */
protected $l10n;
/**
* @param IL10N $l10n
*/
public function __construct(IL10N $l10n) {
$this->l10n = $l10n;
public function __construct(
protected IL10N $l10n,
) {
}
/**

7
lib/private/App/AppStore/Bundles/BundleFetcher.php
View file

@ -27,10 +27,11 @@ namespace OC\App\AppStore\Bundles;
use OCP\IL10N;
class BundleFetcher {
private IL10N $l10n;
public function __construct(IL10N $l10n) {
$this->l10n = $l10n;
public function __construct
(
private IL10N $l10n,
) {
}
/**

5
lib/private/App/AppStore/Fetcher/AppFetcher.php
View file

@ -39,11 +39,9 @@ use OCP\Support\Subscription\IRegistry;
use Psr\Log\LoggerInterface;
class AppFetcher extends Fetcher {
/** @var CompareVersion */
private $compareVersion;
/** @var IRegistry */
protected $registry;
protected IRegistry $registry;
/** @var bool */
private $ignoreMaxVersion;
@ -64,7 +62,6 @@ class AppFetcher extends Fetcher {
$registry
);
$this->compareVersion = $compareVersion;
$this->registry = $registry;
$this->fileName = 'apps.json';

6
lib/private/App/AppStore/Fetcher/CategoryFetcher.php
View file

@ -34,12 +34,14 @@ use OCP\Support\Subscription\IRegistry;
use Psr\Log\LoggerInterface;
class CategoryFetcher extends Fetcher {
public function __construct(Factory $appDataFactory,
public function __construct(
Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config,
LoggerInterface $logger,
IRegistry $registry) {
IRegistry $registry,
) {
parent::__construct(
$appDataFactory,
$clientService,

29
lib/private/App/AppStore/Fetcher/Fetcher.php
View file

@ -47,16 +47,6 @@ abstract class Fetcher {
/** @var IAppData */
protected $appData;
/** @var IClientService */
protected $clientService;
/** @var ITimeFactory */
protected $timeFactory;
/** @var IConfig */
protected $config;
/** @var LoggerInterface */
protected $logger;
/** @var IRegistry */
protected $registry;
/** @var string */
protected $fileName;
@ -67,18 +57,15 @@ abstract class Fetcher {
/** @var ?string */
protected $channel = null;
public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config,
LoggerInterface $logger,
IRegistry $registry) {
public function __construct(
Factory $appDataFactory,
protected IClientService $clientService,
protected ITimeFactory $timeFactory,
protected IConfig $config,
protected LoggerInterface $logger,
protected IRegistry $registry,
) {
$this->appData = $appDataFactory->get('appstore');
$this->clientService = $clientService;
$this->timeFactory = $timeFactory;
$this->config = $config;
$this->logger = $logger;
$this->registry = $registry;
}
/**

11
lib/private/App/AppStore/Version/Version.php
View file

@ -23,18 +23,15 @@
namespace OC\App\AppStore\Version;
class Version {
/** @var string */
private $minVersion;
/** @var string */
private $maxVersion;
/**
* @param string $minVersion
* @param string $maxVersion
*/
public function __construct($minVersion, $maxVersion) {
$this->minVersion = $minVersion;
$this->maxVersion = $maxVersion;
public function __construct(
private string $minVersion,
private string $maxVersion,
) {
}
/**

11
lib/private/App/DependencyAnalyzer.php
View file

@ -33,10 +33,6 @@ namespace OC\App;
use OCP\IL10N;
class DependencyAnalyzer {
/** @var Platform */
private $platform;
/** @var \OCP\IL10N */
private $l;
/** @var array */
private $appInfo;
@ -44,9 +40,10 @@ class DependencyAnalyzer {
* @param Platform $platform
* @param \OCP\IL10N $l
*/
public function __construct(Platform $platform, IL10N $l) {
$this->platform = $platform;
$this->l = $l;
public function __construct(
private Platform $platform,
private IL10N $l,
) {
}
/**

7
lib/private/App/InfoParser.php
View file

@ -34,14 +34,13 @@ use function libxml_disable_entity_loader;
use function simplexml_load_string;
class InfoParser {
/** @var \OCP\ICache|null */
private $cache;
/**
* @param ICache|null $cache
*/
public function __construct(ICache $cache = null) {
$this->cache = $cache;
public function __construct(
private ?ICache $cache = null,
) {
}
/**

6
lib/private/App/Platform.php
View file

@ -36,10 +36,10 @@ use OCP\IConfig;
* @package OC\App
*/
class Platform {
private IConfig $config;
public function __construct(IConfig $config) {
$this->config = $config;
public function __construct(
private IConfig $config,
) {
}
public function getPhpVersion(): string {