archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #39299 from shdehnavi/refactor_lib_private_app

Browse Source
pull/39192/merge
John Molakvoæ 3 months ago committed by GitHub
parent d0f7156c96 cf17db2fe6
commit c4975b363e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 44 additions and 89 deletions
Show Stats Download Patch File Download Diff File

31
lib/private/App/AppManager.php
Unescape Escape 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,
) {
}
/**

8
lib/private/App/AppStore/Bundles/Bundle.php
Unescape Escape View File

@ -26,14 +26,12 @@ 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
Unescape Escape View File

@ -27,10 +27,9 @@ 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,
) {
}
/**

14
lib/private/App/AppStore/Fetcher/AppFetcher.php
Unescape Escape View File

@ -39,12 +39,6 @@ use OCP\Support\Subscription\IRegistry;
use Psr\Log\LoggerInterface;
class AppFetcher extends Fetcher {
/** @var CompareVersion */
private $compareVersion;
/** @var IRegistry */
protected $registry;
/** @var bool */
private $ignoreMaxVersion;
@ -52,9 +46,10 @@ class AppFetcher extends Fetcher {
IClientService $clientService,
ITimeFactory $timeFactory,
IConfig $config,
CompareVersion $compareVersion,
private CompareVersion $compareVersion,
LoggerInterface $logger,
IRegistry $registry) {
protected IRegistry $registry,
) {
parent::__construct(
$appDataFactory,
$clientService,
@ -64,9 +59,6 @@ class AppFetcher extends Fetcher {
$registry
);
$this->compareVersion = $compareVersion;
$this->registry = $registry;
$this->fileName = 'apps.json';
$this->endpointName = 'apps.json';
$this->ignoreMaxVersion = true;

6
lib/private/App/AppStore/Fetcher/CategoryFetcher.php
Unescape Escape 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
Unescape Escape 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;
}
/**

12
lib/private/App/AppStore/Version/Version.php
Unescape Escape View File

@ -23,18 +23,14 @@
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
Unescape Escape 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,
) {
}
/**

8
lib/private/App/InfoParser.php
Unescape Escape View File

@ -34,14 +34,12 @@ 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,
) {
}
/**

7
lib/private/App/Platform.php
Unescape Escape View File

@ -36,10 +36,9 @@ 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 {

Write Preview
Loading…
Cancel
Save