nextcloud / server

lib/private/Files/Node/NonExistingFolder.php

Indentation +143 added lines, -143 removed lines

@@ -27,147 +27,147 @@
 use OCP\Files\NotFoundException;
 
 class NonExistingFolder extends Folder {
-	/**
-	 * @param string $newPath
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function rename($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function delete() {
-		throw new NotFoundException();
-	}
-
-	public function copy($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function touch($mtime = null) {
-		throw new NotFoundException();
-	}
-
-	public function getId() {
-		if ($this->fileInfo) {
-			return parent::getId();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function stat() {
-		throw new NotFoundException();
-	}
-
-	public function getMTime() {
-		if ($this->fileInfo) {
-			return parent::getMTime();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getSize($includeMounts = true) {
-		if ($this->fileInfo) {
-			return parent::getSize($includeMounts);
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getEtag() {
-		if ($this->fileInfo) {
-			return parent::getEtag();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getPermissions() {
-		if ($this->fileInfo) {
-			return parent::getPermissions();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isReadable() {
-		if ($this->fileInfo) {
-			return parent::isReadable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isUpdateable() {
-		if ($this->fileInfo) {
-			return parent::isUpdateable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isDeletable() {
-		if ($this->fileInfo) {
-			return parent::isDeletable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isShareable() {
-		if ($this->fileInfo) {
-			return parent::isShareable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function get($path) {
-		throw new NotFoundException();
-	}
-
-	public function getDirectoryListing() {
-		throw new NotFoundException();
-	}
-
-	public function nodeExists($path) {
-		return false;
-	}
-
-	public function newFolder($path) {
-		throw new NotFoundException();
-	}
-
-	public function newFile($path, $content = null) {
-		throw new NotFoundException();
-	}
-
-	public function search($pattern) {
-		throw new NotFoundException();
-	}
-
-	public function searchByMime($mime) {
-		throw new NotFoundException();
-	}
-
-	public function searchByTag($tag, $userId) {
-		throw new NotFoundException();
-	}
-
-	public function getById($id) {
-		throw new NotFoundException();
-	}
-
-	public function getFreeSpace() {
-		throw new NotFoundException();
-	}
-
-	public function isCreatable() {
-		if ($this->fileInfo) {
-			return parent::isCreatable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
+    /**
+     * @param string $newPath
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function rename($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function delete() {
+        throw new NotFoundException();
+    }
+
+    public function copy($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function touch($mtime = null) {
+        throw new NotFoundException();
+    }
+
+    public function getId() {
+        if ($this->fileInfo) {
+            return parent::getId();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function stat() {
+        throw new NotFoundException();
+    }
+
+    public function getMTime() {
+        if ($this->fileInfo) {
+            return parent::getMTime();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getSize($includeMounts = true) {
+        if ($this->fileInfo) {
+            return parent::getSize($includeMounts);
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getEtag() {
+        if ($this->fileInfo) {
+            return parent::getEtag();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getPermissions() {
+        if ($this->fileInfo) {
+            return parent::getPermissions();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isReadable() {
+        if ($this->fileInfo) {
+            return parent::isReadable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isUpdateable() {
+        if ($this->fileInfo) {
+            return parent::isUpdateable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isDeletable() {
+        if ($this->fileInfo) {
+            return parent::isDeletable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isShareable() {
+        if ($this->fileInfo) {
+            return parent::isShareable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function get($path) {
+        throw new NotFoundException();
+    }
+
+    public function getDirectoryListing() {
+        throw new NotFoundException();
+    }
+
+    public function nodeExists($path) {
+        return false;
+    }
+
+    public function newFolder($path) {
+        throw new NotFoundException();
+    }
+
+    public function newFile($path, $content = null) {
+        throw new NotFoundException();
+    }
+
+    public function search($pattern) {
+        throw new NotFoundException();
+    }
+
+    public function searchByMime($mime) {
+        throw new NotFoundException();
+    }
+
+    public function searchByTag($tag, $userId) {
+        throw new NotFoundException();
+    }
+
+    public function getById($id) {
+        throw new NotFoundException();
+    }
+
+    public function getFreeSpace() {
+        throw new NotFoundException();
+    }
+
+    public function isCreatable() {
+        if ($this->fileInfo) {
+            return parent::isCreatable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
 }

lib/public/Share/Events/VerifyMountPointEvent.php

Indentation +41 added lines, -41 removed lines

@@ -33,51 +33,51 @@
  */
 class VerifyMountPointEvent extends Event {
 
-	/** @var IShare */
-	private $share;
-	/** @var View */
-	private $view;
-	/** @var string */
-	private $parent;
+    /** @var IShare */
+    private $share;
+    /** @var View */
+    private $view;
+    /** @var string */
+    private $parent;
 
-	/**
-	 * @since 19.0.0
-	 */
-	public function __construct(IShare $share,
-								View $view,
-								string $parent) {
-		parent::__construct();
+    /**
+     * @since 19.0.0
+     */
+    public function __construct(IShare $share,
+                                View $view,
+                                string $parent) {
+        parent::__construct();
 
-		$this->share = $share;
-		$this->view = $view;
-		$this->parent = $parent;
-	}
+        $this->share = $share;
+        $this->view = $view;
+        $this->parent = $parent;
+    }
 
-	/**
-	 * @since 19.0.0
-	 */
-	public function getShare(): IShare {
-		return $this->share;
-	}
+    /**
+     * @since 19.0.0
+     */
+    public function getShare(): IShare {
+        return $this->share;
+    }
 
-	/**
-	 * @since 19.0.0
-	 */
-	public function getView(): View {
-		return $this->view;
-	}
+    /**
+     * @since 19.0.0
+     */
+    public function getView(): View {
+        return $this->view;
+    }
 
-	/**
-	 * @since 19.0.0
-	 */
-	public function getParent(): string {
-		return $this->parent;
-	}
+    /**
+     * @since 19.0.0
+     */
+    public function getParent(): string {
+        return $this->parent;
+    }
 
-	/**
-	 * @since 19.0.0
-	 */
-	public function setParent(string $parent): void {
-		$this->parent = $parent;
-	}
+    /**
+     * @since 19.0.0
+     */
+    public function setParent(string $parent): void {
+        $this->parent = $parent;
+    }
 }

apps/files_versions/lib/Versions/IVersionBackend.php

Indentation +55 added lines, -55 removed lines

@@ -37,64 +37,64 @@
  * @since 15.0.0
  */
 interface IVersionBackend {
-	/**
-	 * Whether or not this version backend should be used for a storage
-	 *
-	 * If false is returned then the next applicable backend will be used
-	 *
-	 * @param IStorage $storage
-	 * @return bool
-	 * @since 17.0.0
-	 */
-	public function useBackendForStorage(IStorage $storage): bool;
+    /**
+     * Whether or not this version backend should be used for a storage
+     *
+     * If false is returned then the next applicable backend will be used
+     *
+     * @param IStorage $storage
+     * @return bool
+     * @since 17.0.0
+     */
+    public function useBackendForStorage(IStorage $storage): bool;
 
-	/**
-	 * Get all versions for a file
-	 *
-	 * @param IUser $user
-	 * @param FileInfo $file
-	 * @return IVersion[]
-	 * @since 15.0.0
-	 */
-	public function getVersionsForFile(IUser $user, FileInfo $file): array;
+    /**
+     * Get all versions for a file
+     *
+     * @param IUser $user
+     * @param FileInfo $file
+     * @return IVersion[]
+     * @since 15.0.0
+     */
+    public function getVersionsForFile(IUser $user, FileInfo $file): array;
 
-	/**
-	 * Create a new version for a file
-	 *
-	 * @param IUser $user
-	 * @param FileInfo $file
-	 * @since 15.0.0
-	 */
-	public function createVersion(IUser $user, FileInfo $file);
+    /**
+     * Create a new version for a file
+     *
+     * @param IUser $user
+     * @param FileInfo $file
+     * @since 15.0.0
+     */
+    public function createVersion(IUser $user, FileInfo $file);
 
-	/**
-	 * Restore this version
-	 *
-	 * @param IVersion $version
-	 * @since 15.0.0
-	 */
-	public function rollback(IVersion $version);
+    /**
+     * Restore this version
+     *
+     * @param IVersion $version
+     * @since 15.0.0
+     */
+    public function rollback(IVersion $version);
 
-	/**
-	 * Open the file for reading
-	 *
-	 * @param IVersion $version
-	 * @return resource
-	 * @throws NotFoundException
-	 * @since 15.0.0
-	 */
-	public function read(IVersion $version);
+    /**
+     * Open the file for reading
+     *
+     * @param IVersion $version
+     * @return resource
+     * @throws NotFoundException
+     * @since 15.0.0
+     */
+    public function read(IVersion $version);
 
-	/**
-	 * Get the preview for a specific version of a file
-	 *
-	 * @param IUser $user
-	 * @param FileInfo $sourceFile
-	 * @param int|string $revision
-	 *
-	 * @return File
-	 *
-	 * @since 15.0.0
-	 */
-	public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File;
+    /**
+     * Get the preview for a specific version of a file
+     *
+     * @param IUser $user
+     * @param FileInfo $sourceFile
+     * @param int|string $revision
+     *
+     * @return File
+     *
+     * @since 15.0.0
+     */
+    public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File;
 }

lib/private/Authentication/TwoFactorAuth/EnforcementState.php

Indentation +45 added lines, -45 removed lines

@@ -30,57 +30,57 @@
 
 class EnforcementState implements JsonSerializable {
 
-	/** @var bool */
-	private $enforced;
+    /** @var bool */
+    private $enforced;
 
-	/** @var array */
-	private $enforcedGroups;
+    /** @var array */
+    private $enforcedGroups;
 
-	/** @var array */
-	private $excludedGroups;
+    /** @var array */
+    private $excludedGroups;
 
-	/**
-	 * EnforcementState constructor.
-	 *
-	 * @param bool $enforced
-	 * @param string[] $enforcedGroups
-	 * @param string[] $excludedGroups
-	 */
-	public function __construct(bool $enforced,
-								array $enforcedGroups = [],
-								array $excludedGroups = []) {
-		$this->enforced = $enforced;
-		$this->enforcedGroups = $enforcedGroups;
-		$this->excludedGroups = $excludedGroups;
-	}
+    /**
+     * EnforcementState constructor.
+     *
+     * @param bool $enforced
+     * @param string[] $enforcedGroups
+     * @param string[] $excludedGroups
+     */
+    public function __construct(bool $enforced,
+                                array $enforcedGroups = [],
+                                array $excludedGroups = []) {
+        $this->enforced = $enforced;
+        $this->enforcedGroups = $enforcedGroups;
+        $this->excludedGroups = $excludedGroups;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function isEnforced(): bool {
-		return $this->enforced;
-	}
+    /**
+     * @return bool
+     */
+    public function isEnforced(): bool {
+        return $this->enforced;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getEnforcedGroups(): array {
-		return $this->enforcedGroups;
-	}
+    /**
+     * @return string[]
+     */
+    public function getEnforcedGroups(): array {
+        return $this->enforcedGroups;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getExcludedGroups(): array {
-		return $this->excludedGroups;
-	}
+    /**
+     * @return string[]
+     */
+    public function getExcludedGroups(): array {
+        return $this->excludedGroups;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'enforced' => $this->enforced,
-			'enforcedGroups' => $this->enforcedGroups,
-			'excludedGroups' => $this->excludedGroups,
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'enforced' => $this->enforced,
+            'enforcedGroups' => $this->enforcedGroups,
+            'excludedGroups' => $this->excludedGroups,
+        ];
+    }
 
 }

apps/files/lib/Activity/Provider.php

Spacing +5 added lines, -5 removed lines

@@ -124,9 +124,9 @@ 
 
 	protected function setIcon(IEvent $event, string $icon, string $app = 'files') {
 		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.png')));
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon.'.png')));
 		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.svg')));
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon.'.svg')));
 		}
 	}
 
@@ -245,7 +245,7 @@ 
 		}
 
 		if ($this->fileIsEncrypted) {
-			$event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters());
+			$event->setSubject($event->getSubject().'_enc', $event->getSubjectParameters());
 		}
 
 		if (!isset($parsedParameters['user'])) {
@@ -272,7 +272,7 @@ 
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = $parameter['path'];
 			} else {
@@ -538,7 +538,7 @@ 
 				$lowerSearch = strtolower($search);
 				foreach ($cloudIds as $cloudId) {
 					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+						$this->displayNames[$search] = $contact['FN']." ($cloudId)";
 						return $this->displayNames[$search];
 					}
 				}

Indentation +545 added lines, -545 removed lines

@@ -44,549 +44,549 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-	/** @var IL10N */
-	protected $activityLang;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var string[] cached displayNames - key is the cloud id and value the displayname */
-	protected $displayNames = [];
-
-	protected $fileIsEncrypted = false;
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								ICloudIdManager $cloudIdManager,
-								IContactsManager $contactsManager,
-								IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->contactsManager = $contactsManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'files') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files', $language);
-		$this->activityLang = $this->languageFactory->get('activity', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event, $previousEvent);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	protected function setIcon(IEvent $event, string $icon, string $app = 'files') {
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.svg')));
-		}
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('Created by {user}');
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('Changed by {user}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('Deleted by {user}');
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('Restored by {user}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'renamed_by') {
-			$subject = $this->l->t('Renamed by {user}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('Moved by {user}');
-			$this->setIcon($event, 'change');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if (!isset($parsedParameters['user'])) {
-			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-		$this->fileIsEncrypted = false;
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_self') {
-			$subject = $this->l->t('You created {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You created an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('{user} created {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} created an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'created_public') {
-			$subject = $this->l->t('{file} was created in a public folder');
-			$this->setIcon($event, 'add-color');
-		} elseif ($event->getSubject() === 'changed_self') {
-			$subject = $this->l->t('You changed {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You changed an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('{user} changed {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} changed an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'deleted_self') {
-			$subject = $this->l->t('You deleted {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('You deleted an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('{user} deleted {file}');
-			if ($this->fileIsEncrypted) {
-				$subject = $this->l->t('{user} deleted an encrypted file in {file}');
-			}
-			$this->setIcon($event, 'delete-color');
-		} elseif ($event->getSubject() === 'restored_self') {
-			$subject = $this->l->t('You restored {file}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('{user} restored {file}');
-			$this->setIcon($event, 'actions/history', 'core');
-		} elseif ($event->getSubject() === 'renamed_self') {
-			$oldFileName = $parsedParameters['oldfile']['name'];
-			$newFileName = $parsedParameters['newfile']['name'];
-
-			if ($this->isHiddenFile($oldFileName)) {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
-				}
-			} else {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('You renamed {oldfile} to {newfile}');
-				}
-			}
-
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'renamed_by') {
-			$oldFileName = $parsedParameters['oldfile']['name'];
-			$newFileName = $parsedParameters['newfile']['name'];
-
-			if ($this->isHiddenFile($oldFileName)) {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
-				}
-			} else {
-				if ($this->isHiddenFile($newFileName)) {
-					$subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
-				} else {
-					$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
-				}
-			}
-
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_self') {
-			$subject = $this->l->t('You moved {oldfile} to {newfile}');
-			$this->setIcon($event, 'change');
-		} elseif ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('{user} moved {oldfile} to {newfile}');
-			$this->setIcon($event, 'change');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->fileIsEncrypted) {
-			$event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters());
-		}
-
-		if (!isset($parsedParameters['user'])) {
-			// External user via public link share
-			$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
-			$event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
-		} else {
-			$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
-		}
-
-		if ($event->getChildEvent() === null) {
-			// Couldn't group by file, maybe we can group by user
-			$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-		}
-
-		return $event;
-	}
-
-	private function isHiddenFile(string $filename): bool {
-		return strlen($filename) > 0 && $filename[0] === '.';
-	}
-
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event) {
-		$parameters = $event->getSubjectParameters();
-		switch ($event->getSubject()) {
-			case 'created_self':
-			case 'created_public':
-			case 'changed_self':
-			case 'deleted_self':
-			case 'restored_self':
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case 'created_by':
-			case 'changed_by':
-			case 'deleted_by':
-			case 'restored_by':
-				if ($parameters[1] === '') {
-					// External user via public link share
-					return [
-						'file' => $this->getFile($parameters[0], $event),
-					];
-				}
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[1]),
-				];
-			case 'renamed_self':
-			case 'moved_self':
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'oldfile' => $this->getFile($parameters[1]),
-				];
-			case 'renamed_by':
-			case 'moved_by':
-				if ($parameters[1] === '') {
-					// External user via public link share
-					return [
-						'newfile' => $this->getFile($parameters[0]),
-						'oldfile' => $this->getFile($parameters[2]),
-					];
-				}
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'user' => $this->getUser($parameters[1]),
-					'oldfile' => $this->getFile($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} elseif ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		$encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path);
-		if ($encryptionContainer instanceof Folder) {
-			$this->fileIsEncrypted = true;
-			try {
-				$fullPath = rtrim($encryptionContainer->getPath(), '/');
-				// Remove /user/files/...
-				[,,, $path] = explode('/', $fullPath, 4);
-				if (!$path) {
-					throw new InvalidPathException('Path could not be split correctly');
-				}
-
-				return [
-					'type' => 'file',
-					'id' => $encryptionContainer->getId(),
-					'name' => $encryptionContainer->getName(),
-					'path' => $path,
-					'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]),
-				];
-			} catch (\Exception $e) {
-				// fall back to the normal one
-				$this->fileIsEncrypted = false;
-			}
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	protected $fileEncrypted = [];
-
-	/**
-	 * Check if a file is end2end encrypted
-	 * @param int $fileId
-	 * @param string $path
-	 * @return Folder|null
-	 */
-	protected function getEndToEndEncryptionContainer($fileId, $path) {
-		if (isset($this->fileEncrypted[$fileId])) {
-			return $this->fileEncrypted[$fileId];
-		}
-
-		$fileName = basename($path);
-		if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) {
-			$this->fileEncrypted[$fileId] = false;
-			return $this->fileEncrypted[$fileId];
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
-		$files = $userFolder->getById($fileId);
-		if (empty($files)) {
-			try {
-				// Deleted, try with parent
-				$file = $this->findExistingParent($userFolder, dirname($path));
-			} catch (NotFoundException $e) {
-				return null;
-			}
-
-			if (!$file instanceof Folder || !$file->isEncrypted()) {
-				return null;
-			}
-
-			$this->fileEncrypted[$fileId] = $file;
-			return $file;
-		}
-
-		$file = array_shift($files);
-
-		if ($file instanceof Folder && $file->isEncrypted()) {
-			// If the folder is encrypted, it is the Container,
-			// but can be the name is just fine.
-			$this->fileEncrypted[$fileId] = true;
-			return null;
-		}
-
-		$this->fileEncrypted[$fileId] = $this->getParentEndToEndEncryptionContainer($userFolder, $file);
-		return $this->fileEncrypted[$fileId];
-	}
-
-	/**
-	 * @param Folder $userFolder
-	 * @param string $path
-	 * @return Folder
-	 * @throws NotFoundException
-	 */
-	protected function findExistingParent(Folder $userFolder, $path) {
-		if ($path === '/') {
-			throw new NotFoundException('Reached the root');
-		}
-
-		try {
-			$folder = $userFolder->get(dirname($path));
-		} catch (NotFoundException $e) {
-			return $this->findExistingParent($userFolder, dirname($path));
-		}
-
-		return $folder;
-	}
-
-	/**
-	 * Check all parents until the user's root folder if one is encrypted
-	 *
-	 * @param Folder $userFolder
-	 * @param Node $file
-	 * @return Node|null
-	 */
-	protected function getParentEndToEndEncryptionContainer(Folder $userFolder, Node $file) {
-		try {
-			$parent = $file->getParent();
-
-			if ($userFolder->getId() === $parent->getId()) {
-				return null;
-			}
-		} catch (\Exception $e) {
-			return null;
-		}
-
-		if ($parent->isEncrypted()) {
-			return $parent;
-		}
-
-		return $this->getParentEndToEndEncryptionContainer($userFolder, $parent);
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		// First try local user
-		$displayName = $this->userManager->getDisplayName($uid);
-		if ($displayName !== null) {
-			return [
-				'type' => 'user',
-				'id' => $uid,
-				'name' => $displayName,
-			];
-		}
-
-		// Then a contact from the addressbook
-		if ($this->cloudIdManager->isValidCloudId($uid)) {
-			$cloudId = $this->cloudIdManager->resolveCloudId($uid);
-			return [
-				'type' => 'user',
-				'id' => $cloudId->getUser(),
-				'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
-				'server' => $cloudId->getRemote(),
-			];
-		}
-
-		// Fallback to empty dummy data
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $uid,
-		];
-	}
-
-	protected function getDisplayNameFromAddressBook(string $search): string {
-		if (isset($this->displayNames[$search])) {
-			return $this->displayNames[$search];
-		}
-
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
-						return $this->displayNames[$search];
-					}
-				}
-			}
-		}
-
-		return $search;
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+    /** @var IL10N */
+    protected $activityLang;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var string[] cached displayNames - key is the cloud id and value the displayname */
+    protected $displayNames = [];
+
+    protected $fileIsEncrypted = false;
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                ICloudIdManager $cloudIdManager,
+                                IContactsManager $contactsManager,
+                                IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->contactsManager = $contactsManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'files') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files', $language);
+        $this->activityLang = $this->languageFactory->get('activity', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event, $previousEvent);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    protected function setIcon(IEvent $event, string $icon, string $app = 'files') {
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath($app, $icon . '.svg')));
+        }
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('Created by {user}');
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('Changed by {user}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('Deleted by {user}');
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('Restored by {user}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'renamed_by') {
+            $subject = $this->l->t('Renamed by {user}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('Moved by {user}');
+            $this->setIcon($event, 'change');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if (!isset($parsedParameters['user'])) {
+            // External user via public link share
+            $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
+        $this->fileIsEncrypted = false;
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_self') {
+            $subject = $this->l->t('You created {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You created an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('{user} created {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} created an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'created_public') {
+            $subject = $this->l->t('{file} was created in a public folder');
+            $this->setIcon($event, 'add-color');
+        } elseif ($event->getSubject() === 'changed_self') {
+            $subject = $this->l->t('You changed {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You changed an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('{user} changed {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} changed an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'deleted_self') {
+            $subject = $this->l->t('You deleted {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('You deleted an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('{user} deleted {file}');
+            if ($this->fileIsEncrypted) {
+                $subject = $this->l->t('{user} deleted an encrypted file in {file}');
+            }
+            $this->setIcon($event, 'delete-color');
+        } elseif ($event->getSubject() === 'restored_self') {
+            $subject = $this->l->t('You restored {file}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('{user} restored {file}');
+            $this->setIcon($event, 'actions/history', 'core');
+        } elseif ($event->getSubject() === 'renamed_self') {
+            $oldFileName = $parsedParameters['oldfile']['name'];
+            $newFileName = $parsedParameters['newfile']['name'];
+
+            if ($this->isHiddenFile($oldFileName)) {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
+                }
+            } else {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('You renamed {oldfile} to {newfile}');
+                }
+            }
+
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'renamed_by') {
+            $oldFileName = $parsedParameters['oldfile']['name'];
+            $newFileName = $parsedParameters['newfile']['name'];
+
+            if ($this->isHiddenFile($oldFileName)) {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
+                }
+            } else {
+                if ($this->isHiddenFile($newFileName)) {
+                    $subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
+                } else {
+                    $subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
+                }
+            }
+
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_self') {
+            $subject = $this->l->t('You moved {oldfile} to {newfile}');
+            $this->setIcon($event, 'change');
+        } elseif ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('{user} moved {oldfile} to {newfile}');
+            $this->setIcon($event, 'change');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->fileIsEncrypted) {
+            $event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters());
+        }
+
+        if (!isset($parsedParameters['user'])) {
+            // External user via public link share
+            $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
+            $event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
+        } else {
+            $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+        }
+
+        if ($event->getChildEvent() === null) {
+            // Couldn't group by file, maybe we can group by user
+            $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+        }
+
+        return $event;
+    }
+
+    private function isHiddenFile(string $filename): bool {
+        return strlen($filename) > 0 && $filename[0] === '.';
+    }
+
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event) {
+        $parameters = $event->getSubjectParameters();
+        switch ($event->getSubject()) {
+            case 'created_self':
+            case 'created_public':
+            case 'changed_self':
+            case 'deleted_self':
+            case 'restored_self':
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case 'created_by':
+            case 'changed_by':
+            case 'deleted_by':
+            case 'restored_by':
+                if ($parameters[1] === '') {
+                    // External user via public link share
+                    return [
+                        'file' => $this->getFile($parameters[0], $event),
+                    ];
+                }
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[1]),
+                ];
+            case 'renamed_self':
+            case 'moved_self':
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'oldfile' => $this->getFile($parameters[1]),
+                ];
+            case 'renamed_by':
+            case 'moved_by':
+                if ($parameters[1] === '') {
+                    // External user via public link share
+                    return [
+                        'newfile' => $this->getFile($parameters[0]),
+                        'oldfile' => $this->getFile($parameters[2]),
+                    ];
+                }
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'user' => $this->getUser($parameters[1]),
+                    'oldfile' => $this->getFile($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } elseif ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        $encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path);
+        if ($encryptionContainer instanceof Folder) {
+            $this->fileIsEncrypted = true;
+            try {
+                $fullPath = rtrim($encryptionContainer->getPath(), '/');
+                // Remove /user/files/...
+                [,,, $path] = explode('/', $fullPath, 4);
+                if (!$path) {
+                    throw new InvalidPathException('Path could not be split correctly');
+                }
+
+                return [
+                    'type' => 'file',
+                    'id' => $encryptionContainer->getId(),
+                    'name' => $encryptionContainer->getName(),
+                    'path' => $path,
+                    'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]),
+                ];
+            } catch (\Exception $e) {
+                // fall back to the normal one
+                $this->fileIsEncrypted = false;
+            }
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    protected $fileEncrypted = [];
+
+    /**
+     * Check if a file is end2end encrypted
+     * @param int $fileId
+     * @param string $path
+     * @return Folder|null
+     */
+    protected function getEndToEndEncryptionContainer($fileId, $path) {
+        if (isset($this->fileEncrypted[$fileId])) {
+            return $this->fileEncrypted[$fileId];
+        }
+
+        $fileName = basename($path);
+        if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) {
+            $this->fileEncrypted[$fileId] = false;
+            return $this->fileEncrypted[$fileId];
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
+        $files = $userFolder->getById($fileId);
+        if (empty($files)) {
+            try {
+                // Deleted, try with parent
+                $file = $this->findExistingParent($userFolder, dirname($path));
+            } catch (NotFoundException $e) {
+                return null;
+            }
+
+            if (!$file instanceof Folder || !$file->isEncrypted()) {
+                return null;
+            }
+
+            $this->fileEncrypted[$fileId] = $file;
+            return $file;
+        }
+
+        $file = array_shift($files);
+
+        if ($file instanceof Folder && $file->isEncrypted()) {
+            // If the folder is encrypted, it is the Container,
+            // but can be the name is just fine.
+            $this->fileEncrypted[$fileId] = true;
+            return null;
+        }
+
+        $this->fileEncrypted[$fileId] = $this->getParentEndToEndEncryptionContainer($userFolder, $file);
+        return $this->fileEncrypted[$fileId];
+    }
+
+    /**
+     * @param Folder $userFolder
+     * @param string $path
+     * @return Folder
+     * @throws NotFoundException
+     */
+    protected function findExistingParent(Folder $userFolder, $path) {
+        if ($path === '/') {
+            throw new NotFoundException('Reached the root');
+        }
+
+        try {
+            $folder = $userFolder->get(dirname($path));
+        } catch (NotFoundException $e) {
+            return $this->findExistingParent($userFolder, dirname($path));
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Check all parents until the user's root folder if one is encrypted
+     *
+     * @param Folder $userFolder
+     * @param Node $file
+     * @return Node|null
+     */
+    protected function getParentEndToEndEncryptionContainer(Folder $userFolder, Node $file) {
+        try {
+            $parent = $file->getParent();
+
+            if ($userFolder->getId() === $parent->getId()) {
+                return null;
+            }
+        } catch (\Exception $e) {
+            return null;
+        }
+
+        if ($parent->isEncrypted()) {
+            return $parent;
+        }
+
+        return $this->getParentEndToEndEncryptionContainer($userFolder, $parent);
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        // First try local user
+        $displayName = $this->userManager->getDisplayName($uid);
+        if ($displayName !== null) {
+            return [
+                'type' => 'user',
+                'id' => $uid,
+                'name' => $displayName,
+            ];
+        }
+
+        // Then a contact from the addressbook
+        if ($this->cloudIdManager->isValidCloudId($uid)) {
+            $cloudId = $this->cloudIdManager->resolveCloudId($uid);
+            return [
+                'type' => 'user',
+                'id' => $cloudId->getUser(),
+                'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
+                'server' => $cloudId->getRemote(),
+            ];
+        }
+
+        // Fallback to empty dummy data
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $uid,
+        ];
+    }
+
+    protected function getDisplayNameFromAddressBook(string $search): string {
+        if (isset($this->displayNames[$search])) {
+            return $this->displayNames[$search];
+        }
+
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    if (strtolower($cloudId) === $lowerSearch) {
+                        $this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+                        return $this->displayNames[$search];
+                    }
+                }
+            }
+        }
+
+        return $search;
+    }
 }

apps/files_sharing/lib/Activity/Providers/Base.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = $parameter['path'];
 			} else {
@@ -218,7 +218,7 @@ 
 				$lowerSearch = strtolower($search);
 				foreach ($cloudIds as $cloudId) {
 					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+						$this->displayNames[$search] = $contact['FN']." ($cloudId)";
 						return $this->displayNames[$search];
 					}
 				}

Indentation +202 added lines, -202 removed lines

@@ -37,206 +37,206 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager,
-								IContactsManager $contactsManager,
-								IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->contactsManager = $contactsManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'files_sharing') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files_sharing', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseShortVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseLongVersion(IEvent $event, IEvent $previousEvent = null);
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} elseif ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		// First try local user
-		$displayName = $this->userManager->getDisplayName($uid);
-		if ($displayName !== null) {
-			return [
-				'type' => 'user',
-				'id' => $uid,
-				'name' => $displayName,
-			];
-		}
-
-		// Then a contact from the addressbook
-		if ($this->cloudIdManager->isValidCloudId($uid)) {
-			$cloudId = $this->cloudIdManager->resolveCloudId($uid);
-			return [
-				'type' => 'user',
-				'id' => $cloudId->getUser(),
-				'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
-				'server' => $cloudId->getRemote(),
-			];
-		}
-
-		// Fallback to empty dummy data
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $uid,
-		];
-	}
-
-	protected function getDisplayNameFromAddressBook(string $search): string {
-		if (isset($this->displayNames[$search])) {
-			return $this->displayNames[$search];
-		}
-
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					if (strtolower($cloudId) === $lowerSearch) {
-						$this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
-						return $this->displayNames[$search];
-					}
-				}
-			}
-		}
-
-		return $search;
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager,
+                                IContactsManager $contactsManager,
+                                IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->contactsManager = $contactsManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'files_sharing') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files_sharing', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseShortVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseLongVersion(IEvent $event, IEvent $previousEvent = null);
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } elseif ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        // First try local user
+        $displayName = $this->userManager->getDisplayName($uid);
+        if ($displayName !== null) {
+            return [
+                'type' => 'user',
+                'id' => $uid,
+                'name' => $displayName,
+            ];
+        }
+
+        // Then a contact from the addressbook
+        if ($this->cloudIdManager->isValidCloudId($uid)) {
+            $cloudId = $this->cloudIdManager->resolveCloudId($uid);
+            return [
+                'type' => 'user',
+                'id' => $cloudId->getUser(),
+                'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()),
+                'server' => $cloudId->getRemote(),
+            ];
+        }
+
+        // Fallback to empty dummy data
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $uid,
+        ];
+    }
+
+    protected function getDisplayNameFromAddressBook(string $search): string {
+        if (isset($this->displayNames[$search])) {
+            return $this->displayNames[$search];
+        }
+
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    if (strtolower($cloudId) === $lowerSearch) {
+                        $this->displayNames[$search] = $contact['FN'] . " ($cloudId)";
+                        return $this->displayNames[$search];
+                    }
+                }
+            }
+        }
+
+        return $search;
+    }
 }

apps/files_sharing/lib/Controller/ExternalSharesController.php

Spacing +6 added lines, -6 removed lines

@@ -135,15 +135,15 @@
 		}
 
 		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('https://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('https');
 		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('http://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('http');
 		} else {

Indentation +103 added lines, -103 removed lines

@@ -40,115 +40,115 @@
  */
 class ExternalSharesController extends Controller {
 
-	/** @var \OCA\Files_Sharing\External\Manager */
-	private $externalManager;
-	/** @var IClientService */
-	private $clientService;
+    /** @var \OCA\Files_Sharing\External\Manager */
+    private $externalManager;
+    /** @var IClientService */
+    private $clientService;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param \OCA\Files_Sharing\External\Manager $externalManager
-	 * @param IClientService $clientService
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								\OCA\Files_Sharing\External\Manager $externalManager,
-								IClientService $clientService) {
-		parent::__construct($appName, $request);
-		$this->externalManager = $externalManager;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param \OCA\Files_Sharing\External\Manager $externalManager
+     * @param IClientService $clientService
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                \OCA\Files_Sharing\External\Manager $externalManager,
+                                IClientService $clientService) {
+        parent::__construct($appName, $request);
+        $this->externalManager = $externalManager;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function index() {
-		return new JSONResponse($this->externalManager->getOpenShares());
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @return JSONResponse
+     */
+    public function index() {
+        return new JSONResponse($this->externalManager->getOpenShares());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 */
-	public function create($id) {
-		$this->externalManager->acceptShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     */
+    public function create($id) {
+        $this->externalManager->acceptShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param integer $id
-	 * @return JSONResponse
-	 */
-	public function destroy($id) {
-		$this->externalManager->declineShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param integer $id
+     * @return JSONResponse
+     */
+    public function destroy($id) {
+        $this->externalManager->declineShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * Test whether the specified remote is accessible
-	 *
-	 * @param string $remote
-	 * @param bool $checkVersion
-	 * @return bool
-	 */
-	protected function testUrl($remote, $checkVersion = false) {
-		try {
-			$client = $this->clientService->newClient();
-			$response = json_decode($client->get(
-				$remote,
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			)->getBody());
+    /**
+     * Test whether the specified remote is accessible
+     *
+     * @param string $remote
+     * @param bool $checkVersion
+     * @return bool
+     */
+    protected function testUrl($remote, $checkVersion = false) {
+        try {
+            $client = $this->clientService->newClient();
+            $response = json_decode($client->get(
+                $remote,
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            )->getBody());
 
-			if ($checkVersion) {
-				return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
-			} else {
-				return is_object($response);
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+            if ($checkVersion) {
+                return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
+            } else {
+                return is_object($response);
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoOutgoingFederatedSharingRequired
-	 * @NoIncomingFederatedSharingRequired
-	 *
-	 * @param string $remote
-	 * @return DataResponse
-	 */
-	public function testRemote($remote) {
-		if (strpos($remote, '#') !== false || strpos($remote, '?') !== false || strpos($remote, ';') !== false) {
-			return new DataResponse(false);
-		}
+    /**
+     * @PublicPage
+     * @NoOutgoingFederatedSharingRequired
+     * @NoIncomingFederatedSharingRequired
+     *
+     * @param string $remote
+     * @return DataResponse
+     */
+    public function testRemote($remote) {
+        if (strpos($remote, '#') !== false || strpos($remote, '?') !== false || strpos($remote, ';') !== false) {
+            return new DataResponse(false);
+        }
 
-		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('https');
-		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('http');
-		} else {
-			return new DataResponse(false);
-		}
-	}
+        if (
+            $this->testUrl('https://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('https://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('https');
+        } elseif (
+            $this->testUrl('http://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('http://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('http');
+        } else {
+            return new DataResponse(false);
+        }
+    }
 }

apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php

Indentation +54 added lines, -54 removed lines

@@ -33,61 +33,61 @@
 
 class Version010000Date20200304152605 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): ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @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): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable(RecentContactMapper::TABLE_NAME);
-		$table->addColumn('id', 'integer', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->addColumn('actor_uid', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('uid', 'string', [
-			'notnull' => false,
-			'length' => 64,
-		]);
-		$table->addColumn('email', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('federated_cloud_id', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('card', 'blob', [
-			'notnull' => true,
-		]);
-		$table->addColumn('last_contact', 'integer', [
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->setPrimaryKey(['id']);
-		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
-		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
-		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
-		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
-		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
-		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+        $table = $schema->createTable(RecentContactMapper::TABLE_NAME);
+        $table->addColumn('id', 'integer', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->addColumn('actor_uid', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('uid', 'string', [
+            'notnull' => false,
+            'length' => 64,
+        ]);
+        $table->addColumn('email', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('federated_cloud_id', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('card', 'blob', [
+            'notnull' => true,
+        ]);
+        $table->addColumn('last_contact', 'integer', [
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->setPrimaryKey(['id']);
+        // To find all recent entries
+        $table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+        // To find a specific entry
+        $table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+        // To find all recent entries with a given UID
+        $table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+        // To find all recent entries with a given email address
+        $table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+        // To find all recent entries with a give federated cloud id
+        $table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+        // For the cleanup
+        $table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -75,17 +75,17 @@
 		]);
 		$table->setPrimaryKey(['id']);
 		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME.'_actor_uid');
 		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME.'_id_uid');
 		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME.'_uid');
 		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME.'_email');
 		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME.'_fed_id');
 		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME.'_last_contact');
 
 		return $schema;
 	}

apps/contactsinteraction/lib/Db/CardSearchDao.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		}
 		$addressbooksQuery->selectDistinct('id')
 			->from('addressbooks')
-			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
+			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/".$user->getUID())));
 		$propQuery->selectDistinct('cardid')
 			->from('cards_properties')
 			->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))

Indentation +55 added lines, -55 removed lines

@@ -33,64 +33,64 @@
 
 class CardSearchDao {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
 
-	public function findExisting(IUser $user,
-								 ?string $uid,
-								 ?string $email,
-								 ?string $cloudId): ?string {
-		$addressbooksQuery = $this->db->getQueryBuilder();
-		$cardQuery = $this->db->getQueryBuilder();
-		$propQuery = $this->db->getQueryBuilder();
+    public function findExisting(IUser $user,
+                                 ?string $uid,
+                                 ?string $email,
+                                 ?string $cloudId): ?string {
+        $addressbooksQuery = $this->db->getQueryBuilder();
+        $cardQuery = $this->db->getQueryBuilder();
+        $propQuery = $this->db->getQueryBuilder();
 
-		$propOr = $propQuery->expr()->orX();
-		if ($uid !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('UID')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($uid))
-			));
-		}
-		if ($email !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('EMAIL')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($email))
-			));
-		}
-		if ($cloudId !== null) {
-			$propOr->add($propQuery->expr()->andX(
-				$propQuery->expr()->eq('name', $cardQuery->createNamedParameter('CLOUD')),
-				$propQuery->expr()->eq('value', $cardQuery->createNamedParameter($cloudId))
-			));
-		}
-		$addressbooksQuery->selectDistinct('id')
-			->from('addressbooks')
-			->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
-		$propQuery->selectDistinct('cardid')
-			->from('cards_properties')
-			->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($propOr)
-			->groupBy('cardid');
-		$cardQuery->select('carddata')
-			->from('cards')
-			->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
-			->setMaxResults(1);
-		$result = $cardQuery->execute();
-		/** @var string|resource|false $card */
-		$card = $result->fetchOne();
+        $propOr = $propQuery->expr()->orX();
+        if ($uid !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('UID')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($uid))
+            ));
+        }
+        if ($email !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('EMAIL')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($email))
+            ));
+        }
+        if ($cloudId !== null) {
+            $propOr->add($propQuery->expr()->andX(
+                $propQuery->expr()->eq('name', $cardQuery->createNamedParameter('CLOUD')),
+                $propQuery->expr()->eq('value', $cardQuery->createNamedParameter($cloudId))
+            ));
+        }
+        $addressbooksQuery->selectDistinct('id')
+            ->from('addressbooks')
+            ->where($addressbooksQuery->expr()->eq('principaluri', $cardQuery->createNamedParameter("principals/users/" . $user->getUID())));
+        $propQuery->selectDistinct('cardid')
+            ->from('cards_properties')
+            ->where($propQuery->expr()->in('addressbookid', $propQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($propOr)
+            ->groupBy('cardid');
+        $cardQuery->select('carddata')
+            ->from('cards')
+            ->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
+            ->setMaxResults(1);
+        $result = $cardQuery->execute();
+        /** @var string|resource|false $card */
+        $card = $result->fetchOne();
 
-		if ($card === false) {
-			return null;
-		}
-		if (is_resource($card)) {
-			return stream_get_contents($card);
-		}
+        if ($card === false) {
+            return null;
+        }
+        if (is_resource($card)) {
+            return stream_get_contents($card);
+        }
 
-		return $card;
-	}
+        return $card;
+    }
 }