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

Passed

Push — master ( 7d550e...6e8e34 )

by Blizzz

created 2020-08-14 14:07 UTC

Status

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

@@ -31,21 +31,21 @@
 block discarded – undo
 
 class UserBackendRegistered extends Event {
 
-	/** @var IUserLDAP */
-	private $backend;
-	/** @var UserPluginManager */
-	private $pluginManager;
-
-	public function __construct(IUserLDAP $backend, UserPluginManager $pluginManager) {
-		$this->backend = $backend;
-		$this->pluginManager = $pluginManager;
-	}
-
-	public function getBackend(): IUserLDAP {
-		return $this->backend;
-	}
-
-	public function getPluginManager(): UserPluginManager {
-		return $this->pluginManager;
-	}
+    /** @var IUserLDAP */
+    private $backend;
+    /** @var UserPluginManager */
+    private $pluginManager;
+
+    public function __construct(IUserLDAP $backend, UserPluginManager $pluginManager) {
+        $this->backend = $backend;
+        $this->pluginManager = $pluginManager;
+    }
+
+    public function getBackend(): IUserLDAP {
+        return $this->backend;
+    }
+
+    public function getPluginManager(): UserPluginManager {
+        return $this->pluginManager;
+    }
 }

Please login to merge, or discard this patch.

apps/user_ldap/lib/Events/GroupBackendRegistered.php 1 patch

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

@@ -31,21 +31,21 @@
 block discarded – undo
 
 class GroupBackendRegistered extends Event {
 
-	/** @var GroupPluginManager */
-	private $pluginManager;
-	/** @var IGroupLDAP */
-	private $backend;
-
-	public function __construct(IGroupLDAP $backend, GroupPluginManager $pluginManager) {
-		$this->pluginManager = $pluginManager;
-		$this->backend = $backend;
-	}
-
-	public function getBackend(): IGroupLDAP {
-		return $this->backend;
-	}
-
-	public function getPluginManager(): GroupPluginManager {
-		return $this->pluginManager;
-	}
+    /** @var GroupPluginManager */
+    private $pluginManager;
+    /** @var IGroupLDAP */
+    private $backend;
+
+    public function __construct(IGroupLDAP $backend, GroupPluginManager $pluginManager) {
+        $this->pluginManager = $pluginManager;
+        $this->backend = $backend;
+    }
+
+    public function getBackend(): IGroupLDAP {
+        return $this->backend;
+    }
+
+    public function getPluginManager(): GroupPluginManager {
+        return $this->pluginManager;
+    }
 }

Please login to merge, or discard this patch.

apps/user_ldap/lib/AppInfo/Application.php 1 patch

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

@@ -55,89 +55,89 @@
 block discarded – undo
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct() {
-		parent::__construct('user_ldap');
-		$container = $this->getContainer();
-
-		/**
-		 * Controller
-		 */
-		$container->registerService('RenewPasswordController', function (IAppContainer $appContainer) {
-			/** @var IServerContainer $server */
-			$server = $appContainer->get(IServerContainer::class);
-
-			return new RenewPasswordController(
-				$appContainer->get('AppName'),
-				$server->getRequest(),
-				$appContainer->get('UserManager'),
-				$server->getConfig(),
-				$appContainer->get(IL10N::class),
-				$appContainer->get('Session'),
-				$server->getURLGenerator()
-			);
-		});
-
-		$container->registerService(ILDAPWrapper::class, function () {
-			return new LDAP();
-		});
-	}
-
-	public function register(IRegistrationContext $context): void {
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IConfig $config,
-									 INotificationManager $notificationManager,
-									 IUserSession $userSession,
-									 IAppContainer $appContainer,
-									 EventDispatcherInterface $legacyDispatcher,
-									 IEventDispatcher $dispatcher,
-									 IGroupManager $groupManager) {
-			$helper = new Helper($config);
-			$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-			if (count($configPrefixes) > 0) {
-				$ldapWrapper = new LDAP();
-
-				$notificationManager->registerNotifierService(Notifier::class);
-
-				$userPluginManager = $appContainer->get(UserPluginManager::class);
-				$groupPluginManager = $appContainer->get(GroupPluginManager::class);
-
-				$userBackend = new User_Proxy(
-					$configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager
-				);
-				$groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
-
-				\OC_User::useBackend($userBackend);
-				$userBackendRegisteredEvent = new UserBackendRegistered($userBackend, $userPluginManager);
-				$dispatcher->dispatchTyped($userBackendRegisteredEvent);
-				$legacyDispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded', $userBackendRegisteredEvent);
-
-				$groupManager->addBackend($groupBackend);
-				$groupBackendRegisteredEvent = new GroupBackendRegistered($groupBackend, $groupPluginManager);
-				$dispatcher->dispatchTyped($groupBackendRegisteredEvent);
-			}
-		});
-
-		$context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents']));
-
-		\OCP\Util::connectHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			'\OCA\User_LDAP\Helper',
-			'loginName2UserName'
-		);
-	}
-
-	private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) {
-		$dispatcher->addListener(
-			'OCA\\Files_External::loadAdditionalBackends',
-			function () use ($appContainer) {
-				$storagesBackendService = $appContainer->get(BackendService::class);
-				$storagesBackendService->registerConfigHandler('home', function () use ($appContainer) {
-					return $appContainer->get(ExtStorageConfigHandler::class);
-				});
-			}
-		);
-	}
+    public function __construct() {
+        parent::__construct('user_ldap');
+        $container = $this->getContainer();
+
+        /**
+         * Controller
+         */
+        $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) {
+            /** @var IServerContainer $server */
+            $server = $appContainer->get(IServerContainer::class);
+
+            return new RenewPasswordController(
+                $appContainer->get('AppName'),
+                $server->getRequest(),
+                $appContainer->get('UserManager'),
+                $server->getConfig(),
+                $appContainer->get(IL10N::class),
+                $appContainer->get('Session'),
+                $server->getURLGenerator()
+            );
+        });
+
+        $container->registerService(ILDAPWrapper::class, function () {
+            return new LDAP();
+        });
+    }
+
+    public function register(IRegistrationContext $context): void {
+    }
+
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (IConfig $config,
+                                        INotificationManager $notificationManager,
+                                        IUserSession $userSession,
+                                        IAppContainer $appContainer,
+                                        EventDispatcherInterface $legacyDispatcher,
+                                        IEventDispatcher $dispatcher,
+                                        IGroupManager $groupManager) {
+            $helper = new Helper($config);
+            $configPrefixes = $helper->getServerConfigurationPrefixes(true);
+            if (count($configPrefixes) > 0) {
+                $ldapWrapper = new LDAP();
+
+                $notificationManager->registerNotifierService(Notifier::class);
+
+                $userPluginManager = $appContainer->get(UserPluginManager::class);
+                $groupPluginManager = $appContainer->get(GroupPluginManager::class);
+
+                $userBackend = new User_Proxy(
+                    $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager
+                );
+                $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
+
+                \OC_User::useBackend($userBackend);
+                $userBackendRegisteredEvent = new UserBackendRegistered($userBackend, $userPluginManager);
+                $dispatcher->dispatchTyped($userBackendRegisteredEvent);
+                $legacyDispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded', $userBackendRegisteredEvent);
+
+                $groupManager->addBackend($groupBackend);
+                $groupBackendRegisteredEvent = new GroupBackendRegistered($groupBackend, $groupPluginManager);
+                $dispatcher->dispatchTyped($groupBackendRegisteredEvent);
+            }
+        });
+
+        $context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents']));
+
+        \OCP\Util::connectHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            '\OCA\User_LDAP\Helper',
+            'loginName2UserName'
+        );
+    }
+
+    private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) {
+        $dispatcher->addListener(
+            'OCA\\Files_External::loadAdditionalBackends',
+            function () use ($appContainer) {
+                $storagesBackendService = $appContainer->get(BackendService::class);
+                $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) {
+                    return $appContainer->get(ExtStorageConfigHandler::class);
+                });
+            }
+        );
+    }
 }

Please login to merge, or discard this patch.

		@@ -55,89 +55,89 @@
		block discarded – undo
55	55	use Symfony\Component\EventDispatcher\EventDispatcherInterface;
56	56
57	57	class Application extends App implements IBootstrap {
58		- public function __construct() {
59		- parent::__construct('user_ldap');
60		- $container = $this->getContainer();
61		-
62		- /**
63		- * Controller
64		- */
65		- $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) {
66		- /** @var IServerContainer $server */
67		- $server = $appContainer->get(IServerContainer::class);
68		-
69		- return new RenewPasswordController(
70		- $appContainer->get('AppName'),
71		- $server->getRequest(),
72		- $appContainer->get('UserManager'),
73		- $server->getConfig(),
74		- $appContainer->get(IL10N::class),
75		- $appContainer->get('Session'),
76		- $server->getURLGenerator()
77		- );
78		- });
79		-
80		- $container->registerService(ILDAPWrapper::class, function () {
81		- return new LDAP();
82		- });
83		- }
84		-
85		- public function register(IRegistrationContext $context): void {
86		- }
87		-
88		- public function boot(IBootContext $context): void {
89		- $context->injectFn(function (IConfig $config,
90		- INotificationManager $notificationManager,
91		- IUserSession $userSession,
92		- IAppContainer $appContainer,
93		- EventDispatcherInterface $legacyDispatcher,
94		- IEventDispatcher $dispatcher,
95		- IGroupManager $groupManager) {
96		- $helper = new Helper($config);
97		- $configPrefixes = $helper->getServerConfigurationPrefixes(true);
98		- if (count($configPrefixes) > 0) {
99		- $ldapWrapper = new LDAP();
100		-
101		- $notificationManager->registerNotifierService(Notifier::class);
102		-
103		- $userPluginManager = $appContainer->get(UserPluginManager::class);
104		- $groupPluginManager = $appContainer->get(GroupPluginManager::class);
105		-
106		- $userBackend = new User_Proxy(
107		- $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager
108		- );
109		- $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
110		-
111		- \OC_User::useBackend($userBackend);
112		- $userBackendRegisteredEvent = new UserBackendRegistered($userBackend, $userPluginManager);
113		- $dispatcher->dispatchTyped($userBackendRegisteredEvent);
114		- $legacyDispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded', $userBackendRegisteredEvent);
115		-
116		- $groupManager->addBackend($groupBackend);
117		- $groupBackendRegisteredEvent = new GroupBackendRegistered($groupBackend, $groupPluginManager);
118		- $dispatcher->dispatchTyped($groupBackendRegisteredEvent);
119		- }
120		- });
121		-
122		- $context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents']));
123		-
124		- \OCP\Util::connectHook(
125		- '\OCA\Files_Sharing\API\Server2Server',
126		- 'preLoginNameUsedAsUserName',
127		- '\OCA\User_LDAP\Helper',
128		- 'loginName2UserName'
129		- );
130		- }
131		-
132		- private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) {
133		- $dispatcher->addListener(
134		- 'OCA\\Files_External::loadAdditionalBackends',
135		- function () use ($appContainer) {
136		- $storagesBackendService = $appContainer->get(BackendService::class);
137		- $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) {
138		- return $appContainer->get(ExtStorageConfigHandler::class);
139		- });
140		- }
141		- );
142		- }
	58	+ public function __construct() {
	59	+ parent::__construct('user_ldap');
	60	+ $container = $this->getContainer();
	61	+
	62	+ /**
	63	+ * Controller
	64	+ */
	65	+ $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) {
	66	+ /** @var IServerContainer $server */
	67	+ $server = $appContainer->get(IServerContainer::class);
	68	+
	69	+ return new RenewPasswordController(
	70	+ $appContainer->get('AppName'),
	71	+ $server->getRequest(),
	72	+ $appContainer->get('UserManager'),
	73	+ $server->getConfig(),
	74	+ $appContainer->get(IL10N::class),
	75	+ $appContainer->get('Session'),
	76	+ $server->getURLGenerator()
	77	+ );
	78	+ });
	79	+
	80	+ $container->registerService(ILDAPWrapper::class, function () {
	81	+ return new LDAP();
	82	+ });
	83	+ }
	84	+
	85	+ public function register(IRegistrationContext $context): void {
	86	+ }
	87	+
	88	+ public function boot(IBootContext $context): void {
	89	+ $context->injectFn(function (IConfig $config,
	90	+ INotificationManager $notificationManager,
	91	+ IUserSession $userSession,
	92	+ IAppContainer $appContainer,
	93	+ EventDispatcherInterface $legacyDispatcher,
	94	+ IEventDispatcher $dispatcher,
	95	+ IGroupManager $groupManager) {
	96	+ $helper = new Helper($config);
	97	+ $configPrefixes = $helper->getServerConfigurationPrefixes(true);
	98	+ if (count($configPrefixes) > 0) {
	99	+ $ldapWrapper = new LDAP();
	100	+
	101	+ $notificationManager->registerNotifierService(Notifier::class);
	102	+
	103	+ $userPluginManager = $appContainer->get(UserPluginManager::class);
	104	+ $groupPluginManager = $appContainer->get(GroupPluginManager::class);
	105	+
	106	+ $userBackend = new User_Proxy(
	107	+ $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager
	108	+ );
	109	+ $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
	110	+
	111	+ \OC_User::useBackend($userBackend);
	112	+ $userBackendRegisteredEvent = new UserBackendRegistered($userBackend, $userPluginManager);
	113	+ $dispatcher->dispatchTyped($userBackendRegisteredEvent);
	114	+ $legacyDispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded', $userBackendRegisteredEvent);
	115	+
	116	+ $groupManager->addBackend($groupBackend);
	117	+ $groupBackendRegisteredEvent = new GroupBackendRegistered($groupBackend, $groupPluginManager);
	118	+ $dispatcher->dispatchTyped($groupBackendRegisteredEvent);
	119	+ }
	120	+ });
	121	+
	122	+ $context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents']));
	123	+
	124	+ \OCP\Util::connectHook(
	125	+ '\OCA\Files_Sharing\API\Server2Server',
	126	+ 'preLoginNameUsedAsUserName',
	127	+ '\OCA\User_LDAP\Helper',
	128	+ 'loginName2UserName'
	129	+ );
	130	+ }
	131	+
	132	+ private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) {
	133	+ $dispatcher->addListener(
	134	+ 'OCA\\Files_External::loadAdditionalBackends',
	135	+ function () use ($appContainer) {
	136	+ $storagesBackendService = $appContainer->get(BackendService::class);
	137	+ $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) {
	138	+ return $appContainer->get(ExtStorageConfigHandler::class);
	139	+ });
	140	+ }
	141	+ );
	142	+ }
143	143	}

		@@ -31,21 +31,21 @@
		block discarded – undo
31	31
32	32	class UserBackendRegistered extends Event {
33	33
34		- /** @var IUserLDAP */
35		- private $backend;
36		- /** @var UserPluginManager */
37		- private $pluginManager;
38		-
39		- public function __construct(IUserLDAP $backend, UserPluginManager $pluginManager) {
40		- $this->backend = $backend;
41		- $this->pluginManager = $pluginManager;
42		- }
43		-
44		- public function getBackend(): IUserLDAP {
45		- return $this->backend;
46		- }
47		-
48		- public function getPluginManager(): UserPluginManager {
49		- return $this->pluginManager;
50		- }
	34	+ /** @var IUserLDAP */
	35	+ private $backend;
	36	+ /** @var UserPluginManager */
	37	+ private $pluginManager;
	38	+
	39	+ public function __construct(IUserLDAP $backend, UserPluginManager $pluginManager) {
	40	+ $this->backend = $backend;
	41	+ $this->pluginManager = $pluginManager;
	42	+ }
	43	+
	44	+ public function getBackend(): IUserLDAP {
	45	+ return $this->backend;
	46	+ }
	47	+
	48	+ public function getPluginManager(): UserPluginManager {
	49	+ return $this->pluginManager;
	50	+ }
51	51	}

		@@ -31,21 +31,21 @@
		block discarded – undo
31	31
32	32	class GroupBackendRegistered extends Event {
33	33
34		- /** @var GroupPluginManager */
35		- private $pluginManager;
36		- /** @var IGroupLDAP */
37		- private $backend;
38		-
39		- public function __construct(IGroupLDAP $backend, GroupPluginManager $pluginManager) {
40		- $this->pluginManager = $pluginManager;
41		- $this->backend = $backend;
42		- }
43		-
44		- public function getBackend(): IGroupLDAP {
45		- return $this->backend;
46		- }
47		-
48		- public function getPluginManager(): GroupPluginManager {
49		- return $this->pluginManager;
50		- }
	34	+ /** @var GroupPluginManager */
	35	+ private $pluginManager;
	36	+ /** @var IGroupLDAP */
	37	+ private $backend;
	38	+
	39	+ public function __construct(IGroupLDAP $backend, GroupPluginManager $pluginManager) {
	40	+ $this->pluginManager = $pluginManager;
	41	+ $this->backend = $backend;
	42	+ }
	43	+
	44	+ public function getBackend(): IGroupLDAP {
	45	+ return $this->backend;
	46	+ }
	47	+
	48	+ public function getPluginManager(): GroupPluginManager {
	49	+ return $this->pluginManager;
	50	+ }
51	51	}

nextcloud / server

Push — master ( 7d550e...6e8e34 )

Status

Category

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

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

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