nextcloud / server

apps/dav/lib/Connector/Sabre/ChecksumList.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

Indentation +30 added lines, -30 removed lines

@@ -32,37 +32,37 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private array $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private array $checksums;
 
-	public function __construct(string $checksum) {
-		$this->checksums = explode(' ', $checksum);
-	}
+    public function __construct(string $checksum) {
+        $this->checksums = explode(' ', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ShareTypeList.php

Spacing +3 added lines, -3 removed lines

@@ -71,8 +71,8 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') {
+				$shareTypes[] = (int) $elem['value'];
 			}
 		}
 		return new self($shareTypes);
@@ -86,7 +86,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType);
 		}
 	}
 }

Indentation +49 added lines, -49 removed lines

@@ -17,58 +17,58 @@
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @param int[] $shareTypes
-	 */
-	public function __construct(
-		/**
-		 * Share types
-		 */
-		private $shareTypes,
-	) {
-	}
+    /**
+     * @param int[] $shareTypes
+     */
+    public function __construct(
+        /**
+         * Share types
+         */
+        private $shareTypes,
+    ) {
+    }
 
-	/**
-	 * Returns the share types
-	 *
-	 * @return int[]
-	 */
-	public function getShareTypes() {
-		return $this->shareTypes;
-	}
+    /**
+     * Returns the share types
+     *
+     * @return int[]
+     */
+    public function getShareTypes() {
+        return $this->shareTypes;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$shareTypes = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $shareTypes = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
-			}
-		}
-		return new self($shareTypes);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
+                $shareTypes[] = (int)$elem['value'];
+            }
+        }
+        return new self($shareTypes);
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shareTypes as $shareType) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+        }
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 			}
 		}
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
+		throw new NotFound('Node with name \''.$name.'\' could not be found');
 	}
 
 	/**

Indentation +193 added lines, -193 removed lines

@@ -30,197 +30,197 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var PluginManager */
-	private $pluginManager;
-
-	private ?array $cachedChildren = null;
-
-	public function __construct(
-		BackendInterface $caldavBackend,
-		array $principalInfo,
-		private LoggerInterface $logger,
-		private FederatedCalendarFactory $federatedCalendarFactory,
-		private bool $returnCachedSubscriptions,
-	) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = Server::get(IConfig::class);
-		$this->pluginManager = new PluginManager(
-			\OC::$server,
-			Server::get(IAppManager::class)
-		);
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function createExtendedCollection($name, MkCol $mkCol): void {
-		$reservedNames = [
-			BirthdayService::BIRTHDAY_CALENDAR_URI,
-			TrashbinHome::NAME,
-		];
-
-		if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getChildren() {
-		if ($this->cachedChildren) {
-			return $this->cachedChildren;
-		}
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->config, $this->principalInfo['uri']);
-		}
-
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		if ($this->caldavBackend instanceof CalDavBackend) {
-			$objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
-
-			$federatedCalendars = $this->caldavBackend->getFederatedCalendarsForUser(
-				$this->principalInfo['uri'],
-			);
-			foreach ($federatedCalendars as $federatedCalendarInfo) {
-				$objects[] = $this->federatedCalendarFactory->createFederatedCalendar(
-					$federatedCalendarInfo,
-				);
-			}
-		}
-
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($this->returnCachedSubscriptions) {
-					$objects[] = new CachedSubscription($this->caldavBackend, $subscription);
-				} else {
-					$objects[] = new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-			/** @var ICalendarProvider $calendarPlugin */
-			$calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
-			foreach ($calendars as $calendar) {
-				$objects[] = $calendar;
-			}
-		}
-
-		$this->cachedChildren = $objects;
-		return $objects;
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return INode
-	 */
-	public function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->config, $this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
-			return new TrashbinHome($this->caldavBackend, $this->principalInfo);
-		}
-
-		// Only check if the methods are available
-		if ($this->caldavBackend instanceof CalDavBackend) {
-			// Calendar - this covers all "regular" calendars, but not shared
-			$calendar = $this->caldavBackend->getCalendarByUri($this->principalInfo['uri'], $name);
-			if (!empty($calendar)) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-			}
-
-			// Federated calendar
-			$federatedCalendar = $this->caldavBackend->getFederatedCalendarByUri(
-				$this->principalInfo['uri'],
-				$name,
-			);
-			if ($federatedCalendar !== null) {
-				return $this->federatedCalendarFactory->createFederatedCalendar($federatedCalendar);
-			}
-		}
-
-		// Fallback to cover shared calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
-			}
-		}
-
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					if ($this->returnCachedSubscriptions) {
-						return new CachedSubscription($this->caldavBackend, $subscription);
-					}
-
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		if (ExternalCalendar::isAppGeneratedCalendar($name)) {
-			[$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
-
-			foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-				/** @var ICalendarProvider $calendarPlugin */
-				if ($calendarPlugin->getAppId() !== $appId) {
-					continue;
-				}
-
-				if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
-					return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
-				}
-			}
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	public function calendarSearch(array $filters, $limit = null, $offset = null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var PluginManager */
+    private $pluginManager;
+
+    private ?array $cachedChildren = null;
+
+    public function __construct(
+        BackendInterface $caldavBackend,
+        array $principalInfo,
+        private LoggerInterface $logger,
+        private FederatedCalendarFactory $federatedCalendarFactory,
+        private bool $returnCachedSubscriptions,
+    ) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = Server::get(IConfig::class);
+        $this->pluginManager = new PluginManager(
+            \OC::$server,
+            Server::get(IAppManager::class)
+        );
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createExtendedCollection($name, MkCol $mkCol): void {
+        $reservedNames = [
+            BirthdayService::BIRTHDAY_CALENDAR_URI,
+            TrashbinHome::NAME,
+        ];
+
+        if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getChildren() {
+        if ($this->cachedChildren) {
+            return $this->cachedChildren;
+        }
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->config, $this->principalInfo['uri']);
+        }
+
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        if ($this->caldavBackend instanceof CalDavBackend) {
+            $objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
+
+            $federatedCalendars = $this->caldavBackend->getFederatedCalendarsForUser(
+                $this->principalInfo['uri'],
+            );
+            foreach ($federatedCalendars as $federatedCalendarInfo) {
+                $objects[] = $this->federatedCalendarFactory->createFederatedCalendar(
+                    $federatedCalendarInfo,
+                );
+            }
+        }
+
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($this->returnCachedSubscriptions) {
+                    $objects[] = new CachedSubscription($this->caldavBackend, $subscription);
+                } else {
+                    $objects[] = new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+            /** @var ICalendarProvider $calendarPlugin */
+            $calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
+            foreach ($calendars as $calendar) {
+                $objects[] = $calendar;
+            }
+        }
+
+        $this->cachedChildren = $objects;
+        return $objects;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return INode
+     */
+    public function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->config, $this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
+            return new TrashbinHome($this->caldavBackend, $this->principalInfo);
+        }
+
+        // Only check if the methods are available
+        if ($this->caldavBackend instanceof CalDavBackend) {
+            // Calendar - this covers all "regular" calendars, but not shared
+            $calendar = $this->caldavBackend->getCalendarByUri($this->principalInfo['uri'], $name);
+            if (!empty($calendar)) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+            }
+
+            // Federated calendar
+            $federatedCalendar = $this->caldavBackend->getFederatedCalendarByUri(
+                $this->principalInfo['uri'],
+                $name,
+            );
+            if ($federatedCalendar !== null) {
+                return $this->federatedCalendarFactory->createFederatedCalendar($federatedCalendar);
+            }
+        }
+
+        // Fallback to cover shared calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config, $this->logger);
+            }
+        }
+
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    if ($this->returnCachedSubscriptions) {
+                        return new CachedSubscription($this->caldavBackend, $subscription);
+                    }
+
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        if (ExternalCalendar::isAppGeneratedCalendar($name)) {
+            [$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
+
+            foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+                /** @var ICalendarProvider $calendarPlugin */
+                if ($calendarPlugin->getAppId() !== $appId) {
+                    continue;
+                }
+
+                if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
+                    return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
+                }
+            }
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    public function calendarSearch(array $filters, $limit = null, $offset = null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

@@ -23,11 +23,11 @@
 
 class PublicCalendarObject extends CalendarObject {
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
 
 class SearchTermFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}search-term has illegal value');
 		}
 
 		return $value;

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php

Spacing +3 added lines, -3 removed lines

@@ -104,13 +104,13 @@ 
 			$tag = $this->tagManager->getTagsByIds([$name]);
 			$tag = current($tag);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
+				throw new NotFound('Tag with id '.$name.' not found');
 			}
 			return $this->makeNode($tag);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$name.' not found', 0, $e);
 		}
 	}
 
@@ -121,7 +121,7 @@ 
 		}
 
 		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
+		return array_map(function($tag) {
 			return $this->makeNode($tag);
 		}, $tags);
 	}

Indentation +146 added lines, -146 removed lines

@@ -20,150 +20,150 @@
 
 class SystemTagsByIdCollection implements ICollection {
 
-	/**
-	 * SystemTagsByIdCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		private ISystemTagManager $tagManager,
-		private IUserSession $userSession,
-		private IGroupManager $groupManager,
-		protected ISystemTagObjectMapper $tagMapper,
-	) {
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 *
-	 * @return bool true if the user is an admin
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 *
-	 * @throws Forbidden
-	 *
-	 * @return never
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create tags by id');
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return never
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return SystemTagNode
-	 */
-	public function getChild($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
-			}
-			return $this->makeNode($tag);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
-		}
-	}
-
-	/**
-	 * @return SystemTagNode[]
-	 *
-	 * @psalm-return array<SystemTagNode>
-	 */
-	public function getChildren() {
-		$visibilityFilter = true;
-		if ($this->isAdmin()) {
-			$visibilityFilter = null;
-		}
-
-		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
-			return $this->makeNode($tag);
-		}, $tags);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function childExists($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				return false;
-			}
-			return true;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @return never
-	 */
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	/**
-	 * @return string
-	 *
-	 * @psalm-return 'systemtags'
-	 */
-	public function getName() {
-		return 'systemtags';
-	}
-
-	/**
-	 * @return never
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return null
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the given system tag
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager, $this->tagMapper);
-	}
+    /**
+     * SystemTagsByIdCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        private ISystemTagManager $tagManager,
+        private IUserSession $userSession,
+        private IGroupManager $groupManager,
+        protected ISystemTagObjectMapper $tagMapper,
+    ) {
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     *
+     * @return bool true if the user is an admin
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     *
+     * @throws Forbidden
+     *
+     * @return never
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create tags by id');
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return never
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return SystemTagNode
+     */
+    public function getChild($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                throw new NotFound('Tag with id ' . $name . ' not found');
+            }
+            return $this->makeNode($tag);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+        }
+    }
+
+    /**
+     * @return SystemTagNode[]
+     *
+     * @psalm-return array<SystemTagNode>
+     */
+    public function getChildren() {
+        $visibilityFilter = true;
+        if ($this->isAdmin()) {
+            $visibilityFilter = null;
+        }
+
+        $tags = $this->tagManager->getAllTags($visibilityFilter);
+        return array_map(function ($tag) {
+            return $this->makeNode($tag);
+        }, $tags);
+    }
+
+    /**
+     * @param string $name
+     */
+    public function childExists($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                return false;
+            }
+            return true;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @return never
+     */
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    /**
+     * @return string
+     *
+     * @psalm-return 'systemtags'
+     */
+    public function getName() {
+        return 'systemtags';
+    }
+
+    /**
+     * @return never
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return null
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the given system tag
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager, $this->tagMapper);
+    }
 }

apps/dav/lib/Upload/UploadFolder.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	}
 
 	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	public function getChild($name) {

Indentation +91 added lines, -91 removed lines

@@ -17,95 +17,95 @@
 use Sabre\DAV\ICollection;
 
 class UploadFolder implements ICollection {
-	public function __construct(
-		private Directory $node,
-		private CleanupService $cleanupService,
-		private IStorage $storage,
-		private string $uid,
-	) {
-	}
-
-	public function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		try {
-			$this->node->createFile($name, $data);
-		} catch (\Exception $e) {
-			if ($this->node->childExists($name)) {
-				$child = $this->node->getChild($name);
-				$child->delete();
-			}
-			throw $e;
-		}
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
-
-	public function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return new UploadFile($this->node->getChild($name));
-	}
-
-	public function getChildren() {
-		$tmpChildren = $this->node->getChildren();
-
-		$children = [];
-		$children[] = new FutureFile($this->node, '.file');
-
-		foreach ($tmpChildren as $child) {
-			$children[] = new UploadFile($child);
-		}
-
-		if ($this->storage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $storage */
-			$objectStore = $this->storage->getObjectStore();
-			if ($objectStore instanceof IObjectStoreMultiPartUpload) {
-				$cache = Server::get(ICacheFactory::class)->createDistributed(ChunkingV2Plugin::CACHE_KEY);
-				$uploadSession = $cache->get($this->getName());
-				if ($uploadSession) {
-					$uploadId = $uploadSession[ChunkingV2Plugin::UPLOAD_ID];
-					$id = $uploadSession[ChunkingV2Plugin::UPLOAD_TARGET_ID];
-					$parts = $objectStore->getMultipartUploads($this->storage->getURN($id), $uploadId);
-					foreach ($parts as $part) {
-						$children[] = new PartFile($this->node, $part);
-					}
-				}
-			}
-		}
-
-		return $children;
-	}
-
-	public function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
-
-	public function delete() {
-		$this->node->delete();
-
-		// Background cleanup job is not needed anymore
-		$this->cleanupService->removeJob($this->uid, $this->getName());
-	}
-
-	public function getName() {
-		return $this->node->getName();
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
-
-	public function getLastModified() {
-		return $this->node->getLastModified();
-	}
-
-	public function getStorage() {
-		return $this->storage;
-	}
+    public function __construct(
+        private Directory $node,
+        private CleanupService $cleanupService,
+        private IStorage $storage,
+        private string $uid,
+    ) {
+    }
+
+    public function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        try {
+            $this->node->createFile($name, $data);
+        } catch (\Exception $e) {
+            if ($this->node->childExists($name)) {
+                $child = $this->node->getChild($name);
+                $child->delete();
+            }
+            throw $e;
+        }
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
+
+    public function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return new UploadFile($this->node->getChild($name));
+    }
+
+    public function getChildren() {
+        $tmpChildren = $this->node->getChildren();
+
+        $children = [];
+        $children[] = new FutureFile($this->node, '.file');
+
+        foreach ($tmpChildren as $child) {
+            $children[] = new UploadFile($child);
+        }
+
+        if ($this->storage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $storage */
+            $objectStore = $this->storage->getObjectStore();
+            if ($objectStore instanceof IObjectStoreMultiPartUpload) {
+                $cache = Server::get(ICacheFactory::class)->createDistributed(ChunkingV2Plugin::CACHE_KEY);
+                $uploadSession = $cache->get($this->getName());
+                if ($uploadSession) {
+                    $uploadId = $uploadSession[ChunkingV2Plugin::UPLOAD_ID];
+                    $id = $uploadSession[ChunkingV2Plugin::UPLOAD_TARGET_ID];
+                    $parts = $objectStore->getMultipartUploads($this->storage->getURN($id), $uploadId);
+                    foreach ($parts as $part) {
+                        $children[] = new PartFile($this->node, $part);
+                    }
+                }
+            }
+        }
+
+        return $children;
+    }
+
+    public function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
+
+    public function delete() {
+        $this->node->delete();
+
+        // Background cleanup job is not needed anymore
+        $this->cleanupService->removeJob($this->uid, $this->getName());
+    }
+
+    public function getName() {
+        return $this->node->getName();
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
+
+    public function getLastModified() {
+        return $this->node->getLastModified();
+    }
+
+    public function getStorage() {
+        return $this->storage;
+    }
 }

apps/files_external/lib/Lib/Backend/Swift.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
-			->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
+			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
 				if (isset($params['options']['key']) && $params['options']['key']) {
 					return $rackspaceAuth;
 				}

Indentation +24 added lines, -24 removed lines

@@ -33,29 +33,29 @@
 use OCP\IL10N;
 
 class Swift extends Backend {
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) {
-		$this
-			->setIdentifier('swift')
-			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
-			->setText($l->t('OpenStack Object Storage'))
-			->addParameters([
-				(new DefinitionParameter('service_name', $l->t('Service name')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				new DefinitionParameter('region', $l->t('Region')),
-				new DefinitionParameter('bucket', $l->t('Bucket')),
-				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
-			->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
-				if (isset($params['options']['key']) && $params['options']['key']) {
-					return $rackspaceAuth;
-				}
-				return $openstackAuth;
-			})
-		;
-	}
+    public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) {
+        $this
+            ->setIdentifier('swift')
+            ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
+            ->setText($l->t('OpenStack Object Storage'))
+            ->addParameters([
+                (new DefinitionParameter('service_name', $l->t('Service name')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                new DefinitionParameter('region', $l->t('Region')),
+                new DefinitionParameter('bucket', $l->t('Bucket')),
+                (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+            ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) {
+                if (isset($params['options']['key']) && $params['options']['key']) {
+                    return $rackspaceAuth;
+                }
+                return $openstackAuth;
+            })
+        ;
+    }
 }

apps/files_external/lib/Lib/VisibilityTrait.php

Indentation +86 added lines, -86 removed lines

@@ -36,101 +36,101 @@
  */
 trait VisibilityTrait {
 
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
+    /** @var int visibility */
+    protected $visibility = BackendService::VISIBILITY_DEFAULT;
 
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
+    /** @var int allowed visibilities */
+    protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
 
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
+    /**
+     * @return int
+     */
+    public function getVisibility() {
+        return $this->visibility;
+    }
 
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Check if the backend is visible for a user type
+     *
+     * @param int $visibility
+     * @return bool
+     */
+    public function isVisibleFor($visibility) {
+        if ($this->visibility & $visibility) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function setVisibility($visibility) {
+        $this->visibility = $visibility;
+        $this->allowedVisibility |= $visibility;
+        return $this;
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function addVisibility($visibility) {
+        return $this->setVisibility($this->visibility | $visibility);
+    }
 
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
+    /**
+     * @param int $visibility
+     * @return self
+     */
+    public function removeVisibility($visibility) {
+        return $this->setVisibility($this->visibility & ~$visibility);
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
+    /**
+     * @return int
+     */
+    public function getAllowedVisibility() {
+        return $this->allowedVisibility;
+    }
 
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Check if the backend is allowed to be visible for a user type
+     *
+     * @param int $allowedVisibility
+     * @return bool
+     */
+    public function isAllowedVisibleFor($allowedVisibility) {
+        if ($this->allowedVisibility & $allowedVisibility) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function setAllowedVisibility($allowedVisibility) {
+        $this->allowedVisibility = $allowedVisibility;
+        $this->visibility &= $allowedVisibility;
+        return $this;
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function addAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
+    }
 
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
+    /**
+     * @param int $allowedVisibility
+     * @return self
+     */
+    public function removeAllowedVisibility($allowedVisibility) {
+        return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
+    }
 }