Inspection of "Verify personal data" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3869)

by Björn

created 2017-04-28 16:06 UTC

Status

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

@@ -35,109 +35,109 @@
 block discarded – undo
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IClientService */
-	private $clientService;
-	/** @var Signer */
-	private $signer;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com';
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IClientService */
+    private $clientService;
+    /** @var Signer */
+    private $signer;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string URL point to lookup server */
+    private $lookupServer = 'https://lookup.nextcloud.com';
 
-	/**
-	 * @param AccountManager $accountManager
-	 * @param IClientService $clientService
-	 * @param Signer $signer
-	 * @param IJobList $jobList
-	 * @param string $lookupServer if nothing is given we use the default lookup server
-	 */
-	public function __construct(AccountManager $accountManager,
-								IClientService $clientService,
-								Signer $signer,
-								IJobList $jobList,
-								$lookupServer = '') {
-		$this->accountManager = $accountManager;
-		$this->clientService = $clientService;
-		$this->signer = $signer;
-		$this->jobList = $jobList;
-		if ($lookupServer !== '') {
-			$this->lookupServer = $lookupServer;
-		}
-		$this->lookupServer = rtrim($this->lookupServer, '/');
-		$this->lookupServer .= '/users';
-	}
+    /**
+     * @param AccountManager $accountManager
+     * @param IClientService $clientService
+     * @param Signer $signer
+     * @param IJobList $jobList
+     * @param string $lookupServer if nothing is given we use the default lookup server
+     */
+    public function __construct(AccountManager $accountManager,
+                                IClientService $clientService,
+                                Signer $signer,
+                                IJobList $jobList,
+                                $lookupServer = '') {
+        $this->accountManager = $accountManager;
+        $this->clientService = $clientService;
+        $this->signer = $signer;
+        $this->jobList = $jobList;
+        if ($lookupServer !== '') {
+            $this->lookupServer = $lookupServer;
+        }
+        $this->lookupServer = rtrim($this->lookupServer, '/');
+        $this->lookupServer .= '/users';
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function userUpdated(IUser $user) {
-		$userData = $this->accountManager->getUser($user);
-		$publicData = [];
+    /**
+     * @param IUser $user
+     */
+    public function userUpdated(IUser $user) {
+        $userData = $this->accountManager->getUser($user);
+        $publicData = [];
 
-		foreach ($userData as $key => $data) {
-			if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
-				$publicData[$key] = $data;
-			}
-		}
+        foreach ($userData as $key => $data) {
+            if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
+                $publicData[$key] = $data;
+            }
+        }
 
-		$this->sendToLookupServer($user, $publicData);
-	}
+        $this->sendToLookupServer($user, $publicData);
+    }
 
-	/**
-	 * send public user data to the lookup server
-	 *
-	 * @param IUser $user
-	 * @param array $publicData
-	 */
-	protected function sendToLookupServer(IUser $user, array $publicData) {
+    /**
+     * send public user data to the lookup server
+     *
+     * @param IUser $user
+     * @param array $publicData
+     */
+    protected function sendToLookupServer(IUser $user, array $publicData) {
 
-		$dataArray = ['federationId' => $user->getCloudId()];
+        $dataArray = ['federationId' => $user->getCloudId()];
 
-		if (!empty($publicData)) {
-			$dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
-			$dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
-			$dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
-			$dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
-			$dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
-			$dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
-			$dataArray['twitter_signature'] = isset($publicData[AccountManager::PROPERTY_TWITTER]['signature']) ? $publicData[AccountManager::PROPERTY_TWITTER]['signature'] : '';
-			$dataArray['website_signature'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]['signature']) ? $publicData[AccountManager::PROPERTY_WEBSITE]['signature'] : '';
-			$dataArray['verificationStatus'] =
-				[
-					AccountManager::PROPERTY_WEBSITE => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['verified'] : '',
-					AccountManager::PROPERTY_TWITTER => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['verified'] : '',
-				];
-		}
+        if (!empty($publicData)) {
+            $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
+            $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
+            $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
+            $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
+            $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
+            $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
+            $dataArray['twitter_signature'] = isset($publicData[AccountManager::PROPERTY_TWITTER]['signature']) ? $publicData[AccountManager::PROPERTY_TWITTER]['signature'] : '';
+            $dataArray['website_signature'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]['signature']) ? $publicData[AccountManager::PROPERTY_WEBSITE]['signature'] : '';
+            $dataArray['verificationStatus'] =
+                [
+                    AccountManager::PROPERTY_WEBSITE => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['verified'] : '',
+                    AccountManager::PROPERTY_TWITTER => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['verified'] : '',
+                ];
+        }
 
-		$dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
-		$httpClient = $this->clientService->newClient();
-		try {
-			if (empty($publicData)) {
-				$httpClient->delete($this->lookupServer,
-					[
-						'body' => json_encode($dataArray),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			} else {
-				$httpClient->post($this->lookupServer,
-					[
-						'body' => json_encode($dataArray),
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-			}
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $dataArray,
-					'retryNo' => 0,
-				]
-			);
-		}
-	}
+        $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
+        $httpClient = $this->clientService->newClient();
+        try {
+            if (empty($publicData)) {
+                $httpClient->delete($this->lookupServer,
+                    [
+                        'body' => json_encode($dataArray),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            } else {
+                $httpClient->post($this->lookupServer,
+                    [
+                        'body' => json_encode($dataArray),
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+            }
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $dataArray,
+                    'retryNo' => 0,
+                ]
+            );
+        }
+    }
 }

Please login to merge, or discard this patch.

		@@ -35,109 +35,109 @@
		block discarded – undo
35	35	* @package OCA\LookupServerConnector
36	36	*/
37	37	class UpdateLookupServer {
38		- /** @var AccountManager */
39		- private $accountManager;
40		- /** @var IClientService */
41		- private $clientService;
42		- /** @var Signer */
43		- private $signer;
44		- /** @var IJobList */
45		- private $jobList;
46		- /** @var string URL point to lookup server */
47		- private $lookupServer = 'https://lookup.nextcloud.com';
	38	+ /** @var AccountManager */
	39	+ private $accountManager;
	40	+ /** @var IClientService */
	41	+ private $clientService;
	42	+ /** @var Signer */
	43	+ private $signer;
	44	+ /** @var IJobList */
	45	+ private $jobList;
	46	+ /** @var string URL point to lookup server */
	47	+ private $lookupServer = 'https://lookup.nextcloud.com';
48	48
49		- /**
50		- * @param AccountManager $accountManager
51		- * @param IClientService $clientService
52		- * @param Signer $signer
53		- * @param IJobList $jobList
54		- * @param string $lookupServer if nothing is given we use the default lookup server
55		- */
56		- public function __construct(AccountManager $accountManager,
57		- IClientService $clientService,
58		- Signer $signer,
59		- IJobList $jobList,
60		- $lookupServer = '') {
61		- $this->accountManager = $accountManager;
62		- $this->clientService = $clientService;
63		- $this->signer = $signer;
64		- $this->jobList = $jobList;
65		- if ($lookupServer !== '') {
66		- $this->lookupServer = $lookupServer;
67		- }
68		- $this->lookupServer = rtrim($this->lookupServer, '/');
69		- $this->lookupServer .= '/users';
70		- }
	49	+ /**
	50	+ * @param AccountManager $accountManager
	51	+ * @param IClientService $clientService
	52	+ * @param Signer $signer
	53	+ * @param IJobList $jobList
	54	+ * @param string $lookupServer if nothing is given we use the default lookup server
	55	+ */
	56	+ public function __construct(AccountManager $accountManager,
	57	+ IClientService $clientService,
	58	+ Signer $signer,
	59	+ IJobList $jobList,
	60	+ $lookupServer = '') {
	61	+ $this->accountManager = $accountManager;
	62	+ $this->clientService = $clientService;
	63	+ $this->signer = $signer;
	64	+ $this->jobList = $jobList;
	65	+ if ($lookupServer !== '') {
	66	+ $this->lookupServer = $lookupServer;
	67	+ }
	68	+ $this->lookupServer = rtrim($this->lookupServer, '/');
	69	+ $this->lookupServer .= '/users';
	70	+ }
71	71
72		- /**
73		- * @param IUser $user
74		- */
75		- public function userUpdated(IUser $user) {
76		- $userData = $this->accountManager->getUser($user);
77		- $publicData = [];
	72	+ /**
	73	+ * @param IUser $user
	74	+ */
	75	+ public function userUpdated(IUser $user) {
	76	+ $userData = $this->accountManager->getUser($user);
	77	+ $publicData = [];
78	78
79		- foreach ($userData as $key => $data) {
80		- if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
81		- $publicData[$key] = $data;
82		- }
83		- }
	79	+ foreach ($userData as $key => $data) {
	80	+ if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
	81	+ $publicData[$key] = $data;
	82	+ }
	83	+ }
84	84
85		- $this->sendToLookupServer($user, $publicData);
86		- }
	85	+ $this->sendToLookupServer($user, $publicData);
	86	+ }
87	87
88		- /**
89		- * send public user data to the lookup server
90		- *
91		- * @param IUser $user
92		- * @param array $publicData
93		- */
94		- protected function sendToLookupServer(IUser $user, array $publicData) {
	88	+ /**
	89	+ * send public user data to the lookup server
	90	+ *
	91	+ * @param IUser $user
	92	+ * @param array $publicData
	93	+ */
	94	+ protected function sendToLookupServer(IUser $user, array $publicData) {
95	95
96		- $dataArray = ['federationId' => $user->getCloudId()];
	96	+ $dataArray = ['federationId' => $user->getCloudId()];
97	97
98		- if (!empty($publicData)) {
99		- $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
100		- $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
101		- $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
102		- $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
103		- $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
104		- $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
105		- $dataArray['twitter_signature'] = isset($publicData[AccountManager::PROPERTY_TWITTER]['signature']) ? $publicData[AccountManager::PROPERTY_TWITTER]['signature'] : '';
106		- $dataArray['website_signature'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]['signature']) ? $publicData[AccountManager::PROPERTY_WEBSITE]['signature'] : '';
107		- $dataArray['verificationStatus'] =
108		- [
109		- AccountManager::PROPERTY_WEBSITE => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['verified'] : '',
110		- AccountManager::PROPERTY_TWITTER => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['verified'] : '',
111		- ];
112		- }
	98	+ if (!empty($publicData)) {
	99	+ $dataArray['name'] = isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '';
	100	+ $dataArray['email'] = isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '';
	101	+ $dataArray['address'] = isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '';
	102	+ $dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
	103	+ $dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
	104	+ $dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
	105	+ $dataArray['twitter_signature'] = isset($publicData[AccountManager::PROPERTY_TWITTER]['signature']) ? $publicData[AccountManager::PROPERTY_TWITTER]['signature'] : '';
	106	+ $dataArray['website_signature'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]['signature']) ? $publicData[AccountManager::PROPERTY_WEBSITE]['signature'] : '';
	107	+ $dataArray['verificationStatus'] =
	108	+ [
	109	+ AccountManager::PROPERTY_WEBSITE => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['verified'] : '',
	110	+ AccountManager::PROPERTY_TWITTER => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['verified'] : '',
	111	+ ];
	112	+ }
113	113
114		- $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
115		- $httpClient = $this->clientService->newClient();
116		- try {
117		- if (empty($publicData)) {
118		- $httpClient->delete($this->lookupServer,
119		- [
120		- 'body' => json_encode($dataArray),
121		- 'timeout' => 10,
122		- 'connect_timeout' => 3,
123		- ]
124		- );
125		- } else {
126		- $httpClient->post($this->lookupServer,
127		- [
128		- 'body' => json_encode($dataArray),
129		- 'timeout' => 10,
130		- 'connect_timeout' => 3,
131		- ]
132		- );
133		- }
134		- } catch (\Exception $e) {
135		- $this->jobList->add(RetryJob::class,
136		- [
137		- 'dataArray' => $dataArray,
138		- 'retryNo' => 0,
139		- ]
140		- );
141		- }
142		- }
	114	+ $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
	115	+ $httpClient = $this->clientService->newClient();
	116	+ try {
	117	+ if (empty($publicData)) {
	118	+ $httpClient->delete($this->lookupServer,
	119	+ [
	120	+ 'body' => json_encode($dataArray),
	121	+ 'timeout' => 10,
	122	+ 'connect_timeout' => 3,
	123	+ ]
	124	+ );
	125	+ } else {
	126	+ $httpClient->post($this->lookupServer,
	127	+ [
	128	+ 'body' => json_encode($dataArray),
	129	+ 'timeout' => 10,
	130	+ 'connect_timeout' => 3,
	131	+ ]
	132	+ );
	133	+ }
	134	+ } catch (\Exception $e) {
	135	+ $this->jobList->add(RetryJob::class,
	136	+ [
	137	+ 'dataArray' => $dataArray,
	138	+ 'retryNo' => 0,
	139	+ ]
	140	+ );
	141	+ }
	142	+ }
143	143	}

nextcloud / server

Pull Request — master (#3869)

Status

Category

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