nextcloud / server

core/Command/TwoFactorAuth/Enforce.php

Spacing +2 added lines, -2 removed lines

@@ -98,10 +98,10 @@
 		if (empty($state->getEnforcedGroups())) {
 			$message = 'Two-factor authentication is enforced for all users';
 		} else {
-			$message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
+			$message = 'Two-factor authentication is enforced for members of the group(s) '.implode(', ', $state->getEnforcedGroups());
 		}
 		if (!empty($state->getExcludedGroups())) {
-			$message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
+			$message .= ', except members of '.implode(', ', $state->getExcludedGroups());
 		}
 		$output->writeln($message);
 	}

Indentation +63 added lines, -63 removed lines

@@ -17,72 +17,72 @@
 use function implode;
 
 class Enforce extends Command {
-	public function __construct(
-		private MandatoryTwoFactor $mandatoryTwoFactor,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private MandatoryTwoFactor $mandatoryTwoFactor,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this->setName('twofactorauth:enforce');
-		$this->setDescription('Enabled/disable enforced two-factor authentication');
-		$this->addOption(
-			'on',
-			null,
-			InputOption::VALUE_NONE,
-			'enforce two-factor authentication'
-		);
-		$this->addOption(
-			'off',
-			null,
-			InputOption::VALUE_NONE,
-			'don\'t enforce two-factor authenticaton'
-		);
-		$this->addOption(
-			'group',
-			null,
-			InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-			'enforce only for the given group(s)'
-		);
-		$this->addOption(
-			'exclude',
-			null,
-			InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-			'exclude mandatory two-factor auth for the given group(s)'
-		);
-	}
+    protected function configure() {
+        $this->setName('twofactorauth:enforce');
+        $this->setDescription('Enabled/disable enforced two-factor authentication');
+        $this->addOption(
+            'on',
+            null,
+            InputOption::VALUE_NONE,
+            'enforce two-factor authentication'
+        );
+        $this->addOption(
+            'off',
+            null,
+            InputOption::VALUE_NONE,
+            'don\'t enforce two-factor authenticaton'
+        );
+        $this->addOption(
+            'group',
+            null,
+            InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+            'enforce only for the given group(s)'
+        );
+        $this->addOption(
+            'exclude',
+            null,
+            InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+            'exclude mandatory two-factor auth for the given group(s)'
+        );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($input->getOption('on')) {
-			$enforcedGroups = $input->getOption('group');
-			$excludedGroups = $input->getOption('exclude');
-			$this->mandatoryTwoFactor->setState(new EnforcementState(true, $enforcedGroups, $excludedGroups));
-		} elseif ($input->getOption('off')) {
-			$this->mandatoryTwoFactor->setState(new EnforcementState(false));
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($input->getOption('on')) {
+            $enforcedGroups = $input->getOption('group');
+            $excludedGroups = $input->getOption('exclude');
+            $this->mandatoryTwoFactor->setState(new EnforcementState(true, $enforcedGroups, $excludedGroups));
+        } elseif ($input->getOption('off')) {
+            $this->mandatoryTwoFactor->setState(new EnforcementState(false));
+        }
 
-		$state = $this->mandatoryTwoFactor->getState();
-		if ($state->isEnforced()) {
-			$this->writeEnforced($output, $state);
-		} else {
-			$this->writeNotEnforced($output);
-		}
-		return 0;
-	}
+        $state = $this->mandatoryTwoFactor->getState();
+        if ($state->isEnforced()) {
+            $this->writeEnforced($output, $state);
+        } else {
+            $this->writeNotEnforced($output);
+        }
+        return 0;
+    }
 
-	protected function writeEnforced(OutputInterface $output, EnforcementState $state) {
-		if (empty($state->getEnforcedGroups())) {
-			$message = 'Two-factor authentication is enforced for all users';
-		} else {
-			$message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
-		}
-		if (!empty($state->getExcludedGroups())) {
-			$message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
-		}
-		$output->writeln($message);
-	}
+    protected function writeEnforced(OutputInterface $output, EnforcementState $state) {
+        if (empty($state->getEnforcedGroups())) {
+            $message = 'Two-factor authentication is enforced for all users';
+        } else {
+            $message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
+        }
+        if (!empty($state->getExcludedGroups())) {
+            $message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
+        }
+        $output->writeln($message);
+    }
 
-	protected function writeNotEnforced(OutputInterface $output) {
-		$output->writeln('Two-factor authentication is not enforced');
-	}
+    protected function writeNotEnforced(OutputInterface $output) {
+        $output->writeln('Two-factor authentication is not enforced');
+    }
 }

apps/dav/lib/CalDAV/Outbox.php

Spacing +11 added lines, -11 removed lines

@@ -74,12 +74,12 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		];
@@ -94,23 +94,23 @@ 
 		if ($this->disableFreeBusy) {
 			return array_merge($commonAcl, [
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 			]);
@@ -118,13 +118,13 @@ 
 
 		return array_merge($commonAcl, [
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		]);

Indentation +91 added lines, -91 removed lines

@@ -15,101 +15,101 @@
  */
 class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
 
-	/** @var null|bool */
-	private $disableFreeBusy = null;
+    /** @var null|bool */
+    private $disableFreeBusy = null;
 
-	/**
-	 * Outbox constructor.
-	 *
-	 * @param IConfig $config
-	 * @param string $principalUri
-	 */
-	public function __construct(
-		private IConfig $config,
-		string $principalUri,
-	) {
-		parent::__construct($principalUri);
-	}
+    /**
+     * Outbox constructor.
+     *
+     * @param IConfig $config
+     * @param string $principalUri
+     */
+    public function __construct(
+        private IConfig $config,
+        string $principalUri,
+    ) {
+        parent::__construct($principalUri);
+    }
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		// getACL is called so frequently that we cache the config result
-		if ($this->disableFreeBusy === null) {
-			$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
-		}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        // getACL is called so frequently that we cache the config result
+        if ($this->disableFreeBusy === null) {
+            $this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
+        }
 
-		$commonAcl = [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		];
+        $commonAcl = [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ];
 
-		// schedule-send is an aggregate privilege for:
-		// - schedule-send-invite
-		// - schedule-send-reply
-		// - schedule-send-freebusy
-		//
-		// If FreeBusy is disabled, we have to remove the latter privilege
+        // schedule-send is an aggregate privilege for:
+        // - schedule-send-invite
+        // - schedule-send-reply
+        // - schedule-send-freebusy
+        //
+        // If FreeBusy is disabled, we have to remove the latter privilege
 
-		if ($this->disableFreeBusy) {
-			return array_merge($commonAcl, [
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-			]);
-		}
+        if ($this->disableFreeBusy) {
+            return array_merge($commonAcl, [
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+            ]);
+        }
 
-		return array_merge($commonAcl, [
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		]);
-	}
+        return array_merge($commonAcl, [
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ]);
+    }
 }

apps/files_trashbin/lib/Trash/ITrashManager.php

Indentation +26 added lines, -26 removed lines

@@ -24,33 +24,33 @@
 use OCP\IUser;
 
 interface ITrashManager extends ITrashBackend {
-	/**
-	 * Add a backend for the trashbin
-	 *
-	 * @param string $storageType
-	 * @param ITrashBackend $backend
-	 * @since 15.0.0
-	 */
-	public function registerBackend(string $storageType, ITrashBackend $backend);
+    /**
+     * Add a backend for the trashbin
+     *
+     * @param string $storageType
+     * @param ITrashBackend $backend
+     * @since 15.0.0
+     */
+    public function registerBackend(string $storageType, ITrashBackend $backend);
 
-	/**
-	 * List all trash items in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashRoot(IUser $user): array;
+    /**
+     * List all trash items in the root of the trashbin
+     *
+     * @param IUser $user
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashRoot(IUser $user): array;
 
-	/**
-	 * Temporally prevent files from being moved to the trash
-	 *
-	 * @since 15.0.0
-	 */
-	public function pauseTrash();
+    /**
+     * Temporally prevent files from being moved to the trash
+     *
+     * @since 15.0.0
+     */
+    public function pauseTrash();
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function resumeTrash();
+    /**
+     * @since 15.0.0
+     */
+    public function resumeTrash();
 }

apps/files_trashbin/lib/Trash/ITrashBackend.php

Indentation +45 added lines, -45 removed lines

@@ -31,54 +31,54 @@
  * @since 15.0.0
  */
 interface ITrashBackend {
-	/**
-	 * List all trash items in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashRoot(IUser $user): array;
+    /**
+     * List all trash items in the root of the trashbin
+     *
+     * @param IUser $user
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashRoot(IUser $user): array;
 
-	/**
-	 * List all trash items in a subfolder in the trashbin
-	 *
-	 * @param ITrashItem $folder
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashFolder(ITrashItem $folder): array;
+    /**
+     * List all trash items in a subfolder in the trashbin
+     *
+     * @param ITrashItem $folder
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashFolder(ITrashItem $folder): array;
 
-	/**
-	 * Restore a trashbin item
-	 *
-	 * @param ITrashItem $item
-	 * @since 15.0.0
-	 */
-	public function restoreItem(ITrashItem $item);
+    /**
+     * Restore a trashbin item
+     *
+     * @param ITrashItem $item
+     * @since 15.0.0
+     */
+    public function restoreItem(ITrashItem $item);
 
-	/**
-	 * Permanently remove an item from trash
-	 *
-	 * @param ITrashItem $item
-	 * @since 15.0.0
-	 */
-	public function removeItem(ITrashItem $item);
+    /**
+     * Permanently remove an item from trash
+     *
+     * @param ITrashItem $item
+     * @since 15.0.0
+     */
+    public function removeItem(ITrashItem $item);
 
-	/**
-	 * Move a file or folder to trash
-	 *
-	 * @param IStorage $storage
-	 * @param string $internalPath
-	 * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
-	 * @since 15.0.0
-	 */
-	public function moveToTrash(IStorage $storage, string $internalPath): bool;
+    /**
+     * Move a file or folder to trash
+     *
+     * @param IStorage $storage
+     * @param string $internalPath
+     * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
+     * @since 15.0.0
+     */
+    public function moveToTrash(IStorage $storage, string $internalPath): bool;
 
-	/**
-	 * @param IUser $user
-	 * @param int $fileId
-	 * @return Node|null
-	 */
-	public function getTrashNodeById(IUser $user, int $fileId);
+    /**
+     * @param IUser $user
+     * @param int $fileId
+     * @return Node|null
+     */
+    public function getTrashNodeById(IUser $user, int $fileId);
 }

apps/files_trashbin/lib/Sabre/TrashRoot.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashRoot($this->user);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolder($this->trashManager, $entry);
 			}

Indentation +70 added lines, -70 removed lines

@@ -20,74 +20,74 @@
 
 class TrashRoot implements ICollection {
 
-	public function __construct(
-		private IUser $user,
-		private ITrashManager $trashManager,
-	) {
-	}
-
-	public function delete() {
-		if (!ConfigService::getDeleteFromTrashEnabled()) {
-			throw new Forbidden('Not allowed to delete items from the trash bin');
-		}
-
-		Trashbin::deleteAll();
-		foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
-			$this->trashManager->removeItem($trashItem);
-		}
-	}
-
-	public function getName(): string {
-		return 'trash';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this trashbin');
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Not allowed to create files in the trashbin');
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Not allowed to create folders in the trashbin');
-	}
-
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashRoot($this->user);
-
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolder($this->trashManager, $entry);
-			}
-			return new TrashFile($this->trashManager, $entry);
-		}, $entries);
-
-		return $children;
-	}
-
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
-
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function __construct(
+        private IUser $user,
+        private ITrashManager $trashManager,
+    ) {
+    }
+
+    public function delete() {
+        if (!ConfigService::getDeleteFromTrashEnabled()) {
+            throw new Forbidden('Not allowed to delete items from the trash bin');
+        }
+
+        Trashbin::deleteAll();
+        foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
+            $this->trashManager->removeItem($trashItem);
+        }
+    }
+
+    public function getName(): string {
+        return 'trash';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this trashbin');
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Not allowed to create files in the trashbin');
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Not allowed to create folders in the trashbin');
+    }
+
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashRoot($this->user);
+
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolder($this->trashManager, $entry);
+            }
+            return new TrashFile($this->trashManager, $entry);
+        }, $entries);
+
+        return $children;
+    }
+
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
+
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolderFolder($this->trashManager, $entry);
 			}

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
 use Sabre\DAV\ICollection;
 
 abstract class AbstractTrashFolder extends AbstractTrash implements ICollection, ITrash {
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashFolder($this->data);
-
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolderFolder($this->trashManager, $entry);
-			}
-			return new TrashFolderFile($this->trashManager, $entry);
-		}, $entries);
-
-		return $children;
-	}
-
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
-
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashFolder($this->data);
+
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolderFolder($this->trashManager, $entry);
+            }
+            return new TrashFolderFile($this->trashManager, $entry);
+        }, $entries);
+
+        return $children;
+    }
+
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
+
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 }

apps/files_versions/lib/Sabre/VersionCollection.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	public function getChildren(): array {
 		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
 
-		return array_map(function (IVersion $version) {
+		return array_map(function(IVersion $version) {
 			return new VersionFile($version, $this->versionManager);
 		}, $versions);
 	}
@@ -97,7 +97,7 @@ 
 	}
 
 	public function getName(): string {
-		return (string)$this->file->getId();
+		return (string) $this->file->getId();
 	}
 
 	public function setName($name) {

Indentation +60 added lines, -60 removed lines

@@ -18,64 +18,64 @@
 
 class VersionCollection implements ICollection {
 
-	public function __construct(
-		private File $file,
-		private IUser $user,
-		private IVersionManager $versionManager,
-	) {
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		/** @var VersionFile[] $versions */
-		$versions = $this->getChildren();
-
-		foreach ($versions as $version) {
-			if ($version->getName() === $name) {
-				return $version;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function getChildren(): array {
-		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
-
-		return array_map(function (IVersion $version) {
-			return new VersionFile($version, $this->versionManager);
-		}, $versions);
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->file->getId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function __construct(
+        private File $file,
+        private IUser $user,
+        private IVersionManager $versionManager,
+    ) {
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        /** @var VersionFile[] $versions */
+        $versions = $this->getChildren();
+
+        foreach ($versions as $version) {
+            if ($version->getName() === $name) {
+                return $version;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function getChildren(): array {
+        $versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
+
+        return array_map(function (IVersion $version) {
+            return new VersionFile($version, $this->versionManager);
+        }, $versions);
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->file->getId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105112049.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105112049 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source_copy');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source_copy');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105104833.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105104833 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }