nextcloud / server

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

Indentation +100 added lines, -100 removed lines

@@ -33,104 +33,104 @@
 use Sabre\DAVACL\IACL;
 
 class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
-	use ACLTrait;
-
-	/** @var string */
-	private $name;
-
-	/** @var mixed[] */
-	private $objectData;
-
-	/** @var string */
-	private $principalUri;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	public function __construct(string $name,
-								array $objectData,
-								string $principalUri,
-								CalDavBackend $calDavBackend) {
-		$this->name = $name;
-		$this->objectData = $objectData;
-		$this->calDavBackend = $calDavBackend;
-		$this->principalUri = $principalUri;
-	}
-
-	public function delete() {
-		$this->calDavBackend->deleteCalendarObject(
-			$this->objectData['calendarid'],
-			$this->objectData['uri'],
-			CalDavBackend::CALENDAR_TYPE_CALENDAR,
-			true
-		);
-	}
-
-	public function getName() {
-		return $this->name;
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified() {
-		return 0;
-	}
-
-	public function put($data) {
-		throw new Forbidden();
-	}
-
-	public function get() {
-		return $this->objectData['calendardata'];
-	}
-
-	public function getContentType() {
-		$mime = 'text/calendar; charset=utf-8';
-		if (isset($this->objectData['component']) && $this->objectData['component']) {
-			$mime .= '; component='.$this->objectData['component'];
-		}
-
-		return $mime;
-	}
-
-	public function getETag() {
-		return $this->objectData['etag'];
-	}
-
-	public function getSize() {
-		return (int) $this->objectData['size'];
-	}
-
-	public function restore(): void {
-		$this->calDavBackend->restoreCalendarObject($this->objectData);
-	}
-
-	public function getDeletedAt(): ?int {
-		return $this->objectData['deleted_at'] ? (int) $this->objectData['deleted_at'] : null;
-	}
-
-	public function getCalendarUri(): string {
-		return $this->objectData['calendaruri'];
-	}
-
-	public function getACL(): array {
-		return [
-			[
-				'privilege' => '{DAV:}read', // For queries
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}unbind', // For moving and deletion
-				'principal' => '{DAV:}owner',
-				'protected' => true,
-			],
-		];
-	}
-
-	public function getOwner() {
-		return $this->principalUri;
-	}
+    use ACLTrait;
+
+    /** @var string */
+    private $name;
+
+    /** @var mixed[] */
+    private $objectData;
+
+    /** @var string */
+    private $principalUri;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    public function __construct(string $name,
+                                array $objectData,
+                                string $principalUri,
+                                CalDavBackend $calDavBackend) {
+        $this->name = $name;
+        $this->objectData = $objectData;
+        $this->calDavBackend = $calDavBackend;
+        $this->principalUri = $principalUri;
+    }
+
+    public function delete() {
+        $this->calDavBackend->deleteCalendarObject(
+            $this->objectData['calendarid'],
+            $this->objectData['uri'],
+            CalDavBackend::CALENDAR_TYPE_CALENDAR,
+            true
+        );
+    }
+
+    public function getName() {
+        return $this->name;
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified() {
+        return 0;
+    }
+
+    public function put($data) {
+        throw new Forbidden();
+    }
+
+    public function get() {
+        return $this->objectData['calendardata'];
+    }
+
+    public function getContentType() {
+        $mime = 'text/calendar; charset=utf-8';
+        if (isset($this->objectData['component']) && $this->objectData['component']) {
+            $mime .= '; component='.$this->objectData['component'];
+        }
+
+        return $mime;
+    }
+
+    public function getETag() {
+        return $this->objectData['etag'];
+    }
+
+    public function getSize() {
+        return (int) $this->objectData['size'];
+    }
+
+    public function restore(): void {
+        $this->calDavBackend->restoreCalendarObject($this->objectData);
+    }
+
+    public function getDeletedAt(): ?int {
+        return $this->objectData['deleted_at'] ? (int) $this->objectData['deleted_at'] : null;
+    }
+
+    public function getCalendarUri(): string {
+        return $this->objectData['calendaruri'];
+    }
+
+    public function getACL(): array {
+        return [
+            [
+                'privilege' => '{DAV:}read', // For queries
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}unbind', // For moving and deletion
+                'principal' => '{DAV:}owner',
+                'protected' => true,
+            ],
+        ];
+    }
+
+    public function getOwner() {
+        return $this->principalUri;
+    }
 }

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

Indentation +93 added lines, -93 removed lines

@@ -36,97 +36,97 @@
 use function preg_match;
 
 class DeletedCalendarObjectsCollection implements ICalendarObjectContainer {
-	public const NAME = 'objects';
-
-	/** @var CalDavBackend */
-	protected $caldavBackend;
-
-	/** @var mixed[] */
-	private $principalInfo;
-
-	public function __construct(CalDavBackend $caldavBackend,
-								array $principalInfo) {
-		$this->caldavBackend = $caldavBackend;
-		$this->principalInfo = $principalInfo;
-	}
-
-	/**
-	 * @see \OCA\DAV\CalDAV\Trashbin\DeletedCalendarObjectsCollection::calendarQuery
-	 */
-	public function getChildren() {
-		throw new NotImplemented();
-	}
-
-	public function getChild($name) {
-		if (!preg_match("/(\d+)\\.ics/", $name, $matches)) {
-			throw new NotFound();
-		}
-
-		$data = $this->caldavBackend->getCalendarObjectById(
-			$this->principalInfo['uri'],
-			(int) $matches[1],
-		);
-
-		// If the object hasn't been deleted yet then we don't want to find it here
-		if ($data === null) {
-			throw new NotFound();
-		}
-		if (!isset($data['deleted_at'])) {
-			throw new BadRequest('The calendar object you\'re trying to restore is not marked as deleted');
-		}
-
-		return new DeletedCalendarObject(
-			$this->getRelativeObjectPath($data),
-			$data,
-			$this->principalInfo['uri'],
-			$this->caldavBackend
-		);
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function childExists($name) {
-		try {
-			$this->getChild($name);
-		} catch (NotFound $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return self::NAME;
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
-
-	public function calendarQuery(array $filters) {
-		return array_map(function (array $calendarObjectInfo) {
-			return $this->getRelativeObjectPath($calendarObjectInfo);
-		}, $this->caldavBackend->getDeletedCalendarObjectsByPrincipal($this->principalInfo['uri']));
-	}
-
-	private function getRelativeObjectPath(array $calendarInfo): string {
-		return implode(
-			'.',
-			[$calendarInfo['id'], 'ics'],
-		);
-	}
+    public const NAME = 'objects';
+
+    /** @var CalDavBackend */
+    protected $caldavBackend;
+
+    /** @var mixed[] */
+    private $principalInfo;
+
+    public function __construct(CalDavBackend $caldavBackend,
+                                array $principalInfo) {
+        $this->caldavBackend = $caldavBackend;
+        $this->principalInfo = $principalInfo;
+    }
+
+    /**
+     * @see \OCA\DAV\CalDAV\Trashbin\DeletedCalendarObjectsCollection::calendarQuery
+     */
+    public function getChildren() {
+        throw new NotImplemented();
+    }
+
+    public function getChild($name) {
+        if (!preg_match("/(\d+)\\.ics/", $name, $matches)) {
+            throw new NotFound();
+        }
+
+        $data = $this->caldavBackend->getCalendarObjectById(
+            $this->principalInfo['uri'],
+            (int) $matches[1],
+        );
+
+        // If the object hasn't been deleted yet then we don't want to find it here
+        if ($data === null) {
+            throw new NotFound();
+        }
+        if (!isset($data['deleted_at'])) {
+            throw new BadRequest('The calendar object you\'re trying to restore is not marked as deleted');
+        }
+
+        return new DeletedCalendarObject(
+            $this->getRelativeObjectPath($data),
+            $data,
+            $this->principalInfo['uri'],
+            $this->caldavBackend
+        );
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function childExists($name) {
+        try {
+            $this->getChild($name);
+        } catch (NotFound $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return self::NAME;
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
+
+    public function calendarQuery(array $filters) {
+        return array_map(function (array $calendarObjectInfo) {
+            return $this->getRelativeObjectPath($calendarObjectInfo);
+        }, $this->caldavBackend->getDeletedCalendarObjectsByPrincipal($this->principalInfo['uri']));
+    }
+
+    private function getRelativeObjectPath(array $calendarInfo): string {
+        return implode(
+            '.',
+            [$calendarInfo['id'], 'ics'],
+        );
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	}
 
 	public function calendarQuery(array $filters) {
-		return array_map(function (array $calendarObjectInfo) {
+		return array_map(function(array $calendarObjectInfo) {
 			return $this->getRelativeObjectPath($calendarObjectInfo);
 		}, $this->caldavBackend->getDeletedCalendarObjectsByPrincipal($this->principalInfo['uri']));
 	}