Inspection of "Merge pull request #21860 from nextcloud/techdebt/..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 3b82c6...3f7863 )

by Morris

created 2020-10-07 18:10 UTC

Status

Indentation +188 added lines, -188 removed lines patch added patch discarded remove patch

@@ -52,215 +52,215 @@
 block discarded – undo
 
 class Application extends \OCP\AppFramework\App {
 
-	/** @var IManager */
-	private $encryptionManager;
-	/** @var IConfig */
-	private $config;
+    /** @var IManager */
+    private $encryptionManager;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct($urlParams = []) {
-		parent::__construct('encryption', $urlParams);
-		$this->encryptionManager = \OC::$server->getEncryptionManager();
-		$this->config = \OC::$server->getConfig();
-		$this->registerServices();
-	}
+    /**
+     * @param array $urlParams
+     */
+    public function __construct($urlParams = []) {
+        parent::__construct('encryption', $urlParams);
+        $this->encryptionManager = \OC::$server->getEncryptionManager();
+        $this->config = \OC::$server->getConfig();
+        $this->registerServices();
+    }
 
-	public function setUp() {
-		if ($this->encryptionManager->isEnabled()) {
-			/** @var Setup $setup */
-			$setup = $this->getContainer()->query('UserSetup');
-			$setup->setupSystem();
-		}
-	}
+    public function setUp() {
+        if ($this->encryptionManager->isEnabled()) {
+            /** @var Setup $setup */
+            $setup = $this->getContainer()->query('UserSetup');
+            $setup->setupSystem();
+        }
+    }
 
-	/**
-	 * register hooks
-	 */
-	public function registerHooks() {
-		if (!$this->config->getSystemValueBool('maintenance')) {
-			$container = $this->getContainer();
-			$server = $container->getServer();
-			// Register our hooks and fire them.
-			$hookManager = new HookManager();
+    /**
+     * register hooks
+     */
+    public function registerHooks() {
+        if (!$this->config->getSystemValueBool('maintenance')) {
+            $container = $this->getContainer();
+            $server = $container->getServer();
+            // Register our hooks and fire them.
+            $hookManager = new HookManager();
 
-			$hookManager->registerHook([
-				new UserHooks($container->query('KeyManager'),
-					$server->getUserManager(),
-					$server->getLogger(),
-					$container->query('UserSetup'),
-					$server->getUserSession(),
-					$container->query('Util'),
-					$container->query('Session'),
-					$container->query('Crypt'),
-					$container->query('Recovery'))
-			]);
+            $hookManager->registerHook([
+                new UserHooks($container->query('KeyManager'),
+                    $server->getUserManager(),
+                    $server->getLogger(),
+                    $container->query('UserSetup'),
+                    $server->getUserSession(),
+                    $container->query('Util'),
+                    $container->query('Session'),
+                    $container->query('Crypt'),
+                    $container->query('Recovery'))
+            ]);
 
-			$hookManager->fireHooks();
-		} else {
-			// Logout user if we are in maintenance to force re-login
-			$this->getContainer()->getServer()->getUserSession()->logout();
-		}
-	}
+            $hookManager->fireHooks();
+        } else {
+            // Logout user if we are in maintenance to force re-login
+            $this->getContainer()->getServer()->getUserSession()->logout();
+        }
+    }
 
-	public function registerEncryptionModule() {
-		$container = $this->getContainer();
+    public function registerEncryptionModule() {
+        $container = $this->getContainer();
 
 
-		$this->encryptionManager->registerEncryptionModule(
-			Encryption::ID,
-			Encryption::DISPLAY_NAME,
-			function () use ($container) {
-				return new Encryption(
-				$container->query('Crypt'),
-				$container->query('KeyManager'),
-				$container->query('Util'),
-				$container->query('Session'),
-				$container->query('EncryptAll'),
-				$container->query('DecryptAll'),
-				$container->getServer()->getLogger(),
-				$container->getServer()->getL10N($container->getAppName())
-			);
-			});
-	}
+        $this->encryptionManager->registerEncryptionModule(
+            Encryption::ID,
+            Encryption::DISPLAY_NAME,
+            function () use ($container) {
+                return new Encryption(
+                $container->query('Crypt'),
+                $container->query('KeyManager'),
+                $container->query('Util'),
+                $container->query('Session'),
+                $container->query('EncryptAll'),
+                $container->query('DecryptAll'),
+                $container->getServer()->getLogger(),
+                $container->getServer()->getL10N($container->getAppName())
+            );
+            });
+    }
 
-	public function registerServices() {
-		$container = $this->getContainer();
+    public function registerServices() {
+        $container = $this->getContainer();
 
-		$container->registerService('Crypt',	function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new Crypt($server->getLogger(),
-					$server->getUserSession(),
-					$server->getConfig(),
-					$server->getL10N($c->get('AppName')));
-		});
+        $container->registerService('Crypt',	function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new Crypt($server->getLogger(),
+                    $server->getUserSession(),
+                    $server->getConfig(),
+                    $server->getL10N($c->get('AppName')));
+        });
 
-		$container->registerService('Session',	function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new Session($server->getSession());
-		}
-		);
+        $container->registerService('Session',	function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new Session($server->getSession());
+        }
+        );
 
-		$container->registerService('KeyManager',	function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+        $container->registerService('KeyManager',	function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new KeyManager($server->getEncryptionKeyStorage(),
-					$c->get('Crypt'),
-					$server->getConfig(),
-					$server->getUserSession(),
-					new Session($server->getSession()),
-					$server->getLogger(),
-					$c->get('Util'),
-					$server->getLockingProvider()
-				);
-		});
+            return new KeyManager($server->getEncryptionKeyStorage(),
+                    $c->get('Crypt'),
+                    $server->getConfig(),
+                    $server->getUserSession(),
+                    new Session($server->getSession()),
+                    $server->getLogger(),
+                    $c->get('Util'),
+                    $server->getLockingProvider()
+                );
+        });
 
-		$container->registerService('Recovery',		function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+        $container->registerService('Recovery',		function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new Recovery(
-					$server->getUserSession(),
-					$c->get('Crypt'),
-					$c->get('KeyManager'),
-					$server->getConfig(),
-					$server->getEncryptionFilesHelper(),
-					new View());
-		});
+            return new Recovery(
+                    $server->getUserSession(),
+                    $c->get('Crypt'),
+                    $c->get('KeyManager'),
+                    $server->getConfig(),
+                    $server->getEncryptionFilesHelper(),
+                    new View());
+        });
 
-		$container->registerService('RecoveryController', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new RecoveryController(
-				$c->get('AppName'),
-				$server->getRequest(),
-				$server->getConfig(),
-				$server->getL10N($c->get('AppName')),
-				$c->get('Recovery'));
-		});
+        $container->registerService('RecoveryController', function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new RecoveryController(
+                $c->get('AppName'),
+                $server->getRequest(),
+                $server->getConfig(),
+                $server->getL10N($c->get('AppName')),
+                $c->get('Recovery'));
+        });
 
-		$container->registerService('StatusController', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new StatusController(
-				$c->get('AppName'),
-				$server->getRequest(),
-				$server->getL10N($c->get('AppName')),
-				$c->get('Session'),
-				$server->getEncryptionManager()
-			);
-		});
+        $container->registerService('StatusController', function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new StatusController(
+                $c->get('AppName'),
+                $server->getRequest(),
+                $server->getL10N($c->get('AppName')),
+                $c->get('Session'),
+                $server->getEncryptionManager()
+            );
+        });
 
-		$container->registerService('SettingsController', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new SettingsController(
-				$c->get('AppName'),
-				$server->getRequest(),
-				$server->getL10N($c->get('AppName')),
-				$server->getUserManager(),
-				$server->getUserSession(),
-				$c->get('KeyManager'),
-				$c->get('Crypt'),
-				$c->get('Session'),
-				$server->getSession(),
-				$c->get('Util')
-			);
-		});
+        $container->registerService('SettingsController', function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new SettingsController(
+                $c->get('AppName'),
+                $server->getRequest(),
+                $server->getL10N($c->get('AppName')),
+                $server->getUserManager(),
+                $server->getUserSession(),
+                $c->get('KeyManager'),
+                $c->get('Crypt'),
+                $c->get('Session'),
+                $server->getSession(),
+                $c->get('Util')
+            );
+        });
 
-		$container->registerService('UserSetup',	function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new Setup($server->getLogger(),
-					$server->getUserSession(),
-					$c->get('Crypt'),
-					$c->get('KeyManager'));
-		});
+        $container->registerService('UserSetup',	function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new Setup($server->getLogger(),
+                    $server->getUserSession(),
+                    $c->get('Crypt'),
+                    $c->get('KeyManager'));
+        });
 
-		$container->registerService('Util', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+        $container->registerService('Util', function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new Util(
-					new View(),
-					$c->get('Crypt'),
-					$server->getLogger(),
-					$server->getUserSession(),
-					$server->getConfig(),
-					$server->getUserManager());
-		});
+            return new Util(
+                    new View(),
+                    $c->get('Crypt'),
+                    $server->getLogger(),
+                    $server->getUserSession(),
+                    $server->getConfig(),
+                    $server->getUserManager());
+        });
 
-		$container->registerService('EncryptAll',	function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-			return new EncryptAll(
-					$c->get('UserSetup'),
-					$server->getUserManager(),
-					new View(),
-					$c->get('KeyManager'),
-					$c->get('Util'),
-					$server->getConfig(),
-					$server->getMailer(),
-					$server->getL10N('encryption'),
-					new QuestionHelper(),
-					$server->getSecureRandom()
-				);
-		}
-		);
+        $container->registerService('EncryptAll',	function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+            return new EncryptAll(
+                    $c->get('UserSetup'),
+                    $server->getUserManager(),
+                    new View(),
+                    $c->get('KeyManager'),
+                    $c->get('Util'),
+                    $server->getConfig(),
+                    $server->getMailer(),
+                    $server->getL10N('encryption'),
+                    new QuestionHelper(),
+                    $server->getSecureRandom()
+                );
+        }
+        );
 
-		$container->registerService('DecryptAll',function (ContainerInterface $c) {
-			return new DecryptAll(
-					$c->get('Util'),
-					$c->get('KeyManager'),
-					$c->get('Crypt'),
-					$c->get('Session'),
-					new QuestionHelper()
-				);
-		}
-		);
-	}
+        $container->registerService('DecryptAll',function (ContainerInterface $c) {
+            return new DecryptAll(
+                    $c->get('Util'),
+                    $c->get('KeyManager'),
+                    $c->get('Crypt'),
+                    $c->get('Session'),
+                    new QuestionHelper()
+                );
+        }
+        );
+    }
 }

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -111,7 +111,7 @@  discard block
 block discarded – undo
 		$this->encryptionManager->registerEncryptionModule(
 			Encryption::ID,
 			Encryption::DISPLAY_NAME,
-			function () use ($container) {
+			function() use ($container) {
 				return new Encryption(
 				$container->query('Crypt'),
 				$container->query('KeyManager'),
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 	public function registerServices() {
 		$container = $this->getContainer();
 
-		$container->registerService('Crypt',	function (ContainerInterface $c) {
+		$container->registerService('Crypt', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new Crypt($server->getLogger(),
@@ -137,14 +137,14 @@  discard block
 block discarded – undo
 					$server->getL10N($c->get('AppName')));
 		});
 
-		$container->registerService('Session',	function (ContainerInterface $c) {
+		$container->registerService('Session', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new Session($server->getSession());
 		}
 		);
 
-		$container->registerService('KeyManager',	function (ContainerInterface $c) {
+		$container->registerService('KeyManager', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
 				);
 		});
 
-		$container->registerService('Recovery',		function (ContainerInterface $c) {
+		$container->registerService('Recovery', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
 					new View());
 		});
 
-		$container->registerService('RecoveryController', function (ContainerInterface $c) {
+		$container->registerService('RecoveryController', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new RecoveryController(
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 				$c->get('Recovery'));
 		});
 
-		$container->registerService('StatusController', function (ContainerInterface $c) {
+		$container->registerService('StatusController', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new StatusController(
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
 			);
 		});
 
-		$container->registerService('SettingsController', function (ContainerInterface $c) {
+		$container->registerService('SettingsController', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new SettingsController(
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 			);
 		});
 
-		$container->registerService('UserSetup',	function (ContainerInterface $c) {
+		$container->registerService('UserSetup', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new Setup($server->getLogger(),
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
 					$c->get('KeyManager'));
 		});
 
-		$container->registerService('Util', function (ContainerInterface $c) {
+		$container->registerService('Util', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
 					$server->getUserManager());
 		});
 
-		$container->registerService('EncryptAll',	function (ContainerInterface $c) {
+		$container->registerService('EncryptAll', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 			return new EncryptAll(
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
 		}
 		);
 
-		$container->registerService('DecryptAll',function (ContainerInterface $c) {
+		$container->registerService('DecryptAll', function(ContainerInterface $c) {
 			return new DecryptAll(
 					$c->get('Util'),
 					$c->get('KeyManager'),

Please login to merge, or discard this patch.

		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111	$this->encryptionManager->registerEncryptionModule(
112	112	Encryption::ID,
113	113	Encryption::DISPLAY_NAME,
114		- function () use ($container) {
	114	+ function() use ($container) {
115	115	return new Encryption(
116	116	$container->query('Crypt'),
117	117	$container->query('KeyManager'),
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	public function registerServices() {
129	129	$container = $this->getContainer();
130	130
131		- $container->registerService('Crypt', function (ContainerInterface $c) {
	131	+ $container->registerService('Crypt', function(ContainerInterface $c) {
132	132	/** @var IServerContainer $server */
133	133	$server = $c->get(IServerContainer::class);
134	134	return new Crypt($server->getLogger(),
		@@ -137,14 +137,14 @@ discard block
		block discarded – undo
137	137	$server->getL10N($c->get('AppName')));
138	138	});
139	139
140		- $container->registerService('Session', function (ContainerInterface $c) {
	140	+ $container->registerService('Session', function(ContainerInterface $c) {
141	141	/** @var IServerContainer $server */
142	142	$server = $c->get(IServerContainer::class);
143	143	return new Session($server->getSession());
144	144	}
145	145	);
146	146
147		- $container->registerService('KeyManager', function (ContainerInterface $c) {
	147	+ $container->registerService('KeyManager', function(ContainerInterface $c) {
148	148	/** @var IServerContainer $server */
149	149	$server = $c->get(IServerContainer::class);
150	150
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	);
160	160	});
161	161
162		- $container->registerService('Recovery', function (ContainerInterface $c) {
	162	+ $container->registerService('Recovery', function(ContainerInterface $c) {
163	163	/** @var IServerContainer $server */
164	164	$server = $c->get(IServerContainer::class);
165	165
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	new View());
173	173	});
174	174
175		- $container->registerService('RecoveryController', function (ContainerInterface $c) {
	175	+ $container->registerService('RecoveryController', function(ContainerInterface $c) {
176	176	/** @var IServerContainer $server */
177	177	$server = $c->get(IServerContainer::class);
178	178	return new RecoveryController(
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	$c->get('Recovery'));
184	184	});
185	185
186		- $container->registerService('StatusController', function (ContainerInterface $c) {
	186	+ $container->registerService('StatusController', function(ContainerInterface $c) {
187	187	/** @var IServerContainer $server */
188	188	$server = $c->get(IServerContainer::class);
189	189	return new StatusController(
		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	);
196	196	});
197	197
198		- $container->registerService('SettingsController', function (ContainerInterface $c) {
	198	+ $container->registerService('SettingsController', function(ContainerInterface $c) {
199	199	/** @var IServerContainer $server */
200	200	$server = $c->get(IServerContainer::class);
201	201	return new SettingsController(
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	);
213	213	});
214	214
215		- $container->registerService('UserSetup', function (ContainerInterface $c) {
	215	+ $container->registerService('UserSetup', function(ContainerInterface $c) {
216	216	/** @var IServerContainer $server */
217	217	$server = $c->get(IServerContainer::class);
218	218	return new Setup($server->getLogger(),
		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	$c->get('KeyManager'));
222	222	});
223	223
224		- $container->registerService('Util', function (ContainerInterface $c) {
	224	+ $container->registerService('Util', function(ContainerInterface $c) {
225	225	/** @var IServerContainer $server */
226	226	$server = $c->get(IServerContainer::class);
227	227
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	$server->getUserManager());
235	235	});
236	236
237		- $container->registerService('EncryptAll', function (ContainerInterface $c) {
	237	+ $container->registerService('EncryptAll', function(ContainerInterface $c) {
238	238	/** @var IServerContainer $server */
239	239	$server = $c->get(IServerContainer::class);
240	240	return new EncryptAll(
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	}
253	253	);
254	254
255		- $container->registerService('DecryptAll',function (ContainerInterface $c) {
	255	+ $container->registerService('DecryptAll', function(ContainerInterface $c) {
256	256	return new DecryptAll(
257	257	$c->get('Util'),
258	258	$c->get('KeyManager'),

		@@ -52,215 +52,215 @@
		block discarded – undo
52	52
53	53	class Application extends \OCP\AppFramework\App {
54	54
55		- /** @var IManager */
56		- private $encryptionManager;
57		- /** @var IConfig */
58		- private $config;
	55	+ /** @var IManager */
	56	+ private $encryptionManager;
	57	+ /** @var IConfig */
	58	+ private $config;
59	59
60		- /**
61		- * @param array $urlParams
62		- */
63		- public function __construct($urlParams = []) {
64		- parent::__construct('encryption', $urlParams);
65		- $this->encryptionManager = \OC::$server->getEncryptionManager();
66		- $this->config = \OC::$server->getConfig();
67		- $this->registerServices();
68		- }
	60	+ /**
	61	+ * @param array $urlParams
	62	+ */
	63	+ public function __construct($urlParams = []) {
	64	+ parent::__construct('encryption', $urlParams);
	65	+ $this->encryptionManager = \OC::$server->getEncryptionManager();
	66	+ $this->config = \OC::$server->getConfig();
	67	+ $this->registerServices();
	68	+ }
69	69
70		- public function setUp() {
71		- if ($this->encryptionManager->isEnabled()) {
72		- /** @var Setup $setup */
73		- $setup = $this->getContainer()->query('UserSetup');
74		- $setup->setupSystem();
75		- }
76		- }
	70	+ public function setUp() {
	71	+ if ($this->encryptionManager->isEnabled()) {
	72	+ /** @var Setup $setup */
	73	+ $setup = $this->getContainer()->query('UserSetup');
	74	+ $setup->setupSystem();
	75	+ }
	76	+ }
77	77
78		- /**
79		- * register hooks
80		- */
81		- public function registerHooks() {
82		- if (!$this->config->getSystemValueBool('maintenance')) {
83		- $container = $this->getContainer();
84		- $server = $container->getServer();
85		- // Register our hooks and fire them.
86		- $hookManager = new HookManager();
	78	+ /**
	79	+ * register hooks
	80	+ */
	81	+ public function registerHooks() {
	82	+ if (!$this->config->getSystemValueBool('maintenance')) {
	83	+ $container = $this->getContainer();
	84	+ $server = $container->getServer();
	85	+ // Register our hooks and fire them.
	86	+ $hookManager = new HookManager();
87	87
88		- $hookManager->registerHook([
89		- new UserHooks($container->query('KeyManager'),
90		- $server->getUserManager(),
91		- $server->getLogger(),
92		- $container->query('UserSetup'),
93		- $server->getUserSession(),
94		- $container->query('Util'),
95		- $container->query('Session'),
96		- $container->query('Crypt'),
97		- $container->query('Recovery'))
98		- ]);
	88	+ $hookManager->registerHook([
	89	+ new UserHooks($container->query('KeyManager'),
	90	+ $server->getUserManager(),
	91	+ $server->getLogger(),
	92	+ $container->query('UserSetup'),
	93	+ $server->getUserSession(),
	94	+ $container->query('Util'),
	95	+ $container->query('Session'),
	96	+ $container->query('Crypt'),
	97	+ $container->query('Recovery'))
	98	+ ]);
99	99
100		- $hookManager->fireHooks();
101		- } else {
102		- // Logout user if we are in maintenance to force re-login
103		- $this->getContainer()->getServer()->getUserSession()->logout();
104		- }
105		- }
	100	+ $hookManager->fireHooks();
	101	+ } else {
	102	+ // Logout user if we are in maintenance to force re-login
	103	+ $this->getContainer()->getServer()->getUserSession()->logout();
	104	+ }
	105	+ }
106	106
107		- public function registerEncryptionModule() {
108		- $container = $this->getContainer();
	107	+ public function registerEncryptionModule() {
	108	+ $container = $this->getContainer();
109	109
110	110
111		- $this->encryptionManager->registerEncryptionModule(
112		- Encryption::ID,
113		- Encryption::DISPLAY_NAME,
114		- function () use ($container) {
115		- return new Encryption(
116		- $container->query('Crypt'),
117		- $container->query('KeyManager'),
118		- $container->query('Util'),
119		- $container->query('Session'),
120		- $container->query('EncryptAll'),
121		- $container->query('DecryptAll'),
122		- $container->getServer()->getLogger(),
123		- $container->getServer()->getL10N($container->getAppName())
124		- );
125		- });
126		- }
	111	+ $this->encryptionManager->registerEncryptionModule(
	112	+ Encryption::ID,
	113	+ Encryption::DISPLAY_NAME,
	114	+ function () use ($container) {
	115	+ return new Encryption(
	116	+ $container->query('Crypt'),
	117	+ $container->query('KeyManager'),
	118	+ $container->query('Util'),
	119	+ $container->query('Session'),
	120	+ $container->query('EncryptAll'),
	121	+ $container->query('DecryptAll'),
	122	+ $container->getServer()->getLogger(),
	123	+ $container->getServer()->getL10N($container->getAppName())
	124	+ );
	125	+ });
	126	+ }
127	127
128		- public function registerServices() {
129		- $container = $this->getContainer();
	128	+ public function registerServices() {
	129	+ $container = $this->getContainer();
130	130
131		- $container->registerService('Crypt', function (ContainerInterface $c) {
132		- /** @var IServerContainer $server */
133		- $server = $c->get(IServerContainer::class);
134		- return new Crypt($server->getLogger(),
135		- $server->getUserSession(),
136		- $server->getConfig(),
137		- $server->getL10N($c->get('AppName')));
138		- });
	131	+ $container->registerService('Crypt', function (ContainerInterface $c) {
	132	+ /** @var IServerContainer $server */
	133	+ $server = $c->get(IServerContainer::class);
	134	+ return new Crypt($server->getLogger(),
	135	+ $server->getUserSession(),
	136	+ $server->getConfig(),
	137	+ $server->getL10N($c->get('AppName')));
	138	+ });
139	139
140		- $container->registerService('Session', function (ContainerInterface $c) {
141		- /** @var IServerContainer $server */
142		- $server = $c->get(IServerContainer::class);
143		- return new Session($server->getSession());
144		- }
145		- );
	140	+ $container->registerService('Session', function (ContainerInterface $c) {
	141	+ /** @var IServerContainer $server */
	142	+ $server = $c->get(IServerContainer::class);
	143	+ return new Session($server->getSession());
	144	+ }
	145	+ );
146	146
147		- $container->registerService('KeyManager', function (ContainerInterface $c) {
148		- /** @var IServerContainer $server */
149		- $server = $c->get(IServerContainer::class);
	147	+ $container->registerService('KeyManager', function (ContainerInterface $c) {
	148	+ /** @var IServerContainer $server */
	149	+ $server = $c->get(IServerContainer::class);
150	150
151		- return new KeyManager($server->getEncryptionKeyStorage(),
152		- $c->get('Crypt'),
153		- $server->getConfig(),
154		- $server->getUserSession(),
155		- new Session($server->getSession()),
156		- $server->getLogger(),
157		- $c->get('Util'),
158		- $server->getLockingProvider()
159		- );
160		- });
	151	+ return new KeyManager($server->getEncryptionKeyStorage(),
	152	+ $c->get('Crypt'),
	153	+ $server->getConfig(),
	154	+ $server->getUserSession(),
	155	+ new Session($server->getSession()),
	156	+ $server->getLogger(),
	157	+ $c->get('Util'),
	158	+ $server->getLockingProvider()
	159	+ );
	160	+ });
161	161
162		- $container->registerService('Recovery', function (ContainerInterface $c) {
163		- /** @var IServerContainer $server */
164		- $server = $c->get(IServerContainer::class);
	162	+ $container->registerService('Recovery', function (ContainerInterface $c) {
	163	+ /** @var IServerContainer $server */
	164	+ $server = $c->get(IServerContainer::class);
165	165
166		- return new Recovery(
167		- $server->getUserSession(),
168		- $c->get('Crypt'),
169		- $c->get('KeyManager'),
170		- $server->getConfig(),
171		- $server->getEncryptionFilesHelper(),
172		- new View());
173		- });
	166	+ return new Recovery(
	167	+ $server->getUserSession(),
	168	+ $c->get('Crypt'),
	169	+ $c->get('KeyManager'),
	170	+ $server->getConfig(),
	171	+ $server->getEncryptionFilesHelper(),
	172	+ new View());
	173	+ });
174	174
175		- $container->registerService('RecoveryController', function (ContainerInterface $c) {
176		- /** @var IServerContainer $server */
177		- $server = $c->get(IServerContainer::class);
178		- return new RecoveryController(
179		- $c->get('AppName'),
180		- $server->getRequest(),
181		- $server->getConfig(),
182		- $server->getL10N($c->get('AppName')),
183		- $c->get('Recovery'));
184		- });
	175	+ $container->registerService('RecoveryController', function (ContainerInterface $c) {
	176	+ /** @var IServerContainer $server */
	177	+ $server = $c->get(IServerContainer::class);
	178	+ return new RecoveryController(
	179	+ $c->get('AppName'),
	180	+ $server->getRequest(),
	181	+ $server->getConfig(),
	182	+ $server->getL10N($c->get('AppName')),
	183	+ $c->get('Recovery'));
	184	+ });
185	185
186		- $container->registerService('StatusController', function (ContainerInterface $c) {
187		- /** @var IServerContainer $server */
188		- $server = $c->get(IServerContainer::class);
189		- return new StatusController(
190		- $c->get('AppName'),
191		- $server->getRequest(),
192		- $server->getL10N($c->get('AppName')),
193		- $c->get('Session'),
194		- $server->getEncryptionManager()
195		- );
196		- });
	186	+ $container->registerService('StatusController', function (ContainerInterface $c) {
	187	+ /** @var IServerContainer $server */
	188	+ $server = $c->get(IServerContainer::class);
	189	+ return new StatusController(
	190	+ $c->get('AppName'),
	191	+ $server->getRequest(),
	192	+ $server->getL10N($c->get('AppName')),
	193	+ $c->get('Session'),
	194	+ $server->getEncryptionManager()
	195	+ );
	196	+ });
197	197
198		- $container->registerService('SettingsController', function (ContainerInterface $c) {
199		- /** @var IServerContainer $server */
200		- $server = $c->get(IServerContainer::class);
201		- return new SettingsController(
202		- $c->get('AppName'),
203		- $server->getRequest(),
204		- $server->getL10N($c->get('AppName')),
205		- $server->getUserManager(),
206		- $server->getUserSession(),
207		- $c->get('KeyManager'),
208		- $c->get('Crypt'),
209		- $c->get('Session'),
210		- $server->getSession(),
211		- $c->get('Util')
212		- );
213		- });
	198	+ $container->registerService('SettingsController', function (ContainerInterface $c) {
	199	+ /** @var IServerContainer $server */
	200	+ $server = $c->get(IServerContainer::class);
	201	+ return new SettingsController(
	202	+ $c->get('AppName'),
	203	+ $server->getRequest(),
	204	+ $server->getL10N($c->get('AppName')),
	205	+ $server->getUserManager(),
	206	+ $server->getUserSession(),
	207	+ $c->get('KeyManager'),
	208	+ $c->get('Crypt'),
	209	+ $c->get('Session'),
	210	+ $server->getSession(),
	211	+ $c->get('Util')
	212	+ );
	213	+ });
214	214
215		- $container->registerService('UserSetup', function (ContainerInterface $c) {
216		- /** @var IServerContainer $server */
217		- $server = $c->get(IServerContainer::class);
218		- return new Setup($server->getLogger(),
219		- $server->getUserSession(),
220		- $c->get('Crypt'),
221		- $c->get('KeyManager'));
222		- });
	215	+ $container->registerService('UserSetup', function (ContainerInterface $c) {
	216	+ /** @var IServerContainer $server */
	217	+ $server = $c->get(IServerContainer::class);
	218	+ return new Setup($server->getLogger(),
	219	+ $server->getUserSession(),
	220	+ $c->get('Crypt'),
	221	+ $c->get('KeyManager'));
	222	+ });
223	223
224		- $container->registerService('Util', function (ContainerInterface $c) {
225		- /** @var IServerContainer $server */
226		- $server = $c->get(IServerContainer::class);
	224	+ $container->registerService('Util', function (ContainerInterface $c) {
	225	+ /** @var IServerContainer $server */
	226	+ $server = $c->get(IServerContainer::class);
227	227
228		- return new Util(
229		- new View(),
230		- $c->get('Crypt'),
231		- $server->getLogger(),
232		- $server->getUserSession(),
233		- $server->getConfig(),
234		- $server->getUserManager());
235		- });
	228	+ return new Util(
	229	+ new View(),
	230	+ $c->get('Crypt'),
	231	+ $server->getLogger(),
	232	+ $server->getUserSession(),
	233	+ $server->getConfig(),
	234	+ $server->getUserManager());
	235	+ });
236	236
237		- $container->registerService('EncryptAll', function (ContainerInterface $c) {
238		- /** @var IServerContainer $server */
239		- $server = $c->get(IServerContainer::class);
240		- return new EncryptAll(
241		- $c->get('UserSetup'),
242		- $server->getUserManager(),
243		- new View(),
244		- $c->get('KeyManager'),
245		- $c->get('Util'),
246		- $server->getConfig(),
247		- $server->getMailer(),
248		- $server->getL10N('encryption'),
249		- new QuestionHelper(),
250		- $server->getSecureRandom()
251		- );
252		- }
253		- );
	237	+ $container->registerService('EncryptAll', function (ContainerInterface $c) {
	238	+ /** @var IServerContainer $server */
	239	+ $server = $c->get(IServerContainer::class);
	240	+ return new EncryptAll(
	241	+ $c->get('UserSetup'),
	242	+ $server->getUserManager(),
	243	+ new View(),
	244	+ $c->get('KeyManager'),
	245	+ $c->get('Util'),
	246	+ $server->getConfig(),
	247	+ $server->getMailer(),
	248	+ $server->getL10N('encryption'),
	249	+ new QuestionHelper(),
	250	+ $server->getSecureRandom()
	251	+ );
	252	+ }
	253	+ );
254	254
255		- $container->registerService('DecryptAll',function (ContainerInterface $c) {
256		- return new DecryptAll(
257		- $c->get('Util'),
258		- $c->get('KeyManager'),
259		- $c->get('Crypt'),
260		- $c->get('Session'),
261		- new QuestionHelper()
262		- );
263		- }
264		- );
265		- }
	255	+ $container->registerService('DecryptAll',function (ContainerInterface $c) {
	256	+ return new DecryptAll(
	257	+ $c->get('Util'),
	258	+ $c->get('KeyManager'),
	259	+ $c->get('Crypt'),
	260	+ $c->get('Session'),
	261	+ new QuestionHelper()
	262	+ );
	263	+ }
	264	+ );
	265	+ }
266	266	}

nextcloud / server

Push — master ( 3b82c6...3f7863 )

Status

Category

Indentation +188 added lines, -188 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch