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

Completed

Push — master ( 4d101c...278637 )

by Lukas

created 2017-05-08 10:29 UTC

Status

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

@@ -30,39 +30,39 @@
 block discarded – undo
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
 if(count($configPrefixes) > 0) {
-	$ldapWrapper = new OCA\User_LDAP\LDAP();
-	$ocConfig = \OC::$server->getConfig();
-	$notificationManager = \OC::$server->getNotificationManager();
-	$notificationManager->registerNotifier(function() {
-		return new \OCA\User_LDAP\Notification\Notifier(
-			\OC::$server->getL10NFactory()
-		);
-	}, function() {
-		$l = \OC::$server->getL10N('user_ldap');
-		return [
-			'id' => 'user_ldap',
-			'name' => $l->t('LDAP user and group backend'),
-		];
-	});
+    $ldapWrapper = new OCA\User_LDAP\LDAP();
+    $ocConfig = \OC::$server->getConfig();
+    $notificationManager = \OC::$server->getNotificationManager();
+    $notificationManager->registerNotifier(function() {
+        return new \OCA\User_LDAP\Notification\Notifier(
+            \OC::$server->getL10NFactory()
+        );
+    }, function() {
+        $l = \OC::$server->getL10N('user_ldap');
+        return [
+            'id' => 'user_ldap',
+            'name' => $l->t('LDAP user and group backend'),
+        ];
+    });
 
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
-		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
-	);
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
-	// register user backend
-	OC_User::useBackend($userBackend);
-	\OC::$server->getGroupManager()->addBackend($groupBackend);
+    $userBackend  = new OCA\User_LDAP\User_Proxy(
+        $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
+    );
+    $groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
+    // register user backend
+    OC_User::useBackend($userBackend);
+    \OC::$server->getGroupManager()->addBackend($groupBackend);
 }
 
 \OCP\Util::connectHook(
-	'\OCA\Files_Sharing\API\Server2Server',
-	'preLoginNameUsedAsUserName',
-	'\OCA\User_LDAP\Helper',
-	'loginName2UserName'
+    '\OCA\Files_Sharing\API\Server2Server',
+    'preLoginNameUsedAsUserName',
+    '\OCA\User_LDAP\Helper',
+    'loginName2UserName'
 );
 
 if(OCP\App::isEnabled('user_webdavauth')) {
-	OCP\Util::writeLog('user_ldap',
-		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
-		OCP\Util::WARN);
+    OCP\Util::writeLog('user_ldap',
+        'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
+        OCP\Util::WARN);
 }

Please login to merge, or discard this patch.

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

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
-if(count($configPrefixes) > 0) {
+if (count($configPrefixes) > 0) {
 	$ldapWrapper = new OCA\User_LDAP\LDAP();
 	$ocConfig = \OC::$server->getConfig();
 	$notificationManager = \OC::$server->getNotificationManager();
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
 		];
 	});
 
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
+	$userBackend = new OCA\User_LDAP\User_Proxy(
 		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
 	);
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
+	$groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
 	// register user backend
 	OC_User::useBackend($userBackend);
 	\OC::$server->getGroupManager()->addBackend($groupBackend);
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 	'loginName2UserName'
 );
 
-if(OCP\App::isEnabled('user_webdavauth')) {
+if (OCP\App::isEnabled('user_webdavauth')) {
 	OCP\Util::writeLog('user_ldap',
 		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
 		OCP\Util::WARN);

Please login to merge, or discard this patch.

		@@ -30,39 +30,39 @@
		block discarded – undo
30	30	$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
31	31	$configPrefixes = $helper->getServerConfigurationPrefixes(true);
32	32	if(count($configPrefixes) > 0) {
33		- $ldapWrapper = new OCA\User_LDAP\LDAP();
34		- $ocConfig = \OC::$server->getConfig();
35		- $notificationManager = \OC::$server->getNotificationManager();
36		- $notificationManager->registerNotifier(function() {
37		- return new \OCA\User_LDAP\Notification\Notifier(
38		- \OC::$server->getL10NFactory()
39		- );
40		- }, function() {
41		- $l = \OC::$server->getL10N('user_ldap');
42		- return [
43		- 'id' => 'user_ldap',
44		- 'name' => $l->t('LDAP user and group backend'),
45		- ];
46		- });
	33	+ $ldapWrapper = new OCA\User_LDAP\LDAP();
	34	+ $ocConfig = \OC::$server->getConfig();
	35	+ $notificationManager = \OC::$server->getNotificationManager();
	36	+ $notificationManager->registerNotifier(function() {
	37	+ return new \OCA\User_LDAP\Notification\Notifier(
	38	+ \OC::$server->getL10NFactory()
	39	+ );
	40	+ }, function() {
	41	+ $l = \OC::$server->getL10N('user_ldap');
	42	+ return [
	43	+ 'id' => 'user_ldap',
	44	+ 'name' => $l->t('LDAP user and group backend'),
	45	+ ];
	46	+ });
47	47
48		- $userBackend = new OCA\User_LDAP\User_Proxy(
49		- $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
50		- );
51		- $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
52		- // register user backend
53		- OC_User::useBackend($userBackend);
54		- \OC::$server->getGroupManager()->addBackend($groupBackend);
	48	+ $userBackend = new OCA\User_LDAP\User_Proxy(
	49	+ $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
	50	+ );
	51	+ $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
	52	+ // register user backend
	53	+ OC_User::useBackend($userBackend);
	54	+ \OC::$server->getGroupManager()->addBackend($groupBackend);
55	55	}
56	56
57	57	\OCP\Util::connectHook(
58		- '\OCA\Files_Sharing\API\Server2Server',
59		- 'preLoginNameUsedAsUserName',
60		- '\OCA\User_LDAP\Helper',
61		- 'loginName2UserName'
	58	+ '\OCA\Files_Sharing\API\Server2Server',
	59	+ 'preLoginNameUsedAsUserName',
	60	+ '\OCA\User_LDAP\Helper',
	61	+ 'loginName2UserName'
62	62	);
63	63
64	64	if(OCP\App::isEnabled('user_webdavauth')) {
65		- OCP\Util::writeLog('user_ldap',
66		- 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
67		- OCP\Util::WARN);
	65	+ OCP\Util::writeLog('user_ldap',
	66	+ 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
	67	+ OCP\Util::WARN);
68	68	}

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29
30	30	$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
31	31	$configPrefixes = $helper->getServerConfigurationPrefixes(true);
32		-if(count($configPrefixes) > 0) {
	32	+if (count($configPrefixes) > 0) {
33	33	$ldapWrapper = new OCA\User_LDAP\LDAP();
34	34	$ocConfig = \OC::$server->getConfig();
35	35	$notificationManager = \OC::$server->getNotificationManager();
		@@ -45,10 +45,10 @@ discard block
		block discarded – undo
45	45	];
46	46	});
47	47
48		- $userBackend = new OCA\User_LDAP\User_Proxy(
	48	+ $userBackend = new OCA\User_LDAP\User_Proxy(
49	49	$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager
50	50	);
51		- $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
	51	+ $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
52	52	// register user backend
53	53	OC_User::useBackend($userBackend);
54	54	\OC::$server->getGroupManager()->addBackend($groupBackend);
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	'loginName2UserName'
62	62	);
63	63
64		-if(OCP\App::isEnabled('user_webdavauth')) {
	64	+if (OCP\App::isEnabled('user_webdavauth')) {
65	65	OCP\Util::writeLog('user_ldap',
66	66	'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
67	67	OCP\Util::WARN);

nextcloud / server

Push — master ( 4d101c...278637 )

Status

Category

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

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