Inspection of "Fix reshare with user activity message" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3974)

by Joas

created 2017-03-21 16:20 UTC

Status

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

@@ -26,103 +26,103 @@
 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();
-		}
-
-		$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 {file}');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$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();
+        }
+
+        $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 {file}');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $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.

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

nextcloud / server

Pull Request — master (#3974)

Status

Category

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