Browse Source

Cleanup the constructor

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v21.0.0beta7
Joas Schilling 3 years ago
parent
commit
90c3013d40
No account linked to committer's email address

+ 6
- 12
lib/private/IntegrityCheck/Checker.php View File

use OCP\ICache; use OCP\ICache;
use OCP\ICacheFactory; use OCP\ICacheFactory;
use OCP\IConfig; use OCP\IConfig;
use OCP\ITempManager;
use phpseclib\Crypt\RSA; use phpseclib\Crypt\RSA;
use phpseclib\File\X509; use phpseclib\File\X509;


private $appLocator; private $appLocator;
/** @var FileAccessHelper */ /** @var FileAccessHelper */
private $fileAccessHelper; private $fileAccessHelper;
/** @var IConfig */
/** @var IConfig|null */
private $config; private $config;
/** @var ICache */ /** @var ICache */
private $cache; private $cache;
/** @var IAppManager */
/** @var IAppManager|null */
private $appManager; private $appManager;
/** @var ITempManager */
private $tempManager;
/** @var IMimeTypeDetector */ /** @var IMimeTypeDetector */
private $mimeTypeDetector; private $mimeTypeDetector;


* @param EnvironmentHelper $environmentHelper * @param EnvironmentHelper $environmentHelper
* @param FileAccessHelper $fileAccessHelper * @param FileAccessHelper $fileAccessHelper
* @param AppLocator $appLocator * @param AppLocator $appLocator
* @param IConfig $config
* @param IConfig|null $config
* @param ICacheFactory $cacheFactory * @param ICacheFactory $cacheFactory
* @param IAppManager $appManager
* @param ITempManager $tempManager
* @param IAppManager|null $appManager
* @param IMimeTypeDetector $mimeTypeDetector * @param IMimeTypeDetector $mimeTypeDetector
*/ */
public function __construct(EnvironmentHelper $environmentHelper, public function __construct(EnvironmentHelper $environmentHelper,
FileAccessHelper $fileAccessHelper, FileAccessHelper $fileAccessHelper,
AppLocator $appLocator, AppLocator $appLocator,
IConfig $config = null,
?IConfig $config,
ICacheFactory $cacheFactory, ICacheFactory $cacheFactory,
IAppManager $appManager = null,
ITempManager $tempManager,
?IAppManager $appManager,
IMimeTypeDetector $mimeTypeDetector) { IMimeTypeDetector $mimeTypeDetector) {
$this->environmentHelper = $environmentHelper; $this->environmentHelper = $environmentHelper;
$this->fileAccessHelper = $fileAccessHelper; $this->fileAccessHelper = $fileAccessHelper;
$this->config = $config; $this->config = $config;
$this->cache = $cacheFactory->createDistributed(self::CACHE_KEY); $this->cache = $cacheFactory->createDistributed(self::CACHE_KEY);
$this->appManager = $appManager; $this->appManager = $appManager;
$this->tempManager = $tempManager;
$this->mimeTypeDetector = $mimeTypeDetector; $this->mimeTypeDetector = $mimeTypeDetector;
} }



+ 0
- 1
lib/private/Server.php View File

$config, $config,
$c->get(ICacheFactory::class), $c->get(ICacheFactory::class),
$appManager, $appManager,
$c->get(ITempManager::class),
$c->get(IMimeTypeDetector::class) $c->get(IMimeTypeDetector::class)
); );
}); });

+ 0
- 2
tests/lib/IntegrityCheck/CheckerTest.php View File

$this->config, $this->config,
$this->cacheFactory, $this->cacheFactory,
$this->appManager, $this->appManager,
\OC::$server->getTempManager(),
$this->mimeTypeDetector $this->mimeTypeDetector
); );
} }
$this->config, $this->config,
$this->cacheFactory, $this->cacheFactory,
$this->appManager, $this->appManager,
\OC::$server->getTempManager(),
$this->mimeTypeDetector, $this->mimeTypeDetector,
]) ])
->setMethods([ ->setMethods([

Loading…
Cancel
Save