nextcloud / server

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -113,12 +113,12 @@ 
 		$this->server = $server;
 
 		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
+		$this->server->on('propFind', [$this, 'propFind']);
 	}
 
 	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function() use ($node) {
 				if ($node->getPublishStatus()) {
 					// We return the publish-url only if the calendar is published.
 					$token = $node->getPublishStatus();
@@ -128,7 +128,7 @@ 
 				}
 			});
 
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
 				$canShare = (!$node->isSubscription() && $node->canWrite());
 				$canPublish = (!$node->isSubscription() && $node->canWrite());
 

Indentation +211 added lines, -211 removed lines

@@ -41,216 +41,216 @@
 use Sabre\HTTP\ResponseInterface;
 
 class PublishPlugin extends ServerPlugin {
-	public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * Config instance to get instance secret.
-	 *
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * URL Generator for absolute URLs.
-	 *
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['oc-calendar-publishing', 'calendarserver-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'oc-calendar-publishing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
-				if ($node->getPublishStatus()) {
-					// We return the publish-url only if the calendar is published.
-					$token = $node->getPublishStatus();
-					$publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
-
-					return new Publisher($publishUrl, true);
-				}
-			});
-
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
-				$canShare = (!$node->isSubscription() && $node->canWrite());
-				$canPublish = (!$node->isSubscription() && $node->canWrite());
-
-				if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
-					$canShare = $canShare && ($node->getOwner() === $node->getPrincipalURI());
-					$canPublish = $canPublish && ($node->getOwner() === $node->getPrincipalURI());
-				}
-
-				return new AllowedSharingModes($canShare, $canPublish);
-			});
-		}
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendars.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return void|bool
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-publish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				/** @var \Sabre\DAVACL\Plugin $acl */
-				$acl->checkPrivileges($path, '{DAV:}write');
-
-				$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-				$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-				if ($limitSharingToOwner && !$isOwner) {
-					return;
-				}
-			}
-
-			$node->setPublishStatus(true);
-
-			// iCloud sends back the 202, so we will too.
-			$response->setStatus(202);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
-
-			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-unpublish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				/** @var \Sabre\DAVACL\Plugin $acl */
-				$acl->checkPrivileges($path, '{DAV:}write');
-
-				$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-				$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-				if ($limitSharingToOwner && !$isOwner) {
-					return;
-				}
-			}
-
-			$node->setPublishStatus(false);
-
-			$response->setStatus(200);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
+    public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * Config instance to get instance secret.
+     *
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * URL Generator for absolute URLs.
+     *
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['oc-calendar-publishing', 'calendarserver-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'oc-calendar-publishing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof Calendar) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+                if ($node->getPublishStatus()) {
+                    // We return the publish-url only if the calendar is published.
+                    $token = $node->getPublishStatus();
+                    $publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
+
+                    return new Publisher($publishUrl, true);
+                }
+            });
+
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+                $canShare = (!$node->isSubscription() && $node->canWrite());
+                $canPublish = (!$node->isSubscription() && $node->canWrite());
+
+                if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
+                    $canShare = $canShare && ($node->getOwner() === $node->getPrincipalURI());
+                    $canPublish = $canPublish && ($node->getOwner() === $node->getPrincipalURI());
+                }
+
+                return new AllowedSharingModes($canShare, $canPublish);
+            });
+        }
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendars.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return void|bool
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-publish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                /** @var \Sabre\DAVACL\Plugin $acl */
+                $acl->checkPrivileges($path, '{DAV:}write');
+
+                $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                if ($limitSharingToOwner && !$isOwner) {
+                    return;
+                }
+            }
+
+            $node->setPublishStatus(true);
+
+            // iCloud sends back the 202, so we will too.
+            $response->setStatus(202);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
+
+            case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-unpublish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                /** @var \Sabre\DAVACL\Plugin $acl */
+                $acl->checkPrivileges($path, '{DAV:}write');
+
+                $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                if ($limitSharingToOwner && !$isOwner) {
+                    return;
+                }
+            }
+
+            $node->setPublishStatus(false);
+
+            $response->setStatus(200);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
 
-		}
-	}
+        }
+    }
 }

apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php

Indentation +26 added lines, -26 removed lines

@@ -33,33 +33,33 @@
  * Verify that the public link share is valid
  */
 class PublicLinkCheckPlugin extends ServerPlugin {
-	/**
-	 * @var FileInfo
-	 */
-	private $fileInfo;
+    /**
+     * @var FileInfo
+     */
+    private $fileInfo;
 
-	/**
-	 * @param FileInfo $fileInfo
-	 */
-	public function setFileInfo($fileInfo) {
-		$this->fileInfo = $fileInfo;
-	}
+    /**
+     * @param FileInfo $fileInfo
+     */
+    public function setFileInfo($fileInfo) {
+        $this->fileInfo = $fileInfo;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod']);
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		// verify that the owner didn't have his share permissions revoked
-		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
-			throw new NotFound();
-		}
-	}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        // verify that the owner didn't have his share permissions revoked
+        if ($this->fileInfo && !$this->fileInfo->isShareable()) {
+            throw new NotFound();
+        }
+    }
 }

apps/dav/lib/Command/SyncBirthdayCalendar.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		$output->writeln("Start birthday calendar sync for all users ...");
 		$p = new ProgressBar($output);
 		$p->start();
-		$this->userManager->callForSeenUsers(function ($user) use ($p) {
+		$this->userManager->callForSeenUsers(function($user) use ($p) {
 			$p->advance();
 
 			$userId = $user->getUID();

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
 
 class SyncBirthdayCalendar extends Command {
 
-	/** @var BirthdayService */
-	private $birthdayService;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	public function __construct(IUserManager $userManager, IConfig $config,
-						 BirthdayService $birthdayService) {
-		parent::__construct();
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		$this
-			->setName('dav:sync-birthday-calendar')
-			->setDescription('Synchronizes the birthday calendar')
-			->addArgument('user',
-				InputArgument::OPTIONAL,
-				'User for whom the birthday calendar will be synchronized');
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->verifyEnabled();
-
-		$user = $input->getArgument('user');
-		if (!is_null($user)) {
-			if (!$this->userManager->userExists($user)) {
-				throw new \InvalidArgumentException("User <$user> in unknown.");
-			}
-
-			// re-enable the birthday calendar in case it's called directly with a user name
-			$isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				$this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-				$output->writeln("Re-enabling birthday calendar for $user");
-			}
-
-			$output->writeln("Start birthday calendar sync for $user");
-			$this->birthdayService->syncUser($user);
-			return 0;
-		}
-		$output->writeln("Start birthday calendar sync for all users ...");
-		$p = new ProgressBar($output);
-		$p->start();
-		$this->userManager->callForSeenUsers(function ($user) use ($p) {
-			$p->advance();
-
-			$userId = $user->getUID();
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				return;
-			}
-
-			/** @var IUser $user */
-			$this->birthdayService->syncUser($user->getUID());
-		});
-
-		$p->finish();
-		$output->writeln('');
-		return 0;
-	}
-
-	protected function verifyEnabled() {
-		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-
-		if ($isEnabled !== 'yes') {
-			throw new \InvalidArgumentException('Birthday calendars are disabled');
-		}
-	}
+    /** @var BirthdayService */
+    private $birthdayService;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    public function __construct(IUserManager $userManager, IConfig $config,
+                            BirthdayService $birthdayService) {
+        parent::__construct();
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('dav:sync-birthday-calendar')
+            ->setDescription('Synchronizes the birthday calendar')
+            ->addArgument('user',
+                InputArgument::OPTIONAL,
+                'User for whom the birthday calendar will be synchronized');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->verifyEnabled();
+
+        $user = $input->getArgument('user');
+        if (!is_null($user)) {
+            if (!$this->userManager->userExists($user)) {
+                throw new \InvalidArgumentException("User <$user> in unknown.");
+            }
+
+            // re-enable the birthday calendar in case it's called directly with a user name
+            $isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                $this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+                $output->writeln("Re-enabling birthday calendar for $user");
+            }
+
+            $output->writeln("Start birthday calendar sync for $user");
+            $this->birthdayService->syncUser($user);
+            return 0;
+        }
+        $output->writeln("Start birthday calendar sync for all users ...");
+        $p = new ProgressBar($output);
+        $p->start();
+        $this->userManager->callForSeenUsers(function ($user) use ($p) {
+            $p->advance();
+
+            $userId = $user->getUID();
+            $isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                return;
+            }
+
+            /** @var IUser $user */
+            $this->birthdayService->syncUser($user->getUID());
+        });
+
+        $p->finish();
+        $output->writeln('');
+        return 0;
+    }
+
+    protected function verifyEnabled() {
+        $isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+
+        if ($isEnabled !== 'yes') {
+            throw new \InvalidArgumentException('Birthday calendars are disabled');
+        }
+    }
 }

apps/workflowengine/lib/Settings/ASettings.php

Spacing +6 added lines, -6 removed lines

@@ -146,8 +146,8 @@ 
 	}
 
 	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
+		return array_map(function(IEntity $entity) {
+			$events = array_map(function(IEntityEvent $entityEvent) {
 				return [
 					'eventName' => $entityEvent->getEventName(),
 					'displayName' => $entityEvent->getDisplayName()
@@ -164,11 +164,11 @@ 
 	}
 
 	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
+		$operators = array_filter($operators, function(IOperation $operator) {
 			return $operator->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (IOperation $operator) {
+		return array_map(function(IOperation $operator) {
 			return [
 				'id' => get_class($operator),
 				'icon' => $operator->getIcon(),
@@ -182,11 +182,11 @@ 
 	}
 
 	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
+		$checks = array_filter($checks, function(ICheck $check) {
 			return $check->isAvailableForScope($this->getScope());
 		});
 
-		return array_map(function (ICheck $check) {
+		return array_map(function(ICheck $check) {
 			return [
 				'id' => get_class($check),
 				'supportedEntities' => $check->supportedEntities(),

Indentation +141 added lines, -141 removed lines

@@ -48,145 +48,145 @@
 use OCP\WorkflowEngine\ISpecificOperation;
 
 abstract class ASettings implements ISettings {
-	private IL10N $l10n;
-	private string $appName;
-	private IEventDispatcher $eventDispatcher;
-	protected Manager $manager;
-	private IInitialState $initialStateService;
-	private IConfig $config;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(
-		string $appName,
-		IL10N $l,
-		IEventDispatcher $eventDispatcher,
-		Manager $manager,
-		IInitialState $initialStateService,
-		IConfig $config,
-		IURLGenerator $urlGenerator
-	) {
-		$this->appName = $appName;
-		$this->l10n = $l;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->manager = $manager;
-		$this->initialStateService = $initialStateService;
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	abstract public function getScope(): int;
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		// @deprecated in 20.0.0: retire this one in favor of the typed event
-		$this->eventDispatcher->dispatch(
-			'OCP\WorkflowEngine::loadAdditionalSettingScripts',
-			new LoadSettingsScriptsEvent()
-		);
-		$this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
-
-		$entities = $this->manager->getEntitiesList();
-		$this->initialStateService->provideInitialState(
-			'entities',
-			$this->entitiesToArray($entities)
-		);
-
-		$operators = $this->manager->getOperatorList();
-		$this->initialStateService->provideInitialState(
-			'operators',
-			$this->operatorsToArray($operators)
-		);
-
-		$checks = $this->manager->getCheckList();
-		$this->initialStateService->provideInitialState(
-			'checks',
-			$this->checksToArray($checks)
-		);
-
-		$this->initialStateService->provideInitialState(
-			'scope',
-			$this->getScope()
-		);
-
-		$this->initialStateService->provideInitialState(
-			'appstoreenabled',
-			$this->config->getSystemValueBool('appstoreenabled', true)
-		);
-
-		$this->initialStateService->provideInitialState(
-			'doc-url',
-			$this->urlGenerator->linkToDocs('admin-workflowengine')
-		);
-
-		return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): ?string {
-		return 'workflow';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority(): int {
-		return 0;
-	}
-
-	private function entitiesToArray(array $entities) {
-		return array_map(function (IEntity $entity) {
-			$events = array_map(function (IEntityEvent $entityEvent) {
-				return [
-					'eventName' => $entityEvent->getEventName(),
-					'displayName' => $entityEvent->getDisplayName()
-				];
-			}, $entity->getEvents());
-
-			return [
-				'id' => get_class($entity),
-				'icon' => $entity->getIcon(),
-				'name' => $entity->getName(),
-				'events' => $events,
-			];
-		}, $entities);
-	}
-
-	private function operatorsToArray(array $operators) {
-		$operators = array_filter($operators, function (IOperation $operator) {
-			return $operator->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (IOperation $operator) {
-			return [
-				'id' => get_class($operator),
-				'icon' => $operator->getIcon(),
-				'name' => $operator->getDisplayName(),
-				'description' => $operator->getDescription(),
-				'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
-				'isComplex' => $operator instanceof IComplexOperation,
-				'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
-			];
-		}, $operators);
-	}
-
-	private function checksToArray(array $checks) {
-		$checks = array_filter($checks, function (ICheck $check) {
-			return $check->isAvailableForScope($this->getScope());
-		});
-
-		return array_map(function (ICheck $check) {
-			return [
-				'id' => get_class($check),
-				'supportedEntities' => $check->supportedEntities(),
-			];
-		}, $checks);
-	}
+    private IL10N $l10n;
+    private string $appName;
+    private IEventDispatcher $eventDispatcher;
+    protected Manager $manager;
+    private IInitialState $initialStateService;
+    private IConfig $config;
+    private IURLGenerator $urlGenerator;
+
+    public function __construct(
+        string $appName,
+        IL10N $l,
+        IEventDispatcher $eventDispatcher,
+        Manager $manager,
+        IInitialState $initialStateService,
+        IConfig $config,
+        IURLGenerator $urlGenerator
+    ) {
+        $this->appName = $appName;
+        $this->l10n = $l;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->manager = $manager;
+        $this->initialStateService = $initialStateService;
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    abstract public function getScope(): int;
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        // @deprecated in 20.0.0: retire this one in favor of the typed event
+        $this->eventDispatcher->dispatch(
+            'OCP\WorkflowEngine::loadAdditionalSettingScripts',
+            new LoadSettingsScriptsEvent()
+        );
+        $this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent());
+
+        $entities = $this->manager->getEntitiesList();
+        $this->initialStateService->provideInitialState(
+            'entities',
+            $this->entitiesToArray($entities)
+        );
+
+        $operators = $this->manager->getOperatorList();
+        $this->initialStateService->provideInitialState(
+            'operators',
+            $this->operatorsToArray($operators)
+        );
+
+        $checks = $this->manager->getCheckList();
+        $this->initialStateService->provideInitialState(
+            'checks',
+            $this->checksToArray($checks)
+        );
+
+        $this->initialStateService->provideInitialState(
+            'scope',
+            $this->getScope()
+        );
+
+        $this->initialStateService->provideInitialState(
+            'appstoreenabled',
+            $this->config->getSystemValueBool('appstoreenabled', true)
+        );
+
+        $this->initialStateService->provideInitialState(
+            'doc-url',
+            $this->urlGenerator->linkToDocs('admin-workflowengine')
+        );
+
+        return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection(): ?string {
+        return 'workflow';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority(): int {
+        return 0;
+    }
+
+    private function entitiesToArray(array $entities) {
+        return array_map(function (IEntity $entity) {
+            $events = array_map(function (IEntityEvent $entityEvent) {
+                return [
+                    'eventName' => $entityEvent->getEventName(),
+                    'displayName' => $entityEvent->getDisplayName()
+                ];
+            }, $entity->getEvents());
+
+            return [
+                'id' => get_class($entity),
+                'icon' => $entity->getIcon(),
+                'name' => $entity->getName(),
+                'events' => $events,
+            ];
+        }, $entities);
+    }
+
+    private function operatorsToArray(array $operators) {
+        $operators = array_filter($operators, function (IOperation $operator) {
+            return $operator->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (IOperation $operator) {
+            return [
+                'id' => get_class($operator),
+                'icon' => $operator->getIcon(),
+                'name' => $operator->getDisplayName(),
+                'description' => $operator->getDescription(),
+                'fixedEntity' => $operator instanceof ISpecificOperation ? $operator->getEntityId() : '',
+                'isComplex' => $operator instanceof IComplexOperation,
+                'triggerHint' => $operator instanceof IComplexOperation ? $operator->getTriggerHint() : '',
+            ];
+        }, $operators);
+    }
+
+    private function checksToArray(array $checks) {
+        $checks = array_filter($checks, function (ICheck $check) {
+            return $check->isAvailableForScope($this->getScope());
+        });
+
+        return array_map(function (ICheck $check) {
+            return [
+                'id' => get_class($check),
+                'supportedEntities' => $check->supportedEntities(),
+            ];
+        }, $checks);
+    }
 }

lib/private/Authentication/TwoFactorAuth/ProviderSet.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * @return IProvider[]
 	 */
 	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
+		return array_filter($this->providers, function(IProvider $provider) {
 			return !($provider instanceof BackupCodesProvider);
 		});
 	}

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  * Contains all two-factor provider information for the two-factor login challenge
  */
 class ProviderSet {
-	/** @var IProvider */
-	private $providers;
+    /** @var IProvider */
+    private $providers;
 
-	/** @var bool */
-	private $providerMissing;
+    /** @var bool */
+    private $providerMissing;
 
-	/**
-	 * @param IProvider[] $providers
-	 * @param bool $providerMissing
-	 */
-	public function __construct(array $providers, bool $providerMissing) {
-		$this->providers = [];
-		foreach ($providers as $provider) {
-			$this->providers[$provider->getId()] = $provider;
-		}
-		$this->providerMissing = $providerMissing;
-	}
+    /**
+     * @param IProvider[] $providers
+     * @param bool $providerMissing
+     */
+    public function __construct(array $providers, bool $providerMissing) {
+        $this->providers = [];
+        foreach ($providers as $provider) {
+            $this->providers[$provider->getId()] = $provider;
+        }
+        $this->providerMissing = $providerMissing;
+    }
 
-	/**
-	 * @param string $providerId
-	 * @return IProvider|null
-	 */
-	public function getProvider(string $providerId) {
-		return $this->providers[$providerId] ?? null;
-	}
+    /**
+     * @param string $providerId
+     * @return IProvider|null
+     */
+    public function getProvider(string $providerId) {
+        return $this->providers[$providerId] ?? null;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getProviders(): array {
-		return $this->providers;
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getProviders(): array {
+        return $this->providers;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
-			return !($provider instanceof BackupCodesProvider);
-		});
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getPrimaryProviders(): array {
+        return array_filter($this->providers, function (IProvider $provider) {
+            return !($provider instanceof BackupCodesProvider);
+        });
+    }
 
-	public function isProviderMissing(): bool {
-		return $this->providerMissing;
-	}
+    public function isProviderMissing(): bool {
+        return $this->providerMissing;
+    }
 }

lib/private/SystemTag/SystemTagObjectMapper.php

Spacing +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 		$result->closeCursor();
 
 		if ($all) {
-			return ((int)$row[0] === \count($objIds));
+			return ((int) $row[0] === \count($objIds));
 		}
 
 		return (bool) $row;
@@ -259,7 +259,7 @@ 
 		if (\count($tags) !== \count($tagIds)) {
 			// at least one tag missing, bail out
 			$foundTagIds = array_map(
-				function (ISystemTag $tag) {
+				function(ISystemTag $tag) {
 					return $tag->getId();
 				},
 				$tags

Indentation +233 added lines, -233 removed lines

@@ -38,237 +38,237 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class SystemTagObjectMapper implements ISystemTagObjectMapper {
-	public const RELATION_TABLE = 'systemtag_object_mapping';
-
-	/** @var ISystemTagManager */
-	protected $tagManager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param ISystemTagManager $tagManager system tag manager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
-		$this->connection = $connection;
-		$this->tagManager = $tagManager;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagIdsForObjects($objIds, string $objectType): array {
-		if (!\is_array($objIds)) {
-			$objIds = [$objIds];
-		} elseif (empty($objIds)) {
-			return [];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['systemtagid', 'objectid'])
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->setParameter('objecttype', $objectType)
-			->addOrderBy('objectid', 'ASC')
-			->addOrderBy('systemtagid', 'ASC');
-		$chunks = array_chunk($objIds, 900, false);
-		$mapping = [];
-		foreach ($objIds as $objId) {
-			$mapping[$objId] = [];
-		}
-		foreach ($chunks as $chunk) {
-			$query->setParameter('objectids', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-			while ($row = $result->fetch()) {
-				$objectId = $row['objectid'];
-				$mapping[$objectId][] = $row['systemtagid'];
-			}
-
-			$result->closeCursor();
-		}
-
-
-		return $mapping;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->selectDistinct('objectid')
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
-
-		if ($limit) {
-			if (\count($tagIds) !== 1) {
-				throw new \InvalidArgumentException('Limit is only allowed with a single tag');
-			}
-
-			$query->setMaxResults($limit)
-				->orderBy('objectid', 'ASC');
-
-			if ($offset !== '') {
-				$query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
-			}
-		}
-
-		$objectIds = [];
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$objectIds[] = $row['objectid'];
-		}
-
-		return $objectIds;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function assignTags(string $objId, string $objectType, $tagIds) {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::RELATION_TABLE)
-			->values([
-				'objectid' => $query->createNamedParameter($objId),
-				'objecttype' => $query->createNamedParameter($objectType),
-				'systemtagid' => $query->createParameter('tagid'),
-			]);
-
-		$tagsAssigned = [];
-		foreach ($tagIds as $tagId) {
-			try {
-				$query->setParameter('tagid', $tagId);
-				$query->execute();
-				$tagsAssigned[] = $tagId;
-			} catch (UniqueConstraintViolationException $e) {
-				// ignore existing relations
-			}
-		}
-
-		if (empty($tagsAssigned)) {
-			return;
-		}
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
-			MapperEvent::EVENT_ASSIGN,
-			$objectType,
-			$objId,
-			$tagsAssigned
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unassignTags(string $objId, string $objectType, $tagIds) {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::RELATION_TABLE)
-			->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
-			->setParameter('objectid', $objId)
-			->setParameter('objecttype', $objectType)
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
-			MapperEvent::EVENT_UNASSIGN,
-			$objectType,
-			$objId,
-			$tagIds
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool {
-		$this->assertTagsExist([$tagId]);
-
-		if (!\is_array($objIds)) {
-			$objIds = [$objIds];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		if (!$all) {
-			// If we only need one entry, we make the query lighter, by not
-			// counting the elements
-			$query->select('*')
-				->setMaxResults(1);
-		} else {
-			$query->select($query->func()->count($query->expr()->literal(1)));
-		}
-
-		$query->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
-			->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
-			->setParameter('tagid', $tagId)
-			->setParameter('objecttype', $objectType);
-
-		$result = $query->execute();
-		$row = $result->fetch(\PDO::FETCH_NUM);
-		$result->closeCursor();
-
-		if ($all) {
-			return ((int)$row[0] === \count($objIds));
-		}
-
-		return (bool) $row;
-	}
-
-	/**
-	 * Asserts that all the given tag ids exist.
-	 *
-	 * @param string[] $tagIds tag ids to check
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
-	 */
-	private function assertTagsExist($tagIds) {
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-		if (\count($tags) !== \count($tagIds)) {
-			// at least one tag missing, bail out
-			$foundTagIds = array_map(
-				function (ISystemTag $tag) {
-					return $tag->getId();
-				},
-				$tags
-			);
-			$missingTagIds = array_diff($tagIds, $foundTagIds);
-			throw new TagNotFoundException(
-				'Tags not found', 0, null, $missingTagIds
-			);
-		}
-	}
+    public const RELATION_TABLE = 'systemtag_object_mapping';
+
+    /** @var ISystemTagManager */
+    protected $tagManager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $connection database connection
+     * @param ISystemTagManager $tagManager system tag manager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
+        $this->connection = $connection;
+        $this->tagManager = $tagManager;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagIdsForObjects($objIds, string $objectType): array {
+        if (!\is_array($objIds)) {
+            $objIds = [$objIds];
+        } elseif (empty($objIds)) {
+            return [];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['systemtagid', 'objectid'])
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->setParameter('objecttype', $objectType)
+            ->addOrderBy('objectid', 'ASC')
+            ->addOrderBy('systemtagid', 'ASC');
+        $chunks = array_chunk($objIds, 900, false);
+        $mapping = [];
+        foreach ($objIds as $objId) {
+            $mapping[$objId] = [];
+        }
+        foreach ($chunks as $chunk) {
+            $query->setParameter('objectids', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+            while ($row = $result->fetch()) {
+                $objectId = $row['objectid'];
+                $mapping[$objectId][] = $row['systemtagid'];
+            }
+
+            $result->closeCursor();
+        }
+
+
+        return $mapping;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->selectDistinct('objectid')
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
+
+        if ($limit) {
+            if (\count($tagIds) !== 1) {
+                throw new \InvalidArgumentException('Limit is only allowed with a single tag');
+            }
+
+            $query->setMaxResults($limit)
+                ->orderBy('objectid', 'ASC');
+
+            if ($offset !== '') {
+                $query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
+            }
+        }
+
+        $objectIds = [];
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $objectIds[] = $row['objectid'];
+        }
+
+        return $objectIds;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function assignTags(string $objId, string $objectType, $tagIds) {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::RELATION_TABLE)
+            ->values([
+                'objectid' => $query->createNamedParameter($objId),
+                'objecttype' => $query->createNamedParameter($objectType),
+                'systemtagid' => $query->createParameter('tagid'),
+            ]);
+
+        $tagsAssigned = [];
+        foreach ($tagIds as $tagId) {
+            try {
+                $query->setParameter('tagid', $tagId);
+                $query->execute();
+                $tagsAssigned[] = $tagId;
+            } catch (UniqueConstraintViolationException $e) {
+                // ignore existing relations
+            }
+        }
+
+        if (empty($tagsAssigned)) {
+            return;
+        }
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
+            MapperEvent::EVENT_ASSIGN,
+            $objectType,
+            $objId,
+            $tagsAssigned
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unassignTags(string $objId, string $objectType, $tagIds) {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::RELATION_TABLE)
+            ->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
+            ->setParameter('objectid', $objId)
+            ->setParameter('objecttype', $objectType)
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
+            MapperEvent::EVENT_UNASSIGN,
+            $objectType,
+            $objId,
+            $tagIds
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool {
+        $this->assertTagsExist([$tagId]);
+
+        if (!\is_array($objIds)) {
+            $objIds = [$objIds];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        if (!$all) {
+            // If we only need one entry, we make the query lighter, by not
+            // counting the elements
+            $query->select('*')
+                ->setMaxResults(1);
+        } else {
+            $query->select($query->func()->count($query->expr()->literal(1)));
+        }
+
+        $query->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
+            ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
+            ->setParameter('tagid', $tagId)
+            ->setParameter('objecttype', $objectType);
+
+        $result = $query->execute();
+        $row = $result->fetch(\PDO::FETCH_NUM);
+        $result->closeCursor();
+
+        if ($all) {
+            return ((int)$row[0] === \count($objIds));
+        }
+
+        return (bool) $row;
+    }
+
+    /**
+     * Asserts that all the given tag ids exist.
+     *
+     * @param string[] $tagIds tag ids to check
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
+     */
+    private function assertTagsExist($tagIds) {
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+        if (\count($tags) !== \count($tagIds)) {
+            // at least one tag missing, bail out
+            $foundTagIds = array_map(
+                function (ISystemTag $tag) {
+                    return $tag->getId();
+                },
+                $tags
+            );
+            $missingTagIds = array_diff($tagIds, $foundTagIds);
+            throw new TagNotFoundException(
+                'Tags not found', 0, null, $missingTagIds
+            );
+        }
+    }
 }

lib/private/Collaboration/Resources/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
+		array_map(function(IResource $r) use ($resource) {
 			if ($this->isSameResource($r, $resource)) {
 				throw new ResourceException('Already part of the collection');
 			}
@@ -158,7 +158,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+		$this->resources = array_filter($this->getResources(), function(IResource $r) use ($resource) {
 			return !$this->isSameResource($r, $resource);
 		});
 

Indentation +190 added lines, -190 removed lines

@@ -37,194 +37,194 @@
 use OCP\IUser;
 
 class Collection implements ICollection {
-	/** @var Manager */
-	protected $manager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var int */
-	protected $id;
-
-	/** @var string */
-	protected $name;
-
-	/** @var IUser|null */
-	protected $userForAccess;
-
-	/** @var bool|null */
-	protected $access;
-
-	/** @var IResource[] */
-	protected $resources;
-
-	public function __construct(
-		IManager $manager,
-		IDBConnection $connection,
-		int $id,
-		string $name,
-		?IUser $userForAccess = null,
-		?bool $access = null
-	) {
-		$this->manager = $manager;
-		$this->connection = $connection;
-		$this->id = $id;
-		$this->name = $name;
-		$this->userForAccess = $userForAccess;
-		$this->access = $access;
-		$this->resources = [];
-	}
-
-	/**
-	 * @return int
-	 * @since 16.0.0
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @param string $name
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(Manager::TABLE_COLLECTIONS)
-			->set('name', $query->createNamedParameter($name))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->name = $name;
-	}
-
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array {
-		if (empty($this->resources)) {
-			$this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
-		}
-
-		return $this->resources;
-	}
-
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @param IResource $resource
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
-			if ($this->isSameResource($r, $resource)) {
-				throw new ResourceException('Already part of the collection');
-			}
-		}, $this->getResources());
-
-		$this->resources[] = $resource;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(Manager::TABLE_RESOURCES)
-			->values([
-				'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-			]);
-
-		try {
-			$query->execute();
-		} catch (ConstraintViolationException $e) {
-			throw new ResourceException('Already part of the collection');
-		}
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-	}
-
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @param IResource $resource
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
-			return !$this->isSameResource($r, $resource);
-		});
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_RESOURCES)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->execute();
-
-		if (empty($this->resources)) {
-			$this->removeCollection();
-		} else {
-			$this->manager->invalidateAccessCacheForCollection($this);
-		}
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function isSameResource(IResource $resource1, IResource $resource2): bool {
-		return $resource1->getType() === $resource2->getType() &&
-			$resource1->getId() === $resource2->getId();
-	}
-
-	protected function removeCollection(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-		$this->id = 0;
-	}
+    /** @var Manager */
+    protected $manager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var int */
+    protected $id;
+
+    /** @var string */
+    protected $name;
+
+    /** @var IUser|null */
+    protected $userForAccess;
+
+    /** @var bool|null */
+    protected $access;
+
+    /** @var IResource[] */
+    protected $resources;
+
+    public function __construct(
+        IManager $manager,
+        IDBConnection $connection,
+        int $id,
+        string $name,
+        ?IUser $userForAccess = null,
+        ?bool $access = null
+    ) {
+        $this->manager = $manager;
+        $this->connection = $connection;
+        $this->id = $id;
+        $this->name = $name;
+        $this->userForAccess = $userForAccess;
+        $this->access = $access;
+        $this->resources = [];
+    }
+
+    /**
+     * @return int
+     * @since 16.0.0
+     */
+    public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     * @since 16.0.0
+     */
+    public function setName(string $name): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(Manager::TABLE_COLLECTIONS)
+            ->set('name', $query->createNamedParameter($name))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->name = $name;
+    }
+
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array {
+        if (empty($this->resources)) {
+            $this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
+        }
+
+        return $this->resources;
+    }
+
+    /**
+     * Adds a resource to a collection
+     *
+     * @param IResource $resource
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void {
+        array_map(function (IResource $r) use ($resource) {
+            if ($this->isSameResource($r, $resource)) {
+                throw new ResourceException('Already part of the collection');
+            }
+        }, $this->getResources());
+
+        $this->resources[] = $resource;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(Manager::TABLE_RESOURCES)
+            ->values([
+                'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (ConstraintViolationException $e) {
+            throw new ResourceException('Already part of the collection');
+        }
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+    }
+
+    /**
+     * Removes a resource from a collection
+     *
+     * @param IResource $resource
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void {
+        $this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+            return !$this->isSameResource($r, $resource);
+        });
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_RESOURCES)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
+        $query->execute();
+
+        if (empty($this->resources)) {
+            $this->removeCollection();
+        } else {
+            $this->manager->invalidateAccessCacheForCollection($this);
+        }
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function isSameResource(IResource $resource1, IResource $resource2): bool {
+        return $resource1->getType() === $resource2->getType() &&
+            $resource1->getId() === $resource2->getId();
+    }
+
+    protected function removeCollection(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+        $this->id = 0;
+    }
 }

lib/public/Accounts/PropertyDoesNotExistException.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 * @since 15.0.0
 	 */
 	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  *
  */
 class PropertyDoesNotExistException extends \Exception {
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 15.0.0
-	 */
-	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 15.0.0
+     */
+    public function __construct($property) {
+        parent::__construct('Property ' . $property . ' does not exist.');
+    }
 }

lib/public/AppFramework/Http/StreamResponse.php

Indentation +26 added lines, -26 removed lines

@@ -35,35 +35,35 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct($filePath) {
-		parent::__construct();
+    /**
+     * @param string|resource $filePath the path to the file or a file handle which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct($filePath) {
+        parent::__construct();
 
-		$this->filePath = $filePath;
-	}
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback(IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback(IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }