nextcloud / server

apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php

Indentation +14 added lines, -14 removed lines

@@ -33,20 +33,20 @@
 
 class Version1002Date20180821043638 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('twofactor_backupcodes');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('twofactor_backupcodes');
 
-		$table->getColumn('code')->setLength(128);
+        $table->getColumn('code')->setLength(128);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Accounts/Account.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 	}
 
 	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
+		return array_filter($this->properties, function($obj) {
 			return $obj instanceof IAccountProperty;
 		});
 	}
@@ -96,7 +96,7 @@ 
 			$index = $obj->getName();
 			if ($this->isCollection($index)) {
 				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
+				$index .= '#'.$incrementals[$index];
 			}
 			$result[$index] = $obj;
 		}

Indentation +121 added lines, -121 removed lines

@@ -17,125 +17,125 @@
 use RuntimeException;
 
 class Account implements IAccount {
-	use TAccountsHelper;
-
-	/** @var IAccountPropertyCollection[]|IAccountProperty[] */
-	private array $properties = [];
-
-	public function __construct(
-		private IUser $user,
-	) {
-	}
-
-	public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
-		}
-		$this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
-		return $this;
-	}
-
-	public function getProperty(string $property): IAccountProperty {
-		if ($this->isCollection($property)) {
-			throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
-		}
-		if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
-			throw new PropertyDoesNotExistException($property);
-		}
-		return $this->properties[$property];
-	}
-
-	public function getProperties(): array {
-		return array_filter($this->properties, function ($obj) {
-			return $obj instanceof IAccountProperty;
-		});
-	}
-
-	public function setAllPropertiesFromJson(array $properties): IAccount {
-		foreach ($properties as $propertyName => $propertyObject) {
-			if ($this->isCollection($propertyName)) {
-				$collection = new AccountPropertyCollection($propertyName);
-				/** @var array<int, IAccountProperty> $collectionProperties */
-				$collectionProperties = [];
-				/** @var array<int, array<string, string>> $propertyObject */
-				foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) {
-					$collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData);
-				}
-				$collection->setProperties($collectionProperties);
-				$this->setPropertyCollection($collection);
-			} else {
-				/** @var array<string, string> $propertyObject */
-				['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject;
-				$this->setProperty($propertyName, $value, $scope, $verified, $verificationData);
-			}
-		}
-
-		return $this;
-	}
-
-	public function getAllProperties(): Generator {
-		foreach ($this->properties as $propertyObject) {
-			if ($propertyObject instanceof IAccountProperty) {
-				yield $propertyObject;
-			} elseif ($propertyObject instanceof IAccountPropertyCollection) {
-				foreach ($propertyObject->getProperties() as $property) {
-					yield $property;
-				}
-			}
-		}
-	}
-
-	public function getFilteredProperties(?string $scope = null, ?string $verified = null): array {
-		$result = $incrementals = [];
-		/** @var IAccountProperty $obj */
-		foreach ($this->getAllProperties() as $obj) {
-			if ($scope !== null && $scope !== $obj->getScope()) {
-				continue;
-			}
-			if ($verified !== null && $verified !== $obj->getVerified()) {
-				continue;
-			}
-			$index = $obj->getName();
-			if ($this->isCollection($index)) {
-				$incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
-				$index .= '#' . $incrementals[$index];
-			}
-			$result[$index] = $obj;
-		}
-		return $result;
-	}
-
-	/** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
-	public function jsonSerialize(): array {
-		$properties = $this->properties;
-		foreach ($properties as $propertyName => $propertyObject) {
-			if ($propertyObject instanceof IAccountPropertyCollection) {
-				// Override collection serialization to discard duplicate name
-				$properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
-			}
-		}
-		return $properties;
-	}
-
-	public function getUser(): IUser {
-		return $this->user;
-	}
-
-	public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
-		$this->properties[$propertyCollection->getName()] = $propertyCollection;
-		return $this;
-	}
-
-	public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection {
-		if (!$this->isCollection($propertyCollectionName)) {
-			throw new PropertyDoesNotExistException($propertyCollectionName);
-		}
-		if (!array_key_exists($propertyCollectionName, $this->properties)) {
-			$this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName);
-		}
-		if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) {
-			throw new RuntimeException('Requested collection is not an IAccountPropertyCollection');
-		}
-		return $this->properties[$propertyCollectionName];
-	}
+    use TAccountsHelper;
+
+    /** @var IAccountPropertyCollection[]|IAccountProperty[] */
+    private array $properties = [];
+
+    public function __construct(
+        private IUser $user,
+    ) {
+    }
+
+    public function setProperty(string $property, string $value, string $scope, string $verified, string $verificationData = ''): IAccount {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('setProperty cannot set an IAccountsPropertyCollection');
+        }
+        $this->properties[$property] = new AccountProperty($property, $value, $scope, $verified, $verificationData);
+        return $this;
+    }
+
+    public function getProperty(string $property): IAccountProperty {
+        if ($this->isCollection($property)) {
+            throw new \InvalidArgumentException('getProperty cannot retrieve an IAccountsPropertyCollection');
+        }
+        if (!array_key_exists($property, $this->properties) || !$this->properties[$property] instanceof IAccountProperty) {
+            throw new PropertyDoesNotExistException($property);
+        }
+        return $this->properties[$property];
+    }
+
+    public function getProperties(): array {
+        return array_filter($this->properties, function ($obj) {
+            return $obj instanceof IAccountProperty;
+        });
+    }
+
+    public function setAllPropertiesFromJson(array $properties): IAccount {
+        foreach ($properties as $propertyName => $propertyObject) {
+            if ($this->isCollection($propertyName)) {
+                $collection = new AccountPropertyCollection($propertyName);
+                /** @var array<int, IAccountProperty> $collectionProperties */
+                $collectionProperties = [];
+                /** @var array<int, array<string, string>> $propertyObject */
+                foreach ($propertyObject as ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData]) {
+                    $collectionProperties[] = new AccountProperty($collection->getName(), $value, $scope, $verified, $verificationData);
+                }
+                $collection->setProperties($collectionProperties);
+                $this->setPropertyCollection($collection);
+            } else {
+                /** @var array<string, string> $propertyObject */
+                ['value' => $value, 'scope' => $scope, 'verified' => $verified, 'verificationData' => $verificationData] = $propertyObject;
+                $this->setProperty($propertyName, $value, $scope, $verified, $verificationData);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getAllProperties(): Generator {
+        foreach ($this->properties as $propertyObject) {
+            if ($propertyObject instanceof IAccountProperty) {
+                yield $propertyObject;
+            } elseif ($propertyObject instanceof IAccountPropertyCollection) {
+                foreach ($propertyObject->getProperties() as $property) {
+                    yield $property;
+                }
+            }
+        }
+    }
+
+    public function getFilteredProperties(?string $scope = null, ?string $verified = null): array {
+        $result = $incrementals = [];
+        /** @var IAccountProperty $obj */
+        foreach ($this->getAllProperties() as $obj) {
+            if ($scope !== null && $scope !== $obj->getScope()) {
+                continue;
+            }
+            if ($verified !== null && $verified !== $obj->getVerified()) {
+                continue;
+            }
+            $index = $obj->getName();
+            if ($this->isCollection($index)) {
+                $incrementals[$index] = ($incrementals[$index] ?? -1) + 1;
+                $index .= '#' . $incrementals[$index];
+            }
+            $result[$index] = $obj;
+        }
+        return $result;
+    }
+
+    /** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
+    public function jsonSerialize(): array {
+        $properties = $this->properties;
+        foreach ($properties as $propertyName => $propertyObject) {
+            if ($propertyObject instanceof IAccountPropertyCollection) {
+                // Override collection serialization to discard duplicate name
+                $properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
+            }
+        }
+        return $properties;
+    }
+
+    public function getUser(): IUser {
+        return $this->user;
+    }
+
+    public function setPropertyCollection(IAccountPropertyCollection $propertyCollection): IAccount {
+        $this->properties[$propertyCollection->getName()] = $propertyCollection;
+        return $this;
+    }
+
+    public function getPropertyCollection(string $propertyCollectionName): IAccountPropertyCollection {
+        if (!$this->isCollection($propertyCollectionName)) {
+            throw new PropertyDoesNotExistException($propertyCollectionName);
+        }
+        if (!array_key_exists($propertyCollectionName, $this->properties)) {
+            $this->properties[$propertyCollectionName] = new AccountPropertyCollection($propertyCollectionName);
+        }
+        if (!$this->properties[$propertyCollectionName] instanceof IAccountPropertyCollection) {
+            throw new RuntimeException('Requested collection is not an IAccountPropertyCollection');
+        }
+        return $this->properties[$propertyCollectionName];
+    }
 }

apps/dav/lib/Command/DeleteCalendar.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 		$user = $input->getArgument('uid');
 		if (!$this->userManager->userExists($user)) {
 			throw new \InvalidArgumentException(
-				'User <' . $user . '> is unknown.');
+				'User <'.$user.'> is unknown.');
 		}
 
 		$birthday = $input->getOption('birthday');
@@ -112,11 +112,11 @@ 
 		}
 
 		$calendarInfo = $this->calDav->getCalendarByUri(
-			'principals/users/' . $user,
+			'principals/users/'.$user,
 			$name);
 		if ($calendarInfo === null) {
 			throw new \InvalidArgumentException(
-				'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
+				'User <'.$user.'> has no calendar named <'.$name.'>. You can run occ dav:list-calendars to list calendars URIs for this user.');
 		}
 
 		$calendar = new Calendar(

Indentation +70 added lines, -70 removed lines

@@ -22,82 +22,82 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteCalendar extends Command {
-	public function __construct(
-		private CalDavBackend $calDav,
-		private IConfig $config,
-		private IL10N $l10n,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private CalDavBackend $calDav,
+        private IConfig $config,
+        private IL10N $l10n,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('dav:delete-calendar')
-			->setDescription('Delete a dav calendar')
-			->addArgument('uid',
-				InputArgument::REQUIRED,
-				'User who owns the calendar')
-			->addArgument('name',
-				InputArgument::OPTIONAL,
-				'Name of the calendar to delete')
-			->addOption('birthday',
-				null,
-				InputOption::VALUE_NONE,
-				'Delete the birthday calendar')
-			->addOption('force',
-				'f',
-				InputOption::VALUE_NONE,
-				'Force delete skipping trashbin');
-	}
+    protected function configure(): void {
+        $this
+            ->setName('dav:delete-calendar')
+            ->setDescription('Delete a dav calendar')
+            ->addArgument('uid',
+                InputArgument::REQUIRED,
+                'User who owns the calendar')
+            ->addArgument('name',
+                InputArgument::OPTIONAL,
+                'Name of the calendar to delete')
+            ->addOption('birthday',
+                null,
+                InputOption::VALUE_NONE,
+                'Delete the birthday calendar')
+            ->addOption('force',
+                'f',
+                InputOption::VALUE_NONE,
+                'Force delete skipping trashbin');
+    }
 
-	protected function execute(
-		InputInterface $input,
-		OutputInterface $output,
-	): int {
-		/** @var string $user */
-		$user = $input->getArgument('uid');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException(
-				'User <' . $user . '> is unknown.');
-		}
+    protected function execute(
+        InputInterface $input,
+        OutputInterface $output,
+    ): int {
+        /** @var string $user */
+        $user = $input->getArgument('uid');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException(
+                'User <' . $user . '> is unknown.');
+        }
 
-		$birthday = $input->getOption('birthday');
-		if ($birthday !== false) {
-			$name = BirthdayService::BIRTHDAY_CALENDAR_URI;
-		} else {
-			/** @var string $name */
-			$name = $input->getArgument('name');
-			if (!$name) {
-				throw new \InvalidArgumentException(
-					'Please specify a calendar name or --birthday');
-			}
-		}
+        $birthday = $input->getOption('birthday');
+        if ($birthday !== false) {
+            $name = BirthdayService::BIRTHDAY_CALENDAR_URI;
+        } else {
+            /** @var string $name */
+            $name = $input->getArgument('name');
+            if (!$name) {
+                throw new \InvalidArgumentException(
+                    'Please specify a calendar name or --birthday');
+            }
+        }
 
-		$calendarInfo = $this->calDav->getCalendarByUri(
-			'principals/users/' . $user,
-			$name);
-		if ($calendarInfo === null) {
-			throw new \InvalidArgumentException(
-				'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
-		}
+        $calendarInfo = $this->calDav->getCalendarByUri(
+            'principals/users/' . $user,
+            $name);
+        if ($calendarInfo === null) {
+            throw new \InvalidArgumentException(
+                'User <' . $user . '> has no calendar named <' . $name . '>. You can run occ dav:list-calendars to list calendars URIs for this user.');
+        }
 
-		$calendar = new Calendar(
-			$this->calDav,
-			$calendarInfo,
-			$this->l10n,
-			$this->config,
-			$this->logger
-		);
+        $calendar = new Calendar(
+            $this->calDav,
+            $calendarInfo,
+            $this->l10n,
+            $this->config,
+            $this->logger
+        );
 
-		$force = $input->getOption('force');
-		if ($force) {
-			$calendar->disableTrashbin();
-		}
+        $force = $input->getOption('force');
+        if ($force) {
+            $calendar->disableTrashbin();
+        }
 
-		$calendar->delete();
+        $calendar->delete();
 
-		return self::SUCCESS;
-	}
+        return self::SUCCESS;
+    }
 }

lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php

Indentation +52 added lines, -52 removed lines

@@ -34,67 +34,67 @@
  * @template-extends QBMapper<PublicKeyCredentialEntity>
  */
 class PublicKeyCredentialMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);
+    }
 
-	public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity {
-		$qb = $this->db->getQueryBuilder();
+    public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId)))
-			);
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId)))
+            );
 
-		return $this->findEntity($qb);
-	}
+        return $this->findEntity($qb);
+    }
 
-	/**
-	 * @return PublicKeyCredentialEntity[]
-	 */
-	public function findAllForUid(string $uid): array {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @return PublicKeyCredentialEntity[]
+     */
+    public function findAllForUid(string $uid): array {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('uid', $qb->createNamedParameter($uid))
-			);
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('uid', $qb->createNamedParameter($uid))
+            );
 
-		return $this->findEntities($qb);
-	}
+        return $this->findEntities($qb);
+    }
 
-	/**
-	 * @param string $uid
-	 * @param int $id
-	 *
-	 * @return PublicKeyCredentialEntity
-	 * @throws DoesNotExistException
-	 */
-	public function findById(string $uid, int $id): PublicKeyCredentialEntity {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @param string $uid
+     * @param int $id
+     *
+     * @return PublicKeyCredentialEntity
+     * @throws DoesNotExistException
+     */
+    public function findById(string $uid, int $id): PublicKeyCredentialEntity {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->andX(
-				$qb->expr()->eq('id', $qb->createNamedParameter($id)),
-				$qb->expr()->eq('uid', $qb->createNamedParameter($uid))
-			));
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->andX(
+                $qb->expr()->eq('id', $qb->createNamedParameter($id)),
+                $qb->expr()->eq('uid', $qb->createNamedParameter($uid))
+            ));
 
-		return $this->findEntity($qb);
-	}
+        return $this->findEntity($qb);
+    }
 
-	/**
-	 * @throws \OCP\DB\Exception
-	 */
-	public function deleteByUid(string $uid) {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @throws \OCP\DB\Exception
+     */
+    public function deleteByUid(string $uid) {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->eq('uid', $qb->createNamedParameter($uid))
-			);
-		$qb->executeStatement();
-	}
+        $qb->delete($this->getTableName())
+            ->where(
+                $qb->expr()->eq('uid', $qb->createNamedParameter($uid))
+            );
+        $qb->executeStatement();
+    }
 }

apps/dav/lib/CalDAV/Trashbin/Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 		PropFind $propFind,
 		INode $node): void {
 		if ($node instanceof DeletedCalendarObject) {
-			$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
+			$propFind->handle(self::PROPERTY_DELETED_AT, function() use ($node) {
 				$ts = $node->getDeletedAt();
 				if ($ts === null) {
 					return null;
@@ -112,12 +112,12 @@ 
 					->setTimestamp($ts)
 					->format(DateTimeInterface::ATOM);
 			});
-			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
+			$propFind->handle(self::PROPERTY_CALENDAR_URI, function() use ($node) {
 				return $node->getCalendarUri();
 			});
 		}
 		if ($node instanceof TrashbinHome) {
-			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
+			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function() use ($node) {
 				return $this->retentionService->getDuration();
 			});
 		}

Indentation +86 added lines, -86 removed lines

@@ -25,90 +25,90 @@
 use function implode;
 
 class Plugin extends ServerPlugin {
-	public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
-	public const PROPERTY_CALENDAR_URI = '{http://nextcloud.com/ns}calendar-uri';
-	public const PROPERTY_RETENTION_DURATION = '{http://nextcloud.com/ns}trash-bin-retention-duration';
-
-	/** @var bool */
-	private $disableTrashbin;
-
-	/** @var Server */
-	private $server;
-
-	public function __construct(
-		IRequest $request,
-		private RetentionService $retentionService,
-	) {
-		$this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
-	}
-
-	public function initialize(Server $server): void {
-		$this->server = $server;
-		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
-		$server->on('propFind', Closure::fromCallable([$this, 'propFind']));
-	}
-
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
-		if (!$this->disableTrashbin) {
-			return;
-		}
-
-		$path = $request->getPath();
-		$pathParts = explode('/', ltrim($path, '/'));
-		if (\count($pathParts) < 3) {
-			// We are looking for a path like calendars/username/calendarname
-			return;
-		}
-
-		// $calendarPath will look like calendars/username/calendarname
-		$calendarPath = implode(
-			'/',
-			array_slice($pathParts, 0, 3)
-		);
-		try {
-			$calendar = $this->server->tree->getNodeForPath($calendarPath);
-			if (!($calendar instanceof Calendar)) {
-				// This is odd
-				return;
-			}
-
-			/** @var Calendar $calendar */
-			$calendar->disableTrashbin();
-		} catch (NotFound $ex) {
-			return;
-		}
-	}
-
-	private function propFind(
-		PropFind $propFind,
-		INode $node): void {
-		if ($node instanceof DeletedCalendarObject) {
-			$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
-				$ts = $node->getDeletedAt();
-				if ($ts === null) {
-					return null;
-				}
-
-				return (new DateTimeImmutable())
-					->setTimestamp($ts)
-					->format(DateTimeInterface::ATOM);
-			});
-			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
-				return $node->getCalendarUri();
-			});
-		}
-		if ($node instanceof TrashbinHome) {
-			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
-				return $this->retentionService->getDuration();
-			});
-		}
-	}
-
-	public function getFeatures(): array {
-		return ['nc-calendar-trashbin'];
-	}
-
-	public function getPluginName(): string {
-		return 'nc-calendar-trashbin';
-	}
+    public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
+    public const PROPERTY_CALENDAR_URI = '{http://nextcloud.com/ns}calendar-uri';
+    public const PROPERTY_RETENTION_DURATION = '{http://nextcloud.com/ns}trash-bin-retention-duration';
+
+    /** @var bool */
+    private $disableTrashbin;
+
+    /** @var Server */
+    private $server;
+
+    public function __construct(
+        IRequest $request,
+        private RetentionService $retentionService,
+    ) {
+        $this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
+    }
+
+    public function initialize(Server $server): void {
+        $this->server = $server;
+        $server->on('beforeMethod:*', [$this, 'beforeMethod']);
+        $server->on('propFind', Closure::fromCallable([$this, 'propFind']));
+    }
+
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
+        if (!$this->disableTrashbin) {
+            return;
+        }
+
+        $path = $request->getPath();
+        $pathParts = explode('/', ltrim($path, '/'));
+        if (\count($pathParts) < 3) {
+            // We are looking for a path like calendars/username/calendarname
+            return;
+        }
+
+        // $calendarPath will look like calendars/username/calendarname
+        $calendarPath = implode(
+            '/',
+            array_slice($pathParts, 0, 3)
+        );
+        try {
+            $calendar = $this->server->tree->getNodeForPath($calendarPath);
+            if (!($calendar instanceof Calendar)) {
+                // This is odd
+                return;
+            }
+
+            /** @var Calendar $calendar */
+            $calendar->disableTrashbin();
+        } catch (NotFound $ex) {
+            return;
+        }
+    }
+
+    private function propFind(
+        PropFind $propFind,
+        INode $node): void {
+        if ($node instanceof DeletedCalendarObject) {
+            $propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
+                $ts = $node->getDeletedAt();
+                if ($ts === null) {
+                    return null;
+                }
+
+                return (new DateTimeImmutable())
+                    ->setTimestamp($ts)
+                    ->format(DateTimeInterface::ATOM);
+            });
+            $propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
+                return $node->getCalendarUri();
+            });
+        }
+        if ($node instanceof TrashbinHome) {
+            $propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
+                return $this->retentionService->getDuration();
+            });
+        }
+    }
+
+    public function getFeatures(): array {
+        return ['nc-calendar-trashbin'];
+    }
+
+    public function getPluginName(): string {
+        return 'nc-calendar-trashbin';
+    }
 }

lib/private/Accounts/Hooks.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			return;
 		}
 
-		if (isset($property) && $property->getValue() !== (string)$newValue) {
+		if (isset($property) && $property->getValue() !== (string) $newValue) {
 			$property->setValue($newValue);
 			$this->accountManager->updateAccount($account);
 		}

Indentation +34 added lines, -34 removed lines

@@ -17,42 +17,42 @@
  * @template-implements IEventListener<UserChangedEvent>
  */
 class Hooks implements IEventListener {
-	public function __construct(
-		private LoggerInterface $logger,
-		private IAccountManager $accountManager,
-	) {
-	}
+    public function __construct(
+        private LoggerInterface $logger,
+        private IAccountManager $accountManager,
+    ) {
+    }
 
-	/**
-	 * update accounts table if email address or display name was changed from outside
-	 */
-	public function changeUserHook(IUser $user, string $feature, $newValue): void {
-		$account = $this->accountManager->getAccount($user);
+    /**
+     * update accounts table if email address or display name was changed from outside
+     */
+    public function changeUserHook(IUser $user, string $feature, $newValue): void {
+        $account = $this->accountManager->getAccount($user);
 
-		try {
-			switch ($feature) {
-				case 'eMailAddress':
-					$property = $account->getProperty(IAccountManager::PROPERTY_EMAIL);
-					break;
-				case 'displayName':
-					$property = $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
-					break;
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			$this->logger->debug($e->getMessage(), ['exception' => $e]);
-			return;
-		}
+        try {
+            switch ($feature) {
+                case 'eMailAddress':
+                    $property = $account->getProperty(IAccountManager::PROPERTY_EMAIL);
+                    break;
+                case 'displayName':
+                    $property = $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
+                    break;
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            $this->logger->debug($e->getMessage(), ['exception' => $e]);
+            return;
+        }
 
-		if (isset($property) && $property->getValue() !== (string)$newValue) {
-			$property->setValue($newValue);
-			$this->accountManager->updateAccount($account);
-		}
-	}
+        if (isset($property) && $property->getValue() !== (string)$newValue) {
+            $property->setValue($newValue);
+            $this->accountManager->updateAccount($account);
+        }
+    }
 
-	public function handle(Event $event): void {
-		if (!$event instanceof UserChangedEvent) {
-			return;
-		}
-		$this->changeUserHook($event->getUser(), $event->getFeature(), $event->getValue());
-	}
+    public function handle(Event $event): void {
+        if (!$event instanceof UserChangedEvent) {
+            return;
+        }
+        $this->changeUserHook($event->getUser(), $event->getFeature(), $event->getValue());
+    }
 }

lib/public/Remote/IUser.php

Indentation +91 added lines, -91 removed lines

@@ -29,107 +29,107 @@
  * @deprecated 23.0.0
  */
 interface IUser {
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getUserId();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getUserId();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getEmail();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getEmail();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getPhone();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getPhone();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getAddress();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getAddress();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getWebsite();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getWebsite();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getTwitter();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getTwitter();
 
-	/**
-	 * @return string[]
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getGroups();
+    /**
+     * @return string[]
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getGroups();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getLanguage();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getLanguage();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getUsedSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getUsedSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getFreeSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getFreeSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getTotalSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getTotalSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getQuota();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getQuota();
 }

lib/public/Remote/ICredentials.php

Indentation +14 added lines, -14 removed lines

@@ -29,19 +29,19 @@
  * @deprecated 23.0.0
  */
 interface ICredentials {
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getUsername();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getUsername();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getPassword();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getPassword();
 }

lib/public/Remote/IInstanceFactory.php

Indentation +8 added lines, -8 removed lines

@@ -27,12 +27,12 @@
  * @deprecated 23.0.0
  */
 interface IInstanceFactory {
-	/**
-	 * @param string $url
-	 * @return IInstance
-	 *
-	 * @since 13.0.0
-	 * @deprecated 23.0.0
-	 */
-	public function getInstance($url);
+    /**
+     * @param string $url
+     * @return IInstance
+     *
+     * @since 13.0.0
+     * @deprecated 23.0.0
+     */
+    public function getInstance($url);
 }