mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not create Application instances directly 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2019-10-11 08:33:09 +02:00
parent f6a79338d4
commit 543190f8b3
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
14 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/appinfo/app.php
View File

@ -29,7 +29,8 @@ use Symfony\Component\EventDispatcher\GenericEvent;
\OC_App::loadApps(['dav']);
$app = new Application();
/** @var Application $app */
$app = \OC::$server->query(Application::class);
$app->registerHooks();
\OC::$server->registerService('CardDAVSyncService', function() use ($app) {

3
apps/encryption/appinfo/app.php
View File

@ -28,7 +28,8 @@ namespace OCA\Encryption\AppInfo;
$encryptionSystemReady = \OC::$server->getEncryptionManager()->isReady();
$app = new Application();
/** @var Application $app */
$app = \OC::$server->query(Application::class);
if ($encryptionSystemReady) {
$app->registerEncryptionModule();
$app->registerHooks();

4
apps/encryption/appinfo/routes.php
View File

@ -24,7 +24,9 @@
namespace OCA\Encryption\AppInfo;
(new Application())->registerRoutes($this, array('routes' => array(
/** @var Application $app */
$app = \OC::$server->query(Application::class);
$app->registerRoutes($this, array('routes' => array(
[
'name' => 'Recovery#adminRecovery',

3
apps/federation/appinfo/app.php
View File

@ -22,5 +22,6 @@
namespace OCA\Federation\AppInfo;
$app = new Application();
/** @var Application $app */
$app = \OC::$server->query(Application::class);
$app->registerHooks();

3
apps/files/appinfo/routes.php
View File

@ -29,7 +29,8 @@ declare(strict_types=1);
*/
namespace OCA\Files\AppInfo;
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$application->registerRoutes(
$this,
[

3
apps/files_trashbin/appinfo/routes.php
View File

@ -24,7 +24,8 @@
namespace OCA\Files_Trashbin\AppInfo;
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$application->registerRoutes($this, [
'routes' => [
[

3
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
View File

@ -62,7 +62,8 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
}
protected function fixDIForJobs() {
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$this->userManager = \OC::$server->getUserManager();
$this->expiration = $application->getContainer()->query('Expiration');
}

9
apps/files_trashbin/lib/Trashbin.php
View File

@ -747,7 +747,8 @@ class Trashbin {
*/
private static function scheduleExpire($user) {
// let the admin disable auto expire
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$expiration = $application->getContainer()->query('Expiration');
if ($expiration->isEnabled()) {
\OC::$server->getCommandBus()->push(new Expire($user));
@ -764,7 +765,8 @@ class Trashbin {
* @return int size of deleted files
*/
protected static function deleteFiles($files, $user, $availableSpace) {
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$expiration = $application->getContainer()->query('Expiration');
$size = 0;
@ -791,7 +793,8 @@ class Trashbin {
* @return integer[] size of deleted files and number of deleted files
*/
public static function deleteExpiredFiles($files, $user) {
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$expiration = $application->getContainer()->query('Expiration');
$size = 0;
$count = 0;

3
apps/files_versions/appinfo/routes.php
View File

@ -26,7 +26,8 @@
namespace OCA\Files_Versions\AppInfo;
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$application->registerRoutes($this, [
'routes' => [
[

4
apps/files_versions/lib/Storage.php
View File

@ -850,8 +850,8 @@ class Storage {
* @return Expiration
*/
protected static function getExpiration(){
if (is_null(self::$application)) {
self::$application = new Application();
if (self::$application === null) {
self::$application = \OC::$server->query(Application::class);
}
return self::$application->getContainer()->query(Expiration::class);
}

14
apps/provisioning_api/lib/FederatedFileSharingFactory.php
View File

@ -25,9 +25,19 @@ declare(strict_types=1);
namespace OCA\Provisioning_API;
use OCA\FederatedFileSharing\AppInfo\Application;
use OCP\IServerContainer;
class FederatedFileSharingFactory {
public function get(): Application {
return new Application();
/** @var IServerContainer */
private $serverContainer;
public function __construct(IServerContainer $serverContainer) {
$this->serverContainer = $serverContainer;
}
public function get(): Application {
return $this->serverContainer->query(Application::class);
}
}

3
apps/settings/appinfo/routes.php
View File

@ -38,7 +38,8 @@ namespace OCA\Settings;
use OCA\Settings\AppInfo\Application;
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$this->useCollection('root');
$application->registerRoutes($this, [
'resources' => [

2
apps/settings/lib/Settings/Personal/PersonalInfo.php
View File

@ -90,7 +90,7 @@ class PersonalInfo implements ISettings {
$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
$lookupServerUploadEnabled = false;
if($federatedFileSharingEnabled) {
$federatedFileSharing = new Application();
$federatedFileSharing = \OC::$server->query(Application::class);
$shareProvider = $federatedFileSharing->getFederatedShareProvider();
$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
}

3
core/routes.php
View File

@ -34,7 +34,8 @@
use OC\Core\Application;
$application = new Application();
/** @var Application $application */
$application = \OC::$server->query(Application::class);
$application->registerRoutes($this, [
'routes' => [
['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],