nextcloud / server

apps/files/lib/Controller/TransferOwnershipController.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
 				'targetUser' => $recipient,
 				'nodeName' => $node->getName(),
 			])
-			->setObject('transfer', (string)$transferOwnership->getId());
+			->setObject('transfer', (string) $transferOwnership->getId());
 
 		$this->notificationManager->notify($notification);
 
@@ -135,7 +135,7 @@ 
 
 		$notification = $this->notificationManager->createNotification();
 		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
+			->setObject('transfer', (string) $id);
 		$this->notificationManager->markProcessed($notification);
 
 		$newTransferOwnership = new TransferOwnershipEntity();
@@ -168,7 +168,7 @@ 
 
 		$notification = $this->notificationManager->createNotification();
 		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
+			->setObject('transfer', (string) $id);
 		$this->notificationManager->markProcessed($notification);
 
 		$notification = $this->notificationManager->createNotification();
@@ -180,7 +180,7 @@ 
 				'targetUser' => $transferOwnership->getTargetUser(),
 				'nodeName' => $transferOwnership->getNodeName()
 			])
-			->setObject('transfer', (string)$transferOwnership->getId());
+			->setObject('transfer', (string) $transferOwnership->getId());
 		$this->notificationManager->notify($notification);
 
 		$this->mapper->delete($transferOwnership);

Indentation +149 added lines, -149 removed lines

@@ -44,153 +44,153 @@
 
 class TransferOwnershipController extends OCSController {
 
-	/** @var string */
-	private $userId;
-	/** @var NotificationManager */
-	private $notificationManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IJobList */
-	private $jobList;
-	/** @var TransferOwnershipMapper */
-	private $mapper;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								string $userId,
-								NotificationManager $notificationManager,
-								ITimeFactory $timeFactory,
-								IJobList $jobList,
-								TransferOwnershipMapper $mapper,
-								IUserManager $userManager,
-								IRootFolder $rootFolder) {
-		parent::__construct($appName, $request);
-
-		$this->userId = $userId;
-		$this->notificationManager = $notificationManager;
-		$this->timeFactory = $timeFactory;
-		$this->jobList = $jobList;
-		$this->mapper = $mapper;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function transfer(string $recipient, string $path): DataResponse {
-		$recipientUser = $this->userManager->get($recipient);
-
-		if ($recipientUser === null) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userRoot = $this->rootFolder->getUserFolder($this->userId);
-
-		try {
-			$node = $userRoot->get($path);
-		} catch (\Exception $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($node->getOwner()->getUID() !== $this->userId || !$node->getStorage()->instanceOfStorage(IHomeStorage::class)) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$transferOwnership = new TransferOwnershipEntity();
-		$transferOwnership->setSourceUser($this->userId);
-		$transferOwnership->setTargetUser($recipient);
-		$transferOwnership->setFileId($node->getId());
-		$transferOwnership->setNodeName($node->getName());
-		$transferOwnership = $this->mapper->insert($transferOwnership);
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($recipient)
-			->setApp($this->appName)
-			->setDateTime($this->timeFactory->getDateTime())
-			->setSubject('transferownershipRequest', [
-				'sourceUser' => $this->userId,
-				'targetUser' => $recipient,
-				'nodeName' => $node->getName(),
-			])
-			->setObject('transfer', (string)$transferOwnership->getId());
-
-		$this->notificationManager->notify($notification);
-
-		return new DataResponse([]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function accept(int $id): DataResponse {
-		try {
-			$transferOwnership = $this->mapper->getById($id);
-		} catch (DoesNotExistException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($transferOwnership->getTargetUser() !== $this->userId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
-		$this->notificationManager->markProcessed($notification);
-
-		$newTransferOwnership = new TransferOwnershipEntity();
-		$newTransferOwnership->setNodeName($transferOwnership->getNodeName());
-		$newTransferOwnership->setFileId($transferOwnership->getFileId());
-		$newTransferOwnership->setSourceUser($transferOwnership->getSourceUser());
-		$newTransferOwnership->setTargetUser($transferOwnership->getTargetUser());
-		$this->mapper->insert($newTransferOwnership);
-
-		$this->jobList->add(TransferOwnership::class, [
-			'id' => $newTransferOwnership->getId(),
-		]);
-
-		return new DataResponse([], Http::STATUS_OK);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function reject(int $id): DataResponse {
-		try {
-			$transferOwnership = $this->mapper->getById($id);
-		} catch (DoesNotExistException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($transferOwnership->getTargetUser() !== $this->userId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
-		$this->notificationManager->markProcessed($notification);
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transferOwnership->getSourceUser())
-			->setApp($this->appName)
-			->setDateTime($this->timeFactory->getDateTime())
-			->setSubject('transferownershipRequestDenied', [
-				'sourceUser' => $transferOwnership->getSourceUser(),
-				'targetUser' => $transferOwnership->getTargetUser(),
-				'nodeName' => $transferOwnership->getNodeName()
-			])
-			->setObject('transfer', (string)$transferOwnership->getId());
-		$this->notificationManager->notify($notification);
-
-		$this->mapper->delete($transferOwnership);
-
-		return new DataResponse([], Http::STATUS_OK);
-	}
+    /** @var string */
+    private $userId;
+    /** @var NotificationManager */
+    private $notificationManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IJobList */
+    private $jobList;
+    /** @var TransferOwnershipMapper */
+    private $mapper;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                string $userId,
+                                NotificationManager $notificationManager,
+                                ITimeFactory $timeFactory,
+                                IJobList $jobList,
+                                TransferOwnershipMapper $mapper,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder) {
+        parent::__construct($appName, $request);
+
+        $this->userId = $userId;
+        $this->notificationManager = $notificationManager;
+        $this->timeFactory = $timeFactory;
+        $this->jobList = $jobList;
+        $this->mapper = $mapper;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     */
+    public function transfer(string $recipient, string $path): DataResponse {
+        $recipientUser = $this->userManager->get($recipient);
+
+        if ($recipientUser === null) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userRoot = $this->rootFolder->getUserFolder($this->userId);
+
+        try {
+            $node = $userRoot->get($path);
+        } catch (\Exception $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($node->getOwner()->getUID() !== $this->userId || !$node->getStorage()->instanceOfStorage(IHomeStorage::class)) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $transferOwnership = new TransferOwnershipEntity();
+        $transferOwnership->setSourceUser($this->userId);
+        $transferOwnership->setTargetUser($recipient);
+        $transferOwnership->setFileId($node->getId());
+        $transferOwnership->setNodeName($node->getName());
+        $transferOwnership = $this->mapper->insert($transferOwnership);
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($recipient)
+            ->setApp($this->appName)
+            ->setDateTime($this->timeFactory->getDateTime())
+            ->setSubject('transferownershipRequest', [
+                'sourceUser' => $this->userId,
+                'targetUser' => $recipient,
+                'nodeName' => $node->getName(),
+            ])
+            ->setObject('transfer', (string)$transferOwnership->getId());
+
+        $this->notificationManager->notify($notification);
+
+        return new DataResponse([]);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function accept(int $id): DataResponse {
+        try {
+            $transferOwnership = $this->mapper->getById($id);
+        } catch (DoesNotExistException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($transferOwnership->getTargetUser() !== $this->userId) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('files')
+            ->setObject('transfer', (string)$id);
+        $this->notificationManager->markProcessed($notification);
+
+        $newTransferOwnership = new TransferOwnershipEntity();
+        $newTransferOwnership->setNodeName($transferOwnership->getNodeName());
+        $newTransferOwnership->setFileId($transferOwnership->getFileId());
+        $newTransferOwnership->setSourceUser($transferOwnership->getSourceUser());
+        $newTransferOwnership->setTargetUser($transferOwnership->getTargetUser());
+        $this->mapper->insert($newTransferOwnership);
+
+        $this->jobList->add(TransferOwnership::class, [
+            'id' => $newTransferOwnership->getId(),
+        ]);
+
+        return new DataResponse([], Http::STATUS_OK);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function reject(int $id): DataResponse {
+        try {
+            $transferOwnership = $this->mapper->getById($id);
+        } catch (DoesNotExistException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($transferOwnership->getTargetUser() !== $this->userId) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('files')
+            ->setObject('transfer', (string)$id);
+        $this->notificationManager->markProcessed($notification);
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transferOwnership->getSourceUser())
+            ->setApp($this->appName)
+            ->setDateTime($this->timeFactory->getDateTime())
+            ->setSubject('transferownershipRequestDenied', [
+                'sourceUser' => $transferOwnership->getSourceUser(),
+                'targetUser' => $transferOwnership->getTargetUser(),
+                'nodeName' => $transferOwnership->getNodeName()
+            ])
+            ->setObject('transfer', (string)$transferOwnership->getId());
+        $this->notificationManager->notify($notification);
+
+        $this->mapper->delete($transferOwnership);
+
+        return new DataResponse([], Http::STATUS_OK);
+    }
 }

lib/private/Files/SimpleFS/NewSimpleFile.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
 			return $this->file->fopen('w');
 		} else {
 			$source = fopen('php://temp', 'w+');
-			return CallbackWrapper::wrap($source, null, null, null, null, function () use ($source) {
+			return CallbackWrapper::wrap($source, null, null, null, null, function() use ($source) {
 				rewind($source);
 				$this->putContent($source);
 			});

Indentation +192 added lines, -192 removed lines

@@ -34,196 +34,196 @@
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class NewSimpleFile implements ISimpleFile {
-	private Folder $parentFolder;
-	private string $name;
-	private ?File $file = null;
-
-	/**
-	 * File constructor.
-	 */
-	public function __construct(Folder $parentFolder, string $name) {
-		$this->parentFolder = $parentFolder;
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the name
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * Get the size in bytes
-	 */
-	public function getSize(): int {
-		if ($this->file) {
-			return $this->file->getSize();
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Get the ETag
-	 */
-	public function getETag(): string {
-		if ($this->file) {
-			return $this->file->getEtag();
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get the last modification time
-	 */
-	public function getMTime(): int {
-		if ($this->file) {
-			return $this->file->getMTime();
-		} else {
-			return time();
-		}
-	}
-
-	/**
-	 * Get the content
-	 *
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
-	 */
-	public function getContent(): string {
-		if ($this->file) {
-			$result = $this->file->getContent();
-
-			if ($result === false) {
-				$this->checkFile();
-			}
-
-			return $result;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Overwrite the file
-	 *
-	 * @param string|resource $data
-	 * @throws NotPermittedException
-	 * @throws NotFoundException
-	 */
-	public function putContent($data): void {
-		try {
-			if ($this->file) {
-				$this->file->putContent($data);
-			} else {
-				$this->file = $this->parentFolder->newFile($this->name, $data);
-			}
-		} catch (NotFoundException $e) {
-			$this->checkFile();
-		}
-	}
-
-	/**
-	 * Sometimes there are some issues with the AppData. Most of them are from
-	 * user error. But we should handle them gracefully anyway.
-	 *
-	 * If for some reason the current file can't be found. We remove it.
-	 * Then traverse up and check all folders if they exists. This so that the
-	 * next request will have a valid appdata structure again.
-	 *
-	 * @throws NotFoundException
-	 */
-	private function checkFile(): void {
-		if (!$this->file) {
-			throw new NotFoundException('File not set');
-		}
-
-		$cur = $this->file;
-
-		while ($cur->stat() === false) {
-			$parent = $cur->getParent();
-			try {
-				$cur->delete();
-			} catch (NotFoundException $e) {
-				// Just continue then
-			}
-			$cur = $parent;
-		}
-
-		if ($cur !== $this->file) {
-			throw new NotFoundException('File does not exist');
-		}
-	}
-
-
-	/**
-	 * Delete the file
-	 *
-	 * @throws NotPermittedException
-	 */
-	public function delete(): void {
-		if ($this->file) {
-			$this->file->delete();
-		}
-	}
-
-	/**
-	 * Get the MimeType
-	 *
-	 * @return string
-	 */
-	public function getMimeType(): string {
-		if ($this->file) {
-			return $this->file->getMimeType();
-		} else {
-			return 'text/plain';
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getExtension(): string {
-		if ($this->file) {
-			return $this->file->getExtension();
-		} else {
-			return \pathinfo($this->name, PATHINFO_EXTENSION);
-		}
-	}
-
-	/**
-	 * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function read() {
-		if ($this->file) {
-			return $this->file->fopen('r');
-		} else {
-			return fopen('php://temp', 'r');
-		}
-	}
-
-	/**
-	 * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource|bool
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function write() {
-		if ($this->file) {
-			return $this->file->fopen('w');
-		} else {
-			$source = fopen('php://temp', 'w+');
-			return CallbackWrapper::wrap($source, null, null, null, null, function () use ($source) {
-				rewind($source);
-				$this->putContent($source);
-			});
-		}
-	}
+    private Folder $parentFolder;
+    private string $name;
+    private ?File $file = null;
+
+    /**
+     * File constructor.
+     */
+    public function __construct(Folder $parentFolder, string $name) {
+        $this->parentFolder = $parentFolder;
+        $this->name = $name;
+    }
+
+    /**
+     * Get the name
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * Get the size in bytes
+     */
+    public function getSize(): int {
+        if ($this->file) {
+            return $this->file->getSize();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get the ETag
+     */
+    public function getETag(): string {
+        if ($this->file) {
+            return $this->file->getEtag();
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get the last modification time
+     */
+    public function getMTime(): int {
+        if ($this->file) {
+            return $this->file->getMTime();
+        } else {
+            return time();
+        }
+    }
+
+    /**
+     * Get the content
+     *
+     * @throws NotFoundException
+     * @throws NotPermittedException
+     */
+    public function getContent(): string {
+        if ($this->file) {
+            $result = $this->file->getContent();
+
+            if ($result === false) {
+                $this->checkFile();
+            }
+
+            return $result;
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Overwrite the file
+     *
+     * @param string|resource $data
+     * @throws NotPermittedException
+     * @throws NotFoundException
+     */
+    public function putContent($data): void {
+        try {
+            if ($this->file) {
+                $this->file->putContent($data);
+            } else {
+                $this->file = $this->parentFolder->newFile($this->name, $data);
+            }
+        } catch (NotFoundException $e) {
+            $this->checkFile();
+        }
+    }
+
+    /**
+     * Sometimes there are some issues with the AppData. Most of them are from
+     * user error. But we should handle them gracefully anyway.
+     *
+     * If for some reason the current file can't be found. We remove it.
+     * Then traverse up and check all folders if they exists. This so that the
+     * next request will have a valid appdata structure again.
+     *
+     * @throws NotFoundException
+     */
+    private function checkFile(): void {
+        if (!$this->file) {
+            throw new NotFoundException('File not set');
+        }
+
+        $cur = $this->file;
+
+        while ($cur->stat() === false) {
+            $parent = $cur->getParent();
+            try {
+                $cur->delete();
+            } catch (NotFoundException $e) {
+                // Just continue then
+            }
+            $cur = $parent;
+        }
+
+        if ($cur !== $this->file) {
+            throw new NotFoundException('File does not exist');
+        }
+    }
+
+
+    /**
+     * Delete the file
+     *
+     * @throws NotPermittedException
+     */
+    public function delete(): void {
+        if ($this->file) {
+            $this->file->delete();
+        }
+    }
+
+    /**
+     * Get the MimeType
+     *
+     * @return string
+     */
+    public function getMimeType(): string {
+        if ($this->file) {
+            return $this->file->getMimeType();
+        } else {
+            return 'text/plain';
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExtension(): string {
+        if ($this->file) {
+            return $this->file->getExtension();
+        } else {
+            return \pathinfo($this->name, PATHINFO_EXTENSION);
+        }
+    }
+
+    /**
+     * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function read() {
+        if ($this->file) {
+            return $this->file->fopen('r');
+        } else {
+            return fopen('php://temp', 'r');
+        }
+    }
+
+    /**
+     * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource|bool
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function write() {
+        if ($this->file) {
+            return $this->file->fopen('w');
+        } else {
+            $source = fopen('php://temp', 'w+');
+            return CallbackWrapper::wrap($source, null, null, null, null, function () use ($source) {
+                rewind($source);
+                $this->putContent($source);
+            });
+        }
+    }
 }

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();
+        }
+    }
 }

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;
 }

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 +54 added lines, -54 removed lines

@@ -32,63 +32,63 @@
 use function stream_get_contents;
 
 class CardSearchDao {
-	private IDBConnection $db;
+    private IDBConnection $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;
+    }
 }

apps/contactsinteraction/lib/AddressBookProvider.php

Indentation +37 added lines, -37 removed lines

@@ -33,49 +33,49 @@
 
 class AddressBookProvider implements IAddressBookProvider {
 
-	/** @var RecentContactMapper */
-	private $mapper;
+    /** @var RecentContactMapper */
+    private $mapper;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	public function __construct(RecentContactMapper $mapper, IL10N $l10n) {
-		$this->mapper = $mapper;
-		$this->l10n = $l10n;
-	}
+    public function __construct(RecentContactMapper $mapper, IL10N $l10n) {
+        $this->mapper = $mapper;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getAppId(): string {
-		return Application::APP_ID;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getAppId(): string {
+        return Application::APP_ID;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function fetchAllForAddressBookHome(string $principalUri): array {
-		return [
-			new AddressBook($this->mapper, $this->l10n, $principalUri)
-		];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function fetchAllForAddressBookHome(string $principalUri): array {
+        return [
+            new AddressBook($this->mapper, $this->l10n, $principalUri)
+        ];
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool {
-		return $uri === AddressBook::URI;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool {
+        return $uri === AddressBook::URI;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook {
-		if ($uri === AddressBook::URI) {
-			return new AddressBook($this->mapper, $this->l10n, $principalUri);
-		}
+    /**
+     * @inheritDoc
+     */
+    public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook {
+        if ($uri === AddressBook::URI) {
+            return new AddressBook($this->mapper, $this->l10n, $principalUri);
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 }

apps/contactsinteraction/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\ContactsInteraction\\' => array($baseDir . '/../lib'),
+    'OCA\\ContactsInteraction\\' => array($baseDir.'/../lib'),
 );