Inspection of "create correct VCard and return correct error code..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3825)

by Björn

created 2017-03-13 13:59 UTC

Status

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

@@ -34,45 +34,45 @@
 block discarded – undo
 
 class AddServerMiddleware extends Middleware {
 
-	/** @var  string */
-	protected $appName;
+    /** @var  string */
+    protected $appName;
 
-	/** @var  IL10N */
-	protected $l;
+    /** @var  IL10N */
+    protected $l;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	public function __construct($appName, IL10N $l, ILogger $logger) {
-		$this->appName = $appName;
-		$this->l = $l;
-		$this->logger = $logger;
-	}
+    public function __construct($appName, IL10N $l, ILogger $logger) {
+        $this->appName = $appName;
+        $this->l = $l;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log error message and return a response which can be displayed to the user
-	 *
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return JSONResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (($controller instanceof SettingsController) === false) {
-			throw $exception;
-		}
-		$this->logger->error($exception->getMessage(), ['app' => $this->appName]);
-		if ($exception instanceof HintException) {
-			$message = $exception->getHint();
-		} else {
-			$message = $exception->getMessage();
-		}
+    /**
+     * Log error message and return a response which can be displayed to the user
+     *
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return JSONResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (($controller instanceof SettingsController) === false) {
+            throw $exception;
+        }
+        $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
+        if ($exception instanceof HintException) {
+            $message = $exception->getHint();
+        } else {
+            $message = $exception->getMessage();
+        }
 
-		return new JSONResponse(
-			['message' => $message],
-			Http::STATUS_BAD_REQUEST
-		);
+        return new JSONResponse(
+            ['message' => $message],
+            Http::STATUS_BAD_REQUEST
+        );
 
-	}
+    }
 
 }

Please login to merge, or discard this patch.

apps/dav/lib/CardDAV/Converter.php 1 patch

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

@@ -30,117 +30,117 @@
 block discarded – undo
 
 class Converter {
 
-	/** @var AccountManager */
-	private $accountManager;
-
-	/**
-	 * Converter constructor.
-	 *
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(AccountManager $accountManager) {
-		$this->accountManager = $accountManager;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return VCard|null
-	 */
-	public function createCardFromUser(IUser $user) {
-
-		$userData = $this->accountManager->getUser($user);
-
-		$uid = $user->getUID();
-		$cloudId = $user->getCloudId();
-		$image = $this->getAvatarImage($user);
-
-		$vCard = new VCard();
-		$vCard->VERSION = '3.0';
-		$vCard->UID = $uid;
-
-		$publish = false;
-
-		foreach ($userData as $property => $value) {
-
-			$shareWithTrustedServers =
-				$value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
-				$value['scope'] === AccountManager::VISIBILITY_PUBLIC;
-
-			if ($shareWithTrustedServers && $value['value'] !== '') {
-				$publish = true;
-				switch ($property) {
-					case AccountManager::PROPERTY_DISPLAYNAME:
-						$vCard->add(new Text($vCard, 'FN', $value['value']));
-						$vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
-						break;
-					case AccountManager::PROPERTY_AVATAR:
-						if ($image !== null) {
-							$vCard->add('PHOTO', 'data:'.$image->mimeType().';base64,' . base64_encode($image->data()));
-						}
-						break;
-					case AccountManager::PROPERTY_EMAIL:
-						$vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_WEBSITE:
-						$vCard->add(new Text($vCard, 'URL', $value['value']));
-						break;
-					case AccountManager::PROPERTY_PHONE:
-						$vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_ADDRESS:
-						$vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
-						break;
-					case AccountManager::PROPERTY_TWITTER:
-						$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
-						break;
-				}
-			}
-		}
-
-		if ($publish && !empty($cloudId)) {
-			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
-			$vCard->validate();
-			return $vCard;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param string $fullName
-	 * @return string[]
-	 */
-	public function splitFullName($fullName) {
-		// Very basic western style parsing. I'm not gonna implement
-		// https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
-
-		$elements = explode(' ', $fullName);
-		$result = ['', '', '', '', ''];
-		if (count($elements) > 2) {
-			$result[0] = implode(' ', array_slice($elements, count($elements)-1));
-			$result[1] = $elements[0];
-			$result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
-		} elseif (count($elements) === 2) {
-			$result[0] = $elements[1];
-			$result[1] = $elements[0];
-		} else {
-			$result[0] = $elements[0];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return null|IImage
-	 */
-	private function getAvatarImage(IUser $user) {
-		try {
-			$image = $user->getAvatarImage(-1);
-			return $image;
-		} catch (\Exception $ex) {
-			return null;
-		}
-	}
+    /** @var AccountManager */
+    private $accountManager;
+
+    /**
+     * Converter constructor.
+     *
+     * @param AccountManager $accountManager
+     */
+    public function __construct(AccountManager $accountManager) {
+        $this->accountManager = $accountManager;
+    }
+
+    /**
+     * @param IUser $user
+     * @return VCard|null
+     */
+    public function createCardFromUser(IUser $user) {
+
+        $userData = $this->accountManager->getUser($user);
+
+        $uid = $user->getUID();
+        $cloudId = $user->getCloudId();
+        $image = $this->getAvatarImage($user);
+
+        $vCard = new VCard();
+        $vCard->VERSION = '3.0';
+        $vCard->UID = $uid;
+
+        $publish = false;
+
+        foreach ($userData as $property => $value) {
+
+            $shareWithTrustedServers =
+                $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
+                $value['scope'] === AccountManager::VISIBILITY_PUBLIC;
+
+            if ($shareWithTrustedServers && $value['value'] !== '') {
+                $publish = true;
+                switch ($property) {
+                    case AccountManager::PROPERTY_DISPLAYNAME:
+                        $vCard->add(new Text($vCard, 'FN', $value['value']));
+                        $vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
+                        break;
+                    case AccountManager::PROPERTY_AVATAR:
+                        if ($image !== null) {
+                            $vCard->add('PHOTO', 'data:'.$image->mimeType().';base64,' . base64_encode($image->data()));
+                        }
+                        break;
+                    case AccountManager::PROPERTY_EMAIL:
+                        $vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_WEBSITE:
+                        $vCard->add(new Text($vCard, 'URL', $value['value']));
+                        break;
+                    case AccountManager::PROPERTY_PHONE:
+                        $vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_ADDRESS:
+                        $vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
+                        break;
+                    case AccountManager::PROPERTY_TWITTER:
+                        $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
+                        break;
+                }
+            }
+        }
+
+        if ($publish && !empty($cloudId)) {
+            $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+            $vCard->validate();
+            return $vCard;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $fullName
+     * @return string[]
+     */
+    public function splitFullName($fullName) {
+        // Very basic western style parsing. I'm not gonna implement
+        // https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
+
+        $elements = explode(' ', $fullName);
+        $result = ['', '', '', '', ''];
+        if (count($elements) > 2) {
+            $result[0] = implode(' ', array_slice($elements, count($elements)-1));
+            $result[1] = $elements[0];
+            $result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
+        } elseif (count($elements) === 2) {
+            $result[0] = $elements[1];
+            $result[1] = $elements[0];
+        } else {
+            $result[0] = $elements[0];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param IUser $user
+     * @return null|IImage
+     */
+    private function getAvatarImage(IUser $user) {
+        try {
+            $image = $user->getAvatarImage(-1);
+            return $image;
+        } catch (\Exception $ex) {
+            return null;
+        }
+    }
 
 }

Please login to merge, or discard this patch.

		@@ -34,45 +34,45 @@
		block discarded – undo
34	34
35	35	class AddServerMiddleware extends Middleware {
36	36
37		- /** @var string */
38		- protected $appName;
	37	+ /** @var string */
	38	+ protected $appName;
39	39
40		- /** @var IL10N */
41		- protected $l;
	40	+ /** @var IL10N */
	41	+ protected $l;
42	42
43		- /** @var ILogger */
44		- protected $logger;
	43	+ /** @var ILogger */
	44	+ protected $logger;
45	45
46		- public function __construct($appName, IL10N $l, ILogger $logger) {
47		- $this->appName = $appName;
48		- $this->l = $l;
49		- $this->logger = $logger;
50		- }
	46	+ public function __construct($appName, IL10N $l, ILogger $logger) {
	47	+ $this->appName = $appName;
	48	+ $this->l = $l;
	49	+ $this->logger = $logger;
	50	+ }
51	51
52		- /**
53		- * Log error message and return a response which can be displayed to the user
54		- *
55		- * @param \OCP\AppFramework\Controller $controller
56		- * @param string $methodName
57		- * @param \Exception $exception
58		- * @return JSONResponse
59		- */
60		- public function afterException($controller, $methodName, \Exception $exception) {
61		- if (($controller instanceof SettingsController) === false) {
62		- throw $exception;
63		- }
64		- $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
65		- if ($exception instanceof HintException) {
66		- $message = $exception->getHint();
67		- } else {
68		- $message = $exception->getMessage();
69		- }
	52	+ /**
	53	+ * Log error message and return a response which can be displayed to the user
	54	+ *
	55	+ * @param \OCP\AppFramework\Controller $controller
	56	+ * @param string $methodName
	57	+ * @param \Exception $exception
	58	+ * @return JSONResponse
	59	+ */
	60	+ public function afterException($controller, $methodName, \Exception $exception) {
	61	+ if (($controller instanceof SettingsController) === false) {
	62	+ throw $exception;
	63	+ }
	64	+ $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
	65	+ if ($exception instanceof HintException) {
	66	+ $message = $exception->getHint();
	67	+ } else {
	68	+ $message = $exception->getMessage();
	69	+ }
70	70
71		- return new JSONResponse(
72		- ['message' => $message],
73		- Http::STATUS_BAD_REQUEST
74		- );
	71	+ return new JSONResponse(
	72	+ ['message' => $message],
	73	+ Http::STATUS_BAD_REQUEST
	74	+ );
75	75
76		- }
	76	+ }
77	77
78	78	}

		@@ -30,117 +30,117 @@
		block discarded – undo
30	30
31	31	class Converter {
32	32
33		- /** @var AccountManager */
34		- private $accountManager;
35		-
36		- /**
37		- * Converter constructor.
38		- *
39		- * @param AccountManager $accountManager
40		- */
41		- public function __construct(AccountManager $accountManager) {
42		- $this->accountManager = $accountManager;
43		- }
44		-
45		- /**
46		- * @param IUser $user
47		- * @return VCard\|null
48		- */
49		- public function createCardFromUser(IUser $user) {
50		-
51		- $userData = $this->accountManager->getUser($user);
52		-
53		- $uid = $user->getUID();
54		- $cloudId = $user->getCloudId();
55		- $image = $this->getAvatarImage($user);
56		-
57		- $vCard = new VCard();
58		- $vCard->VERSION = '3.0';
59		- $vCard->UID = $uid;
60		-
61		- $publish = false;
62		-
63		- foreach ($userData as $property => $value) {
64		-
65		- $shareWithTrustedServers =
66		- $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY \|\|
67		- $value['scope'] === AccountManager::VISIBILITY_PUBLIC;
68		-
69		- if ($shareWithTrustedServers && $value['value'] !== '') {
70		- $publish = true;
71		- switch ($property) {
72		- case AccountManager::PROPERTY_DISPLAYNAME:
73		- $vCard->add(new Text($vCard, 'FN', $value['value']));
74		- $vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
75		- break;
76		- case AccountManager::PROPERTY_AVATAR:
77		- if ($image !== null) {
78		- $vCard->add('PHOTO', 'data:'.$image->mimeType().';base64,' . base64_encode($image->data()));
79		- }
80		- break;
81		- case AccountManager::PROPERTY_EMAIL:
82		- $vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
83		- break;
84		- case AccountManager::PROPERTY_WEBSITE:
85		- $vCard->add(new Text($vCard, 'URL', $value['value']));
86		- break;
87		- case AccountManager::PROPERTY_PHONE:
88		- $vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
89		- break;
90		- case AccountManager::PROPERTY_ADDRESS:
91		- $vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
92		- break;
93		- case AccountManager::PROPERTY_TWITTER:
94		- $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
95		- break;
96		- }
97		- }
98		- }
99		-
100		- if ($publish && !empty($cloudId)) {
101		- $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
102		- $vCard->validate();
103		- return $vCard;
104		- }
105		-
106		- return null;
107		- }
108		-
109		- /**
110		- * @param string $fullName
111		- * @return string[]
112		- */
113		- public function splitFullName($fullName) {
114		- // Very basic western style parsing. I'm not gonna implement
115		- // https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
116		-
117		- $elements = explode(' ', $fullName);
118		- $result = ['', '', '', '', ''];
119		- if (count($elements) > 2) {
120		- $result[0] = implode(' ', array_slice($elements, count($elements)-1));
121		- $result[1] = $elements[0];
122		- $result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
123		- } elseif (count($elements) === 2) {
124		- $result[0] = $elements[1];
125		- $result[1] = $elements[0];
126		- } else {
127		- $result[0] = $elements[0];
128		- }
129		-
130		- return $result;
131		- }
132		-
133		- /**
134		- * @param IUser $user
135		- * @return null\|IImage
136		- */
137		- private function getAvatarImage(IUser $user) {
138		- try {
139		- $image = $user->getAvatarImage(-1);
140		- return $image;
141		- } catch (\Exception $ex) {
142		- return null;
143		- }
144		- }
	33	+ /** @var AccountManager */
	34	+ private $accountManager;
	35	+
	36	+ /**
	37	+ * Converter constructor.
	38	+ *
	39	+ * @param AccountManager $accountManager
	40	+ */
	41	+ public function __construct(AccountManager $accountManager) {
	42	+ $this->accountManager = $accountManager;
	43	+ }
	44	+
	45	+ /**
	46	+ * @param IUser $user
	47	+ * @return VCard\|null
	48	+ */
	49	+ public function createCardFromUser(IUser $user) {
	50	+
	51	+ $userData = $this->accountManager->getUser($user);
	52	+
	53	+ $uid = $user->getUID();
	54	+ $cloudId = $user->getCloudId();
	55	+ $image = $this->getAvatarImage($user);
	56	+
	57	+ $vCard = new VCard();
	58	+ $vCard->VERSION = '3.0';
	59	+ $vCard->UID = $uid;
	60	+
	61	+ $publish = false;
	62	+
	63	+ foreach ($userData as $property => $value) {
	64	+
	65	+ $shareWithTrustedServers =
	66	+ $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY \|\|
	67	+ $value['scope'] === AccountManager::VISIBILITY_PUBLIC;
	68	+
	69	+ if ($shareWithTrustedServers && $value['value'] !== '') {
	70	+ $publish = true;
	71	+ switch ($property) {
	72	+ case AccountManager::PROPERTY_DISPLAYNAME:
	73	+ $vCard->add(new Text($vCard, 'FN', $value['value']));
	74	+ $vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
	75	+ break;
	76	+ case AccountManager::PROPERTY_AVATAR:
	77	+ if ($image !== null) {
	78	+ $vCard->add('PHOTO', 'data:'.$image->mimeType().';base64,' . base64_encode($image->data()));
	79	+ }
	80	+ break;
	81	+ case AccountManager::PROPERTY_EMAIL:
	82	+ $vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
	83	+ break;
	84	+ case AccountManager::PROPERTY_WEBSITE:
	85	+ $vCard->add(new Text($vCard, 'URL', $value['value']));
	86	+ break;
	87	+ case AccountManager::PROPERTY_PHONE:
	88	+ $vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
	89	+ break;
	90	+ case AccountManager::PROPERTY_ADDRESS:
	91	+ $vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
	92	+ break;
	93	+ case AccountManager::PROPERTY_TWITTER:
	94	+ $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $value['value'], ['TYPE' => 'TWITTER']));
	95	+ break;
	96	+ }
	97	+ }
	98	+ }
	99	+
	100	+ if ($publish && !empty($cloudId)) {
	101	+ $vCard->add(new Text($vCard, 'CLOUD', $cloudId));
	102	+ $vCard->validate();
	103	+ return $vCard;
	104	+ }
	105	+
	106	+ return null;
	107	+ }
	108	+
	109	+ /**
	110	+ * @param string $fullName
	111	+ * @return string[]
	112	+ */
	113	+ public function splitFullName($fullName) {
	114	+ // Very basic western style parsing. I'm not gonna implement
	115	+ // https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
	116	+
	117	+ $elements = explode(' ', $fullName);
	118	+ $result = ['', '', '', '', ''];
	119	+ if (count($elements) > 2) {
	120	+ $result[0] = implode(' ', array_slice($elements, count($elements)-1));
	121	+ $result[1] = $elements[0];
	122	+ $result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
	123	+ } elseif (count($elements) === 2) {
	124	+ $result[0] = $elements[1];
	125	+ $result[1] = $elements[0];
	126	+ } else {
	127	+ $result[0] = $elements[0];
	128	+ }
	129	+
	130	+ return $result;
	131	+ }
	132	+
	133	+ /**
	134	+ * @param IUser $user
	135	+ * @return null\|IImage
	136	+ */
	137	+ private function getAvatarImage(IUser $user) {
	138	+ try {
	139	+ $image = $user->getAvatarImage(-1);
	140	+ return $image;
	141	+ } catch (\Exception $ex) {
	142	+ return null;
	143	+ }
	144	+ }
145	145
146	146	}

nextcloud / server

Pull Request — master (#3825)

Status

Category

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

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