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

Passed

Push — master ( 0ae68c...0a5764 )

by Roeland

created 2019-02-25 09:23 UTC

Status

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

@@ -36,87 +36,87 @@
 block discarded – undo
 
 class LookupPlugin implements ISearchPlugin {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var string remote part of the current user's cloud id */
-	private $currentUserRemote;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var ILogger */
-	private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var string remote part of the current user's cloud id */
+    private $currentUserRemote;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(IConfig $config,
-								IClientService $clientService,
-								IUserSession $userSession,
-								ICloudIdManager $cloudIdManager,
-								ILogger $logger) {
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
-		$currentUserCloudId = $userSession->getUser()->getCloudId();
-		$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
-		$this->logger = $logger;
-	}
+    public function __construct(IConfig $config,
+                                IClientService $clientService,
+                                IUserSession $userSession,
+                                ICloudIdManager $cloudIdManager,
+                                ILogger $logger) {
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->cloudIdManager = $cloudIdManager;
+        $currentUserCloudId = $userSession->getUser()->getCloudId();
+        $this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
+        $this->logger = $logger;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
-		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
-		$hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
+        $isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
+        $hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
 
-		// if case of Global Scale we always search the lookup server
-		if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
-			return false;
-		}
+        // if case of Global Scale we always search the lookup server
+        if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
+            return false;
+        }
 
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		if(empty($lookupServerUrl)) {
-			return false;
-		}
-		$lookupServerUrl = rtrim($lookupServerUrl, '/');
-		$result = [];
+        $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        if(empty($lookupServerUrl)) {
+            return false;
+        }
+        $lookupServerUrl = rtrim($lookupServerUrl, '/');
+        $result = [];
 
-		try {
-			$client = $this->clientService->newClient();
-			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
+        try {
+            $client = $this->clientService->newClient();
+            $response = $client->get(
+                $lookupServerUrl . '/users?search=' . urlencode($search),
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
 
-			$body = json_decode($response->getBody(), true);
+            $body = json_decode($response->getBody(), true);
 
-			foreach ($body as $lookup) {
-				try {
-					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
-				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"');
-					$this->logger->error($e->getMessage());
-					continue;
-				}
-				if ($this->currentUserRemote === $remote) {
-					continue;
-				}
-				$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
-				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
-				$result[] = [
-					'label' => $label,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_REMOTE,
-						'shareWith' => $lookup['federationId'],
-					],
-					'extra' => $lookup,
-				];
-			}
-		} catch (\Exception $e) {
-		}
+            foreach ($body as $lookup) {
+                try {
+                    $remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
+                } catch (\Exception $e) {
+                    $this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"');
+                    $this->logger->error($e->getMessage());
+                    continue;
+                }
+                if ($this->currentUserRemote === $remote) {
+                    continue;
+                }
+                $name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
+                $label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
+                $result[] = [
+                    'label' => $label,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_REMOTE,
+                        'shareWith' => $lookup['federationId'],
+                    ],
+                    'extra' => $lookup,
+                ];
+            }
+        } catch (\Exception $e) {
+        }
 
-		$type = new SearchResultType('lookup');
-		$searchResult->addResultSet($type, $result, []);
+        $type = new SearchResultType('lookup');
+        $searchResult->addResultSet($type, $result, []);
 
-		return false;
-	}
+        return false;
+    }
 }

Please login to merge, or discard this patch.

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

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 	public function search($search, $limit, $offset, ISearchResult $searchResult) {
 		$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
 		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
-		$hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
+		$hasInternetConnection = (bool) $this->config->getSystemValue('has_internet_connection', true);
 
 		// if case of Global Scale we always search the lookup server
 		if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		}
 
 		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		if(empty($lookupServerUrl)) {
+		if (empty($lookupServerUrl)) {
 			return false;
 		}
 		$lookupServerUrl = rtrim($lookupServerUrl, '/');
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 		try {
 			$client = $this->clientService->newClient();
 			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
+				$lookupServerUrl.'/users?search='.urlencode($search),
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 				try {
 					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
 				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"');
+					$this->logger->error('Can not parse federated cloud ID "'.$lookup['federationId'].'"');
 					$this->logger->error($e->getMessage());
 					continue;
 				}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 					continue;
 				}
 				$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
-				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
+				$label = empty($name) ? $lookup['federationId'] : $name.' ('.$lookup['federationId'].')';
 				$result[] = [
 					'label' => $label,
 					'value' => [

Please login to merge, or discard this patch.

		@@ -36,87 +36,87 @@
		block discarded – undo
36	36
37	37	class LookupPlugin implements ISearchPlugin {
38	38
39		- /** @var IConfig */
40		- private $config;
41		- /** @var IClientService */
42		- private $clientService;
43		- /** @var string remote part of the current user's cloud id */
44		- private $currentUserRemote;
45		- /** @var ICloudIdManager */
46		- private $cloudIdManager;
47		- /** @var ILogger */
48		- private $logger;
	39	+ /** @var IConfig */
	40	+ private $config;
	41	+ /** @var IClientService */
	42	+ private $clientService;
	43	+ /** @var string remote part of the current user's cloud id */
	44	+ private $currentUserRemote;
	45	+ /** @var ICloudIdManager */
	46	+ private $cloudIdManager;
	47	+ /** @var ILogger */
	48	+ private $logger;
49	49
50		- public function __construct(IConfig $config,
51		- IClientService $clientService,
52		- IUserSession $userSession,
53		- ICloudIdManager $cloudIdManager,
54		- ILogger $logger) {
55		- $this->config = $config;
56		- $this->clientService = $clientService;
57		- $this->cloudIdManager = $cloudIdManager;
58		- $currentUserCloudId = $userSession->getUser()->getCloudId();
59		- $this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
60		- $this->logger = $logger;
61		- }
	50	+ public function __construct(IConfig $config,
	51	+ IClientService $clientService,
	52	+ IUserSession $userSession,
	53	+ ICloudIdManager $cloudIdManager,
	54	+ ILogger $logger) {
	55	+ $this->config = $config;
	56	+ $this->clientService = $clientService;
	57	+ $this->cloudIdManager = $cloudIdManager;
	58	+ $currentUserCloudId = $userSession->getUser()->getCloudId();
	59	+ $this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
	60	+ $this->logger = $logger;
	61	+ }
62	62
63		- public function search($search, $limit, $offset, ISearchResult $searchResult) {
64		- $isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
65		- $isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
66		- $hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
	63	+ public function search($search, $limit, $offset, ISearchResult $searchResult) {
	64	+ $isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
	65	+ $isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
	66	+ $hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
67	67
68		- // if case of Global Scale we always search the lookup server
69		- if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled \|\| !$hasInternetConnection)) {
70		- return false;
71		- }
	68	+ // if case of Global Scale we always search the lookup server
	69	+ if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled \|\| !$hasInternetConnection)) {
	70	+ return false;
	71	+ }
72	72
73		- $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
74		- if(empty($lookupServerUrl)) {
75		- return false;
76		- }
77		- $lookupServerUrl = rtrim($lookupServerUrl, '/');
78		- $result = [];
	73	+ $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
	74	+ if(empty($lookupServerUrl)) {
	75	+ return false;
	76	+ }
	77	+ $lookupServerUrl = rtrim($lookupServerUrl, '/');
	78	+ $result = [];
79	79
80		- try {
81		- $client = $this->clientService->newClient();
82		- $response = $client->get(
83		- $lookupServerUrl . '/users?search=' . urlencode($search),
84		- [
85		- 'timeout' => 10,
86		- 'connect_timeout' => 3,
87		- ]
88		- );
	80	+ try {
	81	+ $client = $this->clientService->newClient();
	82	+ $response = $client->get(
	83	+ $lookupServerUrl . '/users?search=' . urlencode($search),
	84	+ [
	85	+ 'timeout' => 10,
	86	+ 'connect_timeout' => 3,
	87	+ ]
	88	+ );
89	89
90		- $body = json_decode($response->getBody(), true);
	90	+ $body = json_decode($response->getBody(), true);
91	91
92		- foreach ($body as $lookup) {
93		- try {
94		- $remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
95		- } catch (\Exception $e) {
96		- $this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"');
97		- $this->logger->error($e->getMessage());
98		- continue;
99		- }
100		- if ($this->currentUserRemote === $remote) {
101		- continue;
102		- }
103		- $name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
104		- $label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
105		- $result[] = [
106		- 'label' => $label,
107		- 'value' => [
108		- 'shareType' => Share::SHARE_TYPE_REMOTE,
109		- 'shareWith' => $lookup['federationId'],
110		- ],
111		- 'extra' => $lookup,
112		- ];
113		- }
114		- } catch (\Exception $e) {
115		- }
	92	+ foreach ($body as $lookup) {
	93	+ try {
	94	+ $remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
	95	+ } catch (\Exception $e) {
	96	+ $this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"');
	97	+ $this->logger->error($e->getMessage());
	98	+ continue;
	99	+ }
	100	+ if ($this->currentUserRemote === $remote) {
	101	+ continue;
	102	+ }
	103	+ $name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
	104	+ $label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
	105	+ $result[] = [
	106	+ 'label' => $label,
	107	+ 'value' => [
	108	+ 'shareType' => Share::SHARE_TYPE_REMOTE,
	109	+ 'shareWith' => $lookup['federationId'],
	110	+ ],
	111	+ 'extra' => $lookup,
	112	+ ];
	113	+ }
	114	+ } catch (\Exception $e) {
	115	+ }
116	116
117		- $type = new SearchResultType('lookup');
118		- $searchResult->addResultSet($type, $result, []);
	117	+ $type = new SearchResultType('lookup');
	118	+ $searchResult->addResultSet($type, $result, []);
119	119
120		- return false;
121		- }
	120	+ return false;
	121	+ }
122	122	}

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	public function search($search, $limit, $offset, ISearchResult $searchResult) {
64	64	$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
65	65	$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
66		- $hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
	66	+ $hasInternetConnection = (bool) $this->config->getSystemValue('has_internet_connection', true);
67	67
68	68	// if case of Global Scale we always search the lookup server
69	69	if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled \|\| !$hasInternetConnection)) {
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	}
72	72
73	73	$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
74		- if(empty($lookupServerUrl)) {
	74	+ if (empty($lookupServerUrl)) {
75	75	return false;
76	76	}
77	77	$lookupServerUrl = rtrim($lookupServerUrl, '/');
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	try {
81	81	$client = $this->clientService->newClient();
82	82	$response = $client->get(
83		- $lookupServerUrl . '/users?search=' . urlencode($search),
	83	+ $lookupServerUrl.'/users?search='.urlencode($search),
84	84	[
85	85	'timeout' => 10,
86	86	'connect_timeout' => 3,
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	try {
94	94	$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
95	95	} catch (\Exception $e) {
96		- $this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"');
	96	+ $this->logger->error('Can not parse federated cloud ID "'.$lookup['federationId'].'"');
97	97	$this->logger->error($e->getMessage());
98	98	continue;
99	99	}
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	continue;
102	102	}
103	103	$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
104		- $label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
	104	+ $label = empty($name) ? $lookup['federationId'] : $name.' ('.$lookup['federationId'].')';
105	105	$result[] = [
106	106	'label' => $label,
107	107	'value' => [

nextcloud / server

Push — master ( 0ae68c...0a5764 )

Status

Category

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

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