Inspection of "Merge pull request #9893 from kevgathuku/update-un..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6b6c43...5b6050 )

by Julius

created 2018-06-18 14:45 UTC

Status

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

@@ -28,111 +28,111 @@
 block discarded – undo
 class Users extends Base {
 
 
-	const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
-	const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
-	const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
-	const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
-
-	const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
-	const SUBJECT_UNSHARED_BY = 'unshared_by';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
-			$subject = $this->l->t('Shared with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
-			$subject = $this->l->t('Removed share for {user}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
-			$subject = $this->l->t('{actor} shared with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
-			$subject = $this->l->t('{actor} removed share for {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
-			$subject = $this->l->t('Shared by {actor}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
-			$subject = $this->l->t('{actor} removed share');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
-			$subject = $this->l->t('You shared {file} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
-			$subject = $this->l->t('You removed {user} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
-			$subject = $this->l->t('{actor} shared {file} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
-			$subject = $this->l->t('{actor} removed {user} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
-			$subject = $this->l->t('{actor} shared {file} with you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
-			$subject = $this->l->t('{actor} removed you from the share named {file}');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_USER_SELF:
-			case self::SUBJECT_UNSHARED_USER_SELF:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_WITH_BY:
-			case self::SUBJECT_UNSHARED_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'actor' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_RESHARED_USER_BY:
-			case self::SUBJECT_UNSHARED_USER_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[2]),
-					'actor' => $this->getUser($parameters[1]),
-				];
-		}
-		return [];
-	}
+    const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
+    const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
+    const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
+    const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
+
+    const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
+    const SUBJECT_UNSHARED_BY = 'unshared_by';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
+            $subject = $this->l->t('Shared with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
+            $subject = $this->l->t('Removed share for {user}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
+            $subject = $this->l->t('{actor} shared with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
+            $subject = $this->l->t('{actor} removed share for {user}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
+            $subject = $this->l->t('Shared by {actor}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
+            $subject = $this->l->t('{actor} removed share');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
+            $subject = $this->l->t('You shared {file} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
+            $subject = $this->l->t('You removed {user} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
+            $subject = $this->l->t('{actor} shared {file} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
+            $subject = $this->l->t('{actor} removed {user} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
+            $subject = $this->l->t('{actor} shared {file} with you');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
+            $subject = $this->l->t('{actor} removed you from the share named {file}');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_USER_SELF:
+            case self::SUBJECT_UNSHARED_USER_SELF:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_WITH_BY:
+            case self::SUBJECT_UNSHARED_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_RESHARED_USER_BY:
+            case self::SUBJECT_UNSHARED_USER_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[2]),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+        }
+        return [];
+    }
 }

Please login to merge, or discard this patch.

		@@ -28,111 +28,111 @@
		block discarded – undo
28	28	class Users extends Base {
29	29
30	30
31		- const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
32		- const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
33		- const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
34		- const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
35		-
36		- const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
37		- const SUBJECT_UNSHARED_BY = 'unshared_by';
38		-
39		- /**
40		- * @param IEvent $event
41		- * @return IEvent
42		- * @throws \InvalidArgumentException
43		- * @since 11.0.0
44		- */
45		- public function parseShortVersion(IEvent $event) {
46		- $parsedParameters = $this->getParsedParameters($event);
47		-
48		- if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
49		- $subject = $this->l->t('Shared with {user}');
50		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
51		- $subject = $this->l->t('Removed share for {user}');
52		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
53		- $subject = $this->l->t('{actor} shared with {user}');
54		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
55		- $subject = $this->l->t('{actor} removed share for {user}');
56		- } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
57		- $subject = $this->l->t('Shared by {actor}');
58		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
59		- $subject = $this->l->t('{actor} removed share');
60		-
61		- } else {
62		- throw new \InvalidArgumentException();
63		- }
64		-
65		- if ($this->activityManager->getRequirePNG()) {
66		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
67		- } else {
68		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
69		- }
70		- $this->setSubjects($event, $subject, $parsedParameters);
71		-
72		- return $event;
73		- }
74		-
75		- /**
76		- * @param IEvent $event
77		- * @return IEvent
78		- * @throws \InvalidArgumentException
79		- * @since 11.0.0
80		- */
81		- public function parseLongVersion(IEvent $event) {
82		- $parsedParameters = $this->getParsedParameters($event);
83		-
84		- if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
85		- $subject = $this->l->t('You shared {file} with {user}');
86		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
87		- $subject = $this->l->t('You removed {user} from {file}');
88		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
89		- $subject = $this->l->t('{actor} shared {file} with {user}');
90		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
91		- $subject = $this->l->t('{actor} removed {user} from {file}');
92		- } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
93		- $subject = $this->l->t('{actor} shared {file} with you');
94		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
95		- $subject = $this->l->t('{actor} removed you from the share named {file}');
96		-
97		- } else {
98		- throw new \InvalidArgumentException();
99		- }
100		-
101		- if ($this->activityManager->getRequirePNG()) {
102		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
103		- } else {
104		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
105		- }
106		- $this->setSubjects($event, $subject, $parsedParameters);
107		-
108		- return $event;
109		- }
110		-
111		- protected function getParsedParameters(IEvent $event) {
112		- $subject = $event->getSubject();
113		- $parameters = $event->getSubjectParameters();
114		-
115		- switch ($subject) {
116		- case self::SUBJECT_SHARED_USER_SELF:
117		- case self::SUBJECT_UNSHARED_USER_SELF:
118		- return [
119		- 'file' => $this->getFile($parameters[0], $event),
120		- 'user' => $this->getUser($parameters[1]),
121		- ];
122		- case self::SUBJECT_SHARED_WITH_BY:
123		- case self::SUBJECT_UNSHARED_BY:
124		- return [
125		- 'file' => $this->getFile($parameters[0], $event),
126		- 'actor' => $this->getUser($parameters[1]),
127		- ];
128		- case self::SUBJECT_RESHARED_USER_BY:
129		- case self::SUBJECT_UNSHARED_USER_BY:
130		- return [
131		- 'file' => $this->getFile($parameters[0], $event),
132		- 'user' => $this->getUser($parameters[2]),
133		- 'actor' => $this->getUser($parameters[1]),
134		- ];
135		- }
136		- return [];
137		- }
	31	+ const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
	32	+ const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
	33	+ const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
	34	+ const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
	35	+
	36	+ const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
	37	+ const SUBJECT_UNSHARED_BY = 'unshared_by';
	38	+
	39	+ /**
	40	+ * @param IEvent $event
	41	+ * @return IEvent
	42	+ * @throws \InvalidArgumentException
	43	+ * @since 11.0.0
	44	+ */
	45	+ public function parseShortVersion(IEvent $event) {
	46	+ $parsedParameters = $this->getParsedParameters($event);
	47	+
	48	+ if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
	49	+ $subject = $this->l->t('Shared with {user}');
	50	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
	51	+ $subject = $this->l->t('Removed share for {user}');
	52	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
	53	+ $subject = $this->l->t('{actor} shared with {user}');
	54	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
	55	+ $subject = $this->l->t('{actor} removed share for {user}');
	56	+ } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
	57	+ $subject = $this->l->t('Shared by {actor}');
	58	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
	59	+ $subject = $this->l->t('{actor} removed share');
	60	+
	61	+ } else {
	62	+ throw new \InvalidArgumentException();
	63	+ }
	64	+
	65	+ if ($this->activityManager->getRequirePNG()) {
	66	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
	67	+ } else {
	68	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	69	+ }
	70	+ $this->setSubjects($event, $subject, $parsedParameters);
	71	+
	72	+ return $event;
	73	+ }
	74	+
	75	+ /**
	76	+ * @param IEvent $event
	77	+ * @return IEvent
	78	+ * @throws \InvalidArgumentException
	79	+ * @since 11.0.0
	80	+ */
	81	+ public function parseLongVersion(IEvent $event) {
	82	+ $parsedParameters = $this->getParsedParameters($event);
	83	+
	84	+ if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
	85	+ $subject = $this->l->t('You shared {file} with {user}');
	86	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
	87	+ $subject = $this->l->t('You removed {user} from {file}');
	88	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
	89	+ $subject = $this->l->t('{actor} shared {file} with {user}');
	90	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
	91	+ $subject = $this->l->t('{actor} removed {user} from {file}');
	92	+ } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
	93	+ $subject = $this->l->t('{actor} shared {file} with you');
	94	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
	95	+ $subject = $this->l->t('{actor} removed you from the share named {file}');
	96	+
	97	+ } else {
	98	+ throw new \InvalidArgumentException();
	99	+ }
	100	+
	101	+ if ($this->activityManager->getRequirePNG()) {
	102	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
	103	+ } else {
	104	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	105	+ }
	106	+ $this->setSubjects($event, $subject, $parsedParameters);
	107	+
	108	+ return $event;
	109	+ }
	110	+
	111	+ protected function getParsedParameters(IEvent $event) {
	112	+ $subject = $event->getSubject();
	113	+ $parameters = $event->getSubjectParameters();
	114	+
	115	+ switch ($subject) {
	116	+ case self::SUBJECT_SHARED_USER_SELF:
	117	+ case self::SUBJECT_UNSHARED_USER_SELF:
	118	+ return [
	119	+ 'file' => $this->getFile($parameters[0], $event),
	120	+ 'user' => $this->getUser($parameters[1]),
	121	+ ];
	122	+ case self::SUBJECT_SHARED_WITH_BY:
	123	+ case self::SUBJECT_UNSHARED_BY:
	124	+ return [
	125	+ 'file' => $this->getFile($parameters[0], $event),
	126	+ 'actor' => $this->getUser($parameters[1]),
	127	+ ];
	128	+ case self::SUBJECT_RESHARED_USER_BY:
	129	+ case self::SUBJECT_UNSHARED_USER_BY:
	130	+ return [
	131	+ 'file' => $this->getFile($parameters[0], $event),
	132	+ 'user' => $this->getUser($parameters[2]),
	133	+ 'actor' => $this->getUser($parameters[1]),
	134	+ ];
	135	+ }
	136	+ return [];
	137	+ }
138	138	}

nextcloud / server

Push — master ( 6b6c43...5b6050 )

Status

Category

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