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

Passed

Push — master ( 25ce3c...d3401e )

by Roeland

created 2020-03-19 19:09 UTC

Status

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

@@ -73,115 +73,115 @@
 block discarded – undo
  */
 class Application extends App implements IBackendProvider, IAuthMechanismProvider {
 
-	/**
-	 * Application constructor.
-	 *
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct('files_external', $urlParams);
-
-		$container = $this->getContainer();
-
-		/** @var BackendService $backendService */
-		$backendService = $container->query(BackendService::class);
-		$backendService->registerBackendProvider($this);
-		$backendService->registerAuthMechanismProvider($this);
-		$backendService->registerConfigHandler('user', function() use ($container) {
-			return $container->query(UserPlaceholderHandler::class);
-		});
-
-		// force-load auth mechanisms since some will register hooks
-		// TODO: obsolete these and use the TokenProvider to get the user's password from the session
-		$this->getAuthMechanisms();
-	}
-
-	public function registerListeners() {
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$dispatcher->addListener(
-			IUser::class . '::postDelete',
-			function (GenericEvent $event) {
-				/** @var IUser $user */
-				$user = $event->getSubject();
-				/** @var DBConfigService $config */
-				$config = $this->getContainer()->query(DBConfigService::class);
-				$config->modifyMountsOnUserDelete($user->getUID());
-			}
-		);
-		$dispatcher->addListener(
-			IGroup::class . '::postDelete',
-			function (GenericEvent $event) {
-				/** @var IGroup $group */
-				$group = $event->getSubject();
-				/** @var DBConfigService $config */
-				$config = $this->getContainer()->query(DBConfigService::class);
-				$config->modifyMountsOnGroupDelete($group->getGID());
-			}
-		);
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getBackends() {
-		$container = $this->getContainer();
-
-		$backends = [
-			$container->query(Local::class),
-			$container->query(FTP::class),
-			$container->query(DAV::class),
-			$container->query(OwnCloud::class),
-			$container->query(SFTP::class),
-			$container->query(AmazonS3::class),
-			$container->query(Swift::class),
-			$container->query(SFTP_Key::class),
-			$container->query(SMB::class),
-			$container->query(SMB_OC::class),
-		];
-
-		return $backends;
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getAuthMechanisms() {
-		$container = $this->getContainer();
-
-		return [
-			// AuthMechanism::SCHEME_NULL mechanism
-			$container->query(NullMechanism::class),
-
-			// AuthMechanism::SCHEME_BUILTIN mechanism
-			$container->query(Builtin::class),
-
-			// AuthMechanism::SCHEME_PASSWORD mechanisms
-			$container->query(Password::class),
-			$container->query(SessionCredentials::class),
-			$container->query(LoginCredentials::class),
-			$container->query(UserProvided::class),
-			$container->query(GlobalAuth::class),
-			$container->query(UserGlobalAuth::class),
-
-			// AuthMechanism::SCHEME_OAUTH1 mechanisms
-			$container->query(OAuth1::class),
-
-			// AuthMechanism::SCHEME_OAUTH2 mechanisms
-			$container->query(OAuth2::class),
-
-			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
-			$container->query(RSA::class),
-			$container->query(RSAPrivateKey::class),
-
-			// AuthMechanism::SCHEME_OPENSTACK mechanisms
-			$container->query(OpenStackV2::class),
-			$container->query(OpenStackV3::class),
-			$container->query(Rackspace::class),
-
-			// Specialized mechanisms
-			$container->query(AccessKey::class),
-			$container->query(KerberosAuth::class),
-		];
-	}
+    /**
+     * Application constructor.
+     *
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct('files_external', $urlParams);
+
+        $container = $this->getContainer();
+
+        /** @var BackendService $backendService */
+        $backendService = $container->query(BackendService::class);
+        $backendService->registerBackendProvider($this);
+        $backendService->registerAuthMechanismProvider($this);
+        $backendService->registerConfigHandler('user', function() use ($container) {
+            return $container->query(UserPlaceholderHandler::class);
+        });
+
+        // force-load auth mechanisms since some will register hooks
+        // TODO: obsolete these and use the TokenProvider to get the user's password from the session
+        $this->getAuthMechanisms();
+    }
+
+    public function registerListeners() {
+        $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+        $dispatcher->addListener(
+            IUser::class . '::postDelete',
+            function (GenericEvent $event) {
+                /** @var IUser $user */
+                $user = $event->getSubject();
+                /** @var DBConfigService $config */
+                $config = $this->getContainer()->query(DBConfigService::class);
+                $config->modifyMountsOnUserDelete($user->getUID());
+            }
+        );
+        $dispatcher->addListener(
+            IGroup::class . '::postDelete',
+            function (GenericEvent $event) {
+                /** @var IGroup $group */
+                $group = $event->getSubject();
+                /** @var DBConfigService $config */
+                $config = $this->getContainer()->query(DBConfigService::class);
+                $config->modifyMountsOnGroupDelete($group->getGID());
+            }
+        );
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getBackends() {
+        $container = $this->getContainer();
+
+        $backends = [
+            $container->query(Local::class),
+            $container->query(FTP::class),
+            $container->query(DAV::class),
+            $container->query(OwnCloud::class),
+            $container->query(SFTP::class),
+            $container->query(AmazonS3::class),
+            $container->query(Swift::class),
+            $container->query(SFTP_Key::class),
+            $container->query(SMB::class),
+            $container->query(SMB_OC::class),
+        ];
+
+        return $backends;
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getAuthMechanisms() {
+        $container = $this->getContainer();
+
+        return [
+            // AuthMechanism::SCHEME_NULL mechanism
+            $container->query(NullMechanism::class),
+
+            // AuthMechanism::SCHEME_BUILTIN mechanism
+            $container->query(Builtin::class),
+
+            // AuthMechanism::SCHEME_PASSWORD mechanisms
+            $container->query(Password::class),
+            $container->query(SessionCredentials::class),
+            $container->query(LoginCredentials::class),
+            $container->query(UserProvided::class),
+            $container->query(GlobalAuth::class),
+            $container->query(UserGlobalAuth::class),
+
+            // AuthMechanism::SCHEME_OAUTH1 mechanisms
+            $container->query(OAuth1::class),
+
+            // AuthMechanism::SCHEME_OAUTH2 mechanisms
+            $container->query(OAuth2::class),
+
+            // AuthMechanism::SCHEME_PUBLICKEY mechanisms
+            $container->query(RSA::class),
+            $container->query(RSAPrivateKey::class),
+
+            // AuthMechanism::SCHEME_OPENSTACK mechanisms
+            $container->query(OpenStackV2::class),
+            $container->query(OpenStackV3::class),
+            $container->query(Rackspace::class),
+
+            // Specialized mechanisms
+            $container->query(AccessKey::class),
+            $container->query(KerberosAuth::class),
+        ];
+    }
 
 }

Please login to merge, or discard this patch.

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

@@ -99,8 +99,8 @@  discard block
 block discarded – undo
 	public function registerListeners() {
 		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
 		$dispatcher->addListener(
-			IUser::class . '::postDelete',
-			function (GenericEvent $event) {
+			IUser::class.'::postDelete',
+			function(GenericEvent $event) {
 				/** @var IUser $user */
 				$user = $event->getSubject();
 				/** @var DBConfigService $config */
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
 			}
 		);
 		$dispatcher->addListener(
-			IGroup::class . '::postDelete',
-			function (GenericEvent $event) {
+			IGroup::class.'::postDelete',
+			function(GenericEvent $event) {
 				/** @var IGroup $group */
 				$group = $event->getSubject();
 				/** @var DBConfigService $config */

Please login to merge, or discard this patch.

		@@ -73,115 +73,115 @@
		block discarded – undo
73	73	*/
74	74	class Application extends App implements IBackendProvider, IAuthMechanismProvider {
75	75
76		- /**
77		- * Application constructor.
78		- *
79		- * @throws \OCP\AppFramework\QueryException
80		- */
81		- public function __construct(array $urlParams = []) {
82		- parent::__construct('files_external', $urlParams);
83		-
84		- $container = $this->getContainer();
85		-
86		- /** @var BackendService $backendService */
87		- $backendService = $container->query(BackendService::class);
88		- $backendService->registerBackendProvider($this);
89		- $backendService->registerAuthMechanismProvider($this);
90		- $backendService->registerConfigHandler('user', function() use ($container) {
91		- return $container->query(UserPlaceholderHandler::class);
92		- });
93		-
94		- // force-load auth mechanisms since some will register hooks
95		- // TODO: obsolete these and use the TokenProvider to get the user's password from the session
96		- $this->getAuthMechanisms();
97		- }
98		-
99		- public function registerListeners() {
100		- $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
101		- $dispatcher->addListener(
102		- IUser::class . '::postDelete',
103		- function (GenericEvent $event) {
104		- /** @var IUser $user */
105		- $user = $event->getSubject();
106		- /** @var DBConfigService $config */
107		- $config = $this->getContainer()->query(DBConfigService::class);
108		- $config->modifyMountsOnUserDelete($user->getUID());
109		- }
110		- );
111		- $dispatcher->addListener(
112		- IGroup::class . '::postDelete',
113		- function (GenericEvent $event) {
114		- /** @var IGroup $group */
115		- $group = $event->getSubject();
116		- /** @var DBConfigService $config */
117		- $config = $this->getContainer()->query(DBConfigService::class);
118		- $config->modifyMountsOnGroupDelete($group->getGID());
119		- }
120		- );
121		- }
122		-
123		- /**
124		- * @{inheritdoc}
125		- */
126		- public function getBackends() {
127		- $container = $this->getContainer();
128		-
129		- $backends = [
130		- $container->query(Local::class),
131		- $container->query(FTP::class),
132		- $container->query(DAV::class),
133		- $container->query(OwnCloud::class),
134		- $container->query(SFTP::class),
135		- $container->query(AmazonS3::class),
136		- $container->query(Swift::class),
137		- $container->query(SFTP_Key::class),
138		- $container->query(SMB::class),
139		- $container->query(SMB_OC::class),
140		- ];
141		-
142		- return $backends;
143		- }
144		-
145		- /**
146		- * @{inheritdoc}
147		- */
148		- public function getAuthMechanisms() {
149		- $container = $this->getContainer();
150		-
151		- return [
152		- // AuthMechanism::SCHEME_NULL mechanism
153		- $container->query(NullMechanism::class),
154		-
155		- // AuthMechanism::SCHEME_BUILTIN mechanism
156		- $container->query(Builtin::class),
157		-
158		- // AuthMechanism::SCHEME_PASSWORD mechanisms
159		- $container->query(Password::class),
160		- $container->query(SessionCredentials::class),
161		- $container->query(LoginCredentials::class),
162		- $container->query(UserProvided::class),
163		- $container->query(GlobalAuth::class),
164		- $container->query(UserGlobalAuth::class),
165		-
166		- // AuthMechanism::SCHEME_OAUTH1 mechanisms
167		- $container->query(OAuth1::class),
168		-
169		- // AuthMechanism::SCHEME_OAUTH2 mechanisms
170		- $container->query(OAuth2::class),
171		-
172		- // AuthMechanism::SCHEME_PUBLICKEY mechanisms
173		- $container->query(RSA::class),
174		- $container->query(RSAPrivateKey::class),
175		-
176		- // AuthMechanism::SCHEME_OPENSTACK mechanisms
177		- $container->query(OpenStackV2::class),
178		- $container->query(OpenStackV3::class),
179		- $container->query(Rackspace::class),
180		-
181		- // Specialized mechanisms
182		- $container->query(AccessKey::class),
183		- $container->query(KerberosAuth::class),
184		- ];
185		- }
	76	+ /**
	77	+ * Application constructor.
	78	+ *
	79	+ * @throws \OCP\AppFramework\QueryException
	80	+ */
	81	+ public function __construct(array $urlParams = []) {
	82	+ parent::__construct('files_external', $urlParams);
	83	+
	84	+ $container = $this->getContainer();
	85	+
	86	+ /** @var BackendService $backendService */
	87	+ $backendService = $container->query(BackendService::class);
	88	+ $backendService->registerBackendProvider($this);
	89	+ $backendService->registerAuthMechanismProvider($this);
	90	+ $backendService->registerConfigHandler('user', function() use ($container) {
	91	+ return $container->query(UserPlaceholderHandler::class);
	92	+ });
	93	+
	94	+ // force-load auth mechanisms since some will register hooks
	95	+ // TODO: obsolete these and use the TokenProvider to get the user's password from the session
	96	+ $this->getAuthMechanisms();
	97	+ }
	98	+
	99	+ public function registerListeners() {
	100	+ $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
	101	+ $dispatcher->addListener(
	102	+ IUser::class . '::postDelete',
	103	+ function (GenericEvent $event) {
	104	+ /** @var IUser $user */
	105	+ $user = $event->getSubject();
	106	+ /** @var DBConfigService $config */
	107	+ $config = $this->getContainer()->query(DBConfigService::class);
	108	+ $config->modifyMountsOnUserDelete($user->getUID());
	109	+ }
	110	+ );
	111	+ $dispatcher->addListener(
	112	+ IGroup::class . '::postDelete',
	113	+ function (GenericEvent $event) {
	114	+ /** @var IGroup $group */
	115	+ $group = $event->getSubject();
	116	+ /** @var DBConfigService $config */
	117	+ $config = $this->getContainer()->query(DBConfigService::class);
	118	+ $config->modifyMountsOnGroupDelete($group->getGID());
	119	+ }
	120	+ );
	121	+ }
	122	+
	123	+ /**
	124	+ * @{inheritdoc}
	125	+ */
	126	+ public function getBackends() {
	127	+ $container = $this->getContainer();
	128	+
	129	+ $backends = [
	130	+ $container->query(Local::class),
	131	+ $container->query(FTP::class),
	132	+ $container->query(DAV::class),
	133	+ $container->query(OwnCloud::class),
	134	+ $container->query(SFTP::class),
	135	+ $container->query(AmazonS3::class),
	136	+ $container->query(Swift::class),
	137	+ $container->query(SFTP_Key::class),
	138	+ $container->query(SMB::class),
	139	+ $container->query(SMB_OC::class),
	140	+ ];
	141	+
	142	+ return $backends;
	143	+ }
	144	+
	145	+ /**
	146	+ * @{inheritdoc}
	147	+ */
	148	+ public function getAuthMechanisms() {
	149	+ $container = $this->getContainer();
	150	+
	151	+ return [
	152	+ // AuthMechanism::SCHEME_NULL mechanism
	153	+ $container->query(NullMechanism::class),
	154	+
	155	+ // AuthMechanism::SCHEME_BUILTIN mechanism
	156	+ $container->query(Builtin::class),
	157	+
	158	+ // AuthMechanism::SCHEME_PASSWORD mechanisms
	159	+ $container->query(Password::class),
	160	+ $container->query(SessionCredentials::class),
	161	+ $container->query(LoginCredentials::class),
	162	+ $container->query(UserProvided::class),
	163	+ $container->query(GlobalAuth::class),
	164	+ $container->query(UserGlobalAuth::class),
	165	+
	166	+ // AuthMechanism::SCHEME_OAUTH1 mechanisms
	167	+ $container->query(OAuth1::class),
	168	+
	169	+ // AuthMechanism::SCHEME_OAUTH2 mechanisms
	170	+ $container->query(OAuth2::class),
	171	+
	172	+ // AuthMechanism::SCHEME_PUBLICKEY mechanisms
	173	+ $container->query(RSA::class),
	174	+ $container->query(RSAPrivateKey::class),
	175	+
	176	+ // AuthMechanism::SCHEME_OPENSTACK mechanisms
	177	+ $container->query(OpenStackV2::class),
	178	+ $container->query(OpenStackV3::class),
	179	+ $container->query(Rackspace::class),
	180	+
	181	+ // Specialized mechanisms
	182	+ $container->query(AccessKey::class),
	183	+ $container->query(KerberosAuth::class),
	184	+ ];
	185	+ }
186	186
187	187	}

		@@ -99,8 +99,8 @@ discard block
		block discarded – undo
99	99	public function registerListeners() {
100	100	$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
101	101	$dispatcher->addListener(
102		- IUser::class . '::postDelete',
103		- function (GenericEvent $event) {
	102	+ IUser::class.'::postDelete',
	103	+ function(GenericEvent $event) {
104	104	/** @var IUser $user */
105	105	$user = $event->getSubject();
106	106	/** @var DBConfigService $config */
		@@ -109,8 +109,8 @@ discard block
		block discarded – undo
109	109	}
110	110	);
111	111	$dispatcher->addListener(
112		- IGroup::class . '::postDelete',
113		- function (GenericEvent $event) {
	112	+ IGroup::class.'::postDelete',
	113	+ function(GenericEvent $event) {
114	114	/** @var IGroup $group */
115	115	$group = $event->getSubject();
116	116	/** @var DBConfigService $config */

nextcloud / server

Push — master ( 25ce3c...d3401e )

Status

Category

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

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