Inspection of "Merge pull request #16560 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 9ef23e...1ec98a )

by Roeland

created 2019-07-27 10:23 UTC

Status

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

@@ -35,109 +35,109 @@
 block discarded – undo
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-	}
-
-	/**
-	 * This method handler is invoked during fetching of properties.
-	 *
-	 * We use this event to add calendar-auto-schedule-specific properties.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		parent::propFind($propFind, $node);
-
-		if ($node instanceof IPrincipal) {
-			// overwrite Sabre/Dav's implementation
-			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
-				if ($node instanceof IProperties) {
-					$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
-					$props = $node->getProperties([$calendarUserType]);
-
-					if (isset($props[$calendarUserType])) {
-						return $props[$calendarUserType];
-					}
-				}
-
-				return 'INDIVIDUAL';
-			});
-		}
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
-
-		if ($result === null) {
-			$result = [];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
-
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-				if (!$calendarHomePath) {
-					return null;
-				}
-
-				if (strpos($principalUrl, 'principals/users') === 0) {
-					$uri = CalDavBackend::PERSONAL_CALENDAR_URI;
-					$displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
-				} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
-						  strpos($principalUrl, 'principals/calendar-rooms') === 0) {
-					$uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
-					$displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
-				} else {
-					// How did we end up here?
-					// TODO - throw exception or just ignore?
-					return null;
-				}
-
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists($uri)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
-						'{DAV:}displayname' => $displayname,
-					]);
-				}
-
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
-				if (empty($result)) {
-					return null;
-				}
-
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+    }
+
+    /**
+     * This method handler is invoked during fetching of properties.
+     *
+     * We use this event to add calendar-auto-schedule-specific properties.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        parent::propFind($propFind, $node);
+
+        if ($node instanceof IPrincipal) {
+            // overwrite Sabre/Dav's implementation
+            $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
+                if ($node instanceof IProperties) {
+                    $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+                    $props = $node->getProperties([$calendarUserType]);
+
+                    if (isset($props[$calendarUserType])) {
+                        return $props[$calendarUserType];
+                    }
+                }
+
+                return 'INDIVIDUAL';
+            });
+        }
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
+
+        if ($result === null) {
+            $result = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
+
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
+                if (strpos($principalUrl, 'principals/users') === 0) {
+                    $uri = CalDavBackend::PERSONAL_CALENDAR_URI;
+                    $displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
+                } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
+                          strpos($principalUrl, 'principals/calendar-rooms') === 0) {
+                    $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
+                    $displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
+                } else {
+                    // How did we end up here?
+                    // TODO - throw exception or just ignore?
+                    return null;
+                }
+
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists($uri)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+                        '{DAV:}displayname' => $displayname,
+                    ]);
+                }
+
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
+
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
 }

Please login to merge, or discard this patch.

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

@@ -60,9 +60,9 @@  discard block
 block discarded – undo
 
 		if ($node instanceof IPrincipal) {
 			// overwrite Sabre/Dav's implementation
-			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-user-type', function() use ($node) {
 				if ($node instanceof IProperties) {
-					$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+					$calendarUserType = '{'.self::NS_CALDAV.'}calendar-user-type';
 					$props = $node->getProperties([$calendarUserType]);
 
 					if (isset($props[$calendarUserType])) {
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 	 */
 	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+			$propFind->handle('{'.self::NS_CALDAV.'}schedule-default-calendar-URL', function() use ($node) {
 				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
 				$caldavPlugin = $this->server->getPlugin('caldav');
 				$principalUrl = $node->getPrincipalUrl();
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 					]);
 				}
 
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+				$result = $this->server->getPropertiesForPath($calendarHomePath.'/'.$uri, [], 1);
 				if (empty($result)) {
 					return null;
 				}

Please login to merge, or discard this patch.

		@@ -35,109 +35,109 @@
		block discarded – undo
35	35
36	36	class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
37	37
38		- /**
39		- * Initializes the plugin
40		- *
41		- * @param Server $server
42		- * @return void
43		- */
44		- function initialize(Server $server) {
45		- parent::initialize($server);
46		- $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
47		- }
48		-
49		- /**
50		- * This method handler is invoked during fetching of properties.
51		- *
52		- * We use this event to add calendar-auto-schedule-specific properties.
53		- *
54		- * @param PropFind $propFind
55		- * @param INode $node
56		- * @return void
57		- */
58		- function propFind(PropFind $propFind, INode $node) {
59		- parent::propFind($propFind, $node);
60		-
61		- if ($node instanceof IPrincipal) {
62		- // overwrite Sabre/Dav's implementation
63		- $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
64		- if ($node instanceof IProperties) {
65		- $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
66		- $props = $node->getProperties([$calendarUserType]);
67		-
68		- if (isset($props[$calendarUserType])) {
69		- return $props[$calendarUserType];
70		- }
71		- }
72		-
73		- return 'INDIVIDUAL';
74		- });
75		- }
76		- }
77		-
78		- /**
79		- * Returns a list of addresses that are associated with a principal.
80		- *
81		- * @param string $principal
82		- * @return array
83		- */
84		- protected function getAddressesForPrincipal($principal) {
85		- $result = parent::getAddressesForPrincipal($principal);
86		-
87		- if ($result === null) {
88		- $result = [];
89		- }
90		-
91		- return $result;
92		- }
93		-
94		- /**
95		- * Always use the personal calendar as target for scheduled events
96		- *
97		- * @param PropFind $propFind
98		- * @param INode $node
99		- * @return void
100		- */
101		- function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
102		- if ($node instanceof IPrincipal) {
103		- $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
104		- /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
105		- $caldavPlugin = $this->server->getPlugin('caldav');
106		- $principalUrl = $node->getPrincipalUrl();
107		-
108		- $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
109		- if (!$calendarHomePath) {
110		- return null;
111		- }
112		-
113		- if (strpos($principalUrl, 'principals/users') === 0) {
114		- $uri = CalDavBackend::PERSONAL_CALENDAR_URI;
115		- $displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
116		- } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 \|\|
117		- strpos($principalUrl, 'principals/calendar-rooms') === 0) {
118		- $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
119		- $displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
120		- } else {
121		- // How did we end up here?
122		- // TODO - throw exception or just ignore?
123		- return null;
124		- }
125		-
126		- /** @var CalendarHome $calendarHome */
127		- $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
128		- if (!$calendarHome->childExists($uri)) {
129		- $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
130		- '{DAV:}displayname' => $displayname,
131		- ]);
132		- }
133		-
134		- $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
135		- if (empty($result)) {
136		- return null;
137		- }
138		-
139		- return new LocalHref($result[0]['href']);
140		- });
141		- }
142		- }
	38	+ /**
	39	+ * Initializes the plugin
	40	+ *
	41	+ * @param Server $server
	42	+ * @return void
	43	+ */
	44	+ function initialize(Server $server) {
	45	+ parent::initialize($server);
	46	+ $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
	47	+ }
	48	+
	49	+ /**
	50	+ * This method handler is invoked during fetching of properties.
	51	+ *
	52	+ * We use this event to add calendar-auto-schedule-specific properties.
	53	+ *
	54	+ * @param PropFind $propFind
	55	+ * @param INode $node
	56	+ * @return void
	57	+ */
	58	+ function propFind(PropFind $propFind, INode $node) {
	59	+ parent::propFind($propFind, $node);
	60	+
	61	+ if ($node instanceof IPrincipal) {
	62	+ // overwrite Sabre/Dav's implementation
	63	+ $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
	64	+ if ($node instanceof IProperties) {
	65	+ $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
	66	+ $props = $node->getProperties([$calendarUserType]);
	67	+
	68	+ if (isset($props[$calendarUserType])) {
	69	+ return $props[$calendarUserType];
	70	+ }
	71	+ }
	72	+
	73	+ return 'INDIVIDUAL';
	74	+ });
	75	+ }
	76	+ }
	77	+
	78	+ /**
	79	+ * Returns a list of addresses that are associated with a principal.
	80	+ *
	81	+ * @param string $principal
	82	+ * @return array
	83	+ */
	84	+ protected function getAddressesForPrincipal($principal) {
	85	+ $result = parent::getAddressesForPrincipal($principal);
	86	+
	87	+ if ($result === null) {
	88	+ $result = [];
	89	+ }
	90	+
	91	+ return $result;
	92	+ }
	93	+
	94	+ /**
	95	+ * Always use the personal calendar as target for scheduled events
	96	+ *
	97	+ * @param PropFind $propFind
	98	+ * @param INode $node
	99	+ * @return void
	100	+ */
	101	+ function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
	102	+ if ($node instanceof IPrincipal) {
	103	+ $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
	104	+ /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
	105	+ $caldavPlugin = $this->server->getPlugin('caldav');
	106	+ $principalUrl = $node->getPrincipalUrl();
	107	+
	108	+ $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
	109	+ if (!$calendarHomePath) {
	110	+ return null;
	111	+ }
	112	+
	113	+ if (strpos($principalUrl, 'principals/users') === 0) {
	114	+ $uri = CalDavBackend::PERSONAL_CALENDAR_URI;
	115	+ $displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
	116	+ } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 \|\|
	117	+ strpos($principalUrl, 'principals/calendar-rooms') === 0) {
	118	+ $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
	119	+ $displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
	120	+ } else {
	121	+ // How did we end up here?
	122	+ // TODO - throw exception or just ignore?
	123	+ return null;
	124	+ }
	125	+
	126	+ /** @var CalendarHome $calendarHome */
	127	+ $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
	128	+ if (!$calendarHome->childExists($uri)) {
	129	+ $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
	130	+ '{DAV:}displayname' => $displayname,
	131	+ ]);
	132	+ }
	133	+
	134	+ $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
	135	+ if (empty($result)) {
	136	+ return null;
	137	+ }
	138	+
	139	+ return new LocalHref($result[0]['href']);
	140	+ });
	141	+ }
	142	+ }
143	143	}

		@@ -60,9 +60,9 @@ discard block
		block discarded – undo
60	60
61	61	if ($node instanceof IPrincipal) {
62	62	// overwrite Sabre/Dav's implementation
63		- $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
	63	+ $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-type', function() use ($node) {
64	64	if ($node instanceof IProperties) {
65		- $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
	65	+ $calendarUserType = '{'.self::NS_CALDAV.'}calendar-user-type';
66	66	$props = $node->getProperties([$calendarUserType]);
67	67
68	68	if (isset($props[$calendarUserType])) {
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	*/
101	101	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
102	102	if ($node instanceof IPrincipal) {
103		- $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
	103	+ $propFind->handle('{'.self::NS_CALDAV.'}schedule-default-calendar-URL', function() use ($node) {
104	104	/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
105	105	$caldavPlugin = $this->server->getPlugin('caldav');
106	106	$principalUrl = $node->getPrincipalUrl();
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	]);
132	132	}
133	133
134		- $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
	134	+ $result = $this->server->getPropertiesForPath($calendarHomePath.'/'.$uri, [], 1);
135	135	if (empty($result)) {
136	136	return null;
137	137	}

nextcloud / server

Push — master ( 9ef23e...1ec98a )

Status

Category

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

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