nextcloud / server

lib/private/Preview/WebP.php

Indentation +9 added lines, -9 removed lines

@@ -29,14 +29,14 @@
 use OCP\Files\FileInfo;
 
 class WebP extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/webp/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/webp/';
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)(imagetypes() & IMG_WEBP);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 	}
 
 	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() & IMG_WEBP);
+		return (bool) (imagetypes() & IMG_WEBP);
 	}
 }

apps/dav/lib/AppInfo/PluginManager.php

Spacing +9 added lines, -9 removed lines

@@ -261,7 +261,7 @@ 
 			}
 		}
 
-		throw new \Exception('Could not load ' . $className, 0, $e);
+		throw new \Exception('Could not load '.$className, 0, $e);
 	}
 
 
@@ -271,10 +271,10 @@ 
 	 * @throws \Exception
 	 */
 	private function loadSabrePluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ServerPlugin {
+		return array_map(function(string $className): ServerPlugin {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof ServerPlugin)) {
-				throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
+				throw new \Exception('Sabre server plugin '.$className.' does not implement the '.ServerPlugin::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -285,10 +285,10 @@ 
 	 * @return Collection[]
 	 */
 	private function loadSabreCollectionsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): Collection {
+		return array_map(function(string $className): Collection {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof Collection)) {
-				throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
+				throw new \Exception('Sabre collection plugin '.$className.' does not implement the '.Collection::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -299,10 +299,10 @@ 
 	 * @return IAddressBookProvider[]
 	 */
 	private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): IAddressBookProvider {
+		return array_map(function(string $className): IAddressBookProvider {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
+				throw new \Exception('Sabre address book plugin class '.$className.' does not implement the '.IAddressBookProvider::class.' interface');
 			}
 			return $instance;
 		}, $classes);
@@ -313,10 +313,10 @@ 
 	 * @return ICalendarProvider[]
 	 */
 	private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ICalendarProvider {
+		return array_map(function(string $className): ICalendarProvider {
 			$instance = $this->createClass($className);
 			if (!($instance instanceof ICalendarProvider)) {
-				throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
+				throw new \Exception('Sabre calendar plugin class '.$className.' does not implement the '.ICalendarProvider::class.' interface');
 			}
 			return $instance;
 		}, $classes);

Indentation +268 added lines, -268 removed lines

@@ -27,272 +27,272 @@
  */
 class PluginManager {
 
-	/**
-	 * App plugins
-	 *
-	 * @var ServerPlugin[]
-	 */
-	private $plugins = [];
-
-	/**
-	 * App collections
-	 *
-	 * @var Collection[]
-	 */
-	private $collections = [];
-
-	/**
-	 * Address book plugins
-	 *
-	 * @var IAddressBookProvider[]
-	 */
-	private $addressBookPlugins = [];
-
-	/**
-	 * Calendar plugins
-	 *
-	 * @var ICalendarProvider[]
-	 */
-	private $calendarPlugins = [];
-
-	/** @var bool */
-	private $populated = false;
-
-	/**
-	 * Contstruct a PluginManager
-	 *
-	 * @param ServerContainer $container server container for resolving plugin classes
-	 * @param IAppManager $appManager app manager to loading apps and their info
-	 */
-	public function __construct(
-		private ServerContainer $container,
-		private IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * Returns an array of app-registered plugins
-	 *
-	 * @return ServerPlugin[]
-	 */
-	public function getAppPlugins() {
-		$this->populate();
-		return $this->plugins;
-	}
-
-	/**
-	 * Returns an array of app-registered collections
-	 *
-	 * @return array
-	 */
-	public function getAppCollections() {
-		$this->populate();
-		return $this->collections;
-	}
-
-	/**
-	 * @return IAddressBookProvider[]
-	 */
-	public function getAddressBookPlugins(): array {
-		$this->populate();
-		return $this->addressBookPlugins;
-	}
-
-	/**
-	 * Returns an array of app-registered calendar plugins
-	 *
-	 * @return ICalendarProvider[]
-	 */
-	public function getCalendarPlugins():array {
-		$this->populate();
-		return $this->calendarPlugins;
-	}
-
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate(): void {
-		if ($this->populated) {
-			return;
-		}
-		$this->populated = true;
-
-		$this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
-
-		foreach ($this->appManager->getEnabledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
-				continue;
-			}
-			$plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			foreach ($plugins as $plugin) {
-				$this->plugins[] = $plugin;
-			}
-
-			$collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-			foreach ($collections as $collection) {
-				$this->collections[] = $collection;
-			}
-
-			$addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
-			foreach ($addresbookPlugins as $addresbookPlugin) {
-				$this->addressBookPlugins[] = $addresbookPlugin;
-			}
-
-			$calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
-			foreach ($calendarPlugins as $calendarPlugin) {
-				$this->calendarPlugins[] = $calendarPlugin;
-			}
-		}
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
-				if (isset($array['sabre']['plugins']['plugin'])) {
-					$items = $array['sabre']['plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCollectionList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
-				if (isset($array['sabre']['collections']['collection'])) {
-					$items = $array['sabre']['collections']['collection'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractAddressBookPluginList(array $array): array {
-		if (!isset($array['sabre']) || !is_array($array['sabre'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
-			return [];
-		}
-
-		$items = $array['sabre']['address-book-plugins']['plugin'];
-		if (!is_array($items)) {
-			$items = [$items];
-		}
-		return $items;
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCalendarPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
-				if (isset($array['sabre']['calendar-plugins']['plugin'])) {
-					$items = $array['sabre']['calendar-plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	private function createClass(string $className): object {
-		try {
-			return $this->container->get($className);
-		} catch (QueryException $e) {
-			if (class_exists($className)) {
-				return new $className();
-			}
-		}
-
-		throw new \Exception('Could not load ' . $className, 0, $e);
-	}
-
-
-	/**
-	 * @param string[] $classes
-	 * @return ServerPlugin[]
-	 * @throws \Exception
-	 */
-	private function loadSabrePluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ServerPlugin {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ServerPlugin)) {
-				throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return Collection[]
-	 */
-	private function loadSabreCollectionsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): Collection {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof Collection)) {
-				throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return IAddressBookProvider[]
-	 */
-	private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): IAddressBookProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return ICalendarProvider[]
-	 */
-	private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ICalendarProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ICalendarProvider)) {
-				throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
+    /**
+     * App plugins
+     *
+     * @var ServerPlugin[]
+     */
+    private $plugins = [];
+
+    /**
+     * App collections
+     *
+     * @var Collection[]
+     */
+    private $collections = [];
+
+    /**
+     * Address book plugins
+     *
+     * @var IAddressBookProvider[]
+     */
+    private $addressBookPlugins = [];
+
+    /**
+     * Calendar plugins
+     *
+     * @var ICalendarProvider[]
+     */
+    private $calendarPlugins = [];
+
+    /** @var bool */
+    private $populated = false;
+
+    /**
+     * Contstruct a PluginManager
+     *
+     * @param ServerContainer $container server container for resolving plugin classes
+     * @param IAppManager $appManager app manager to loading apps and their info
+     */
+    public function __construct(
+        private ServerContainer $container,
+        private IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * Returns an array of app-registered plugins
+     *
+     * @return ServerPlugin[]
+     */
+    public function getAppPlugins() {
+        $this->populate();
+        return $this->plugins;
+    }
+
+    /**
+     * Returns an array of app-registered collections
+     *
+     * @return array
+     */
+    public function getAppCollections() {
+        $this->populate();
+        return $this->collections;
+    }
+
+    /**
+     * @return IAddressBookProvider[]
+     */
+    public function getAddressBookPlugins(): array {
+        $this->populate();
+        return $this->addressBookPlugins;
+    }
+
+    /**
+     * Returns an array of app-registered calendar plugins
+     *
+     * @return ICalendarProvider[]
+     */
+    public function getCalendarPlugins():array {
+        $this->populate();
+        return $this->calendarPlugins;
+    }
+
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate(): void {
+        if ($this->populated) {
+            return;
+        }
+        $this->populated = true;
+
+        $this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
+
+        foreach ($this->appManager->getEnabledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+                continue;
+            }
+            $plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            foreach ($plugins as $plugin) {
+                $this->plugins[] = $plugin;
+            }
+
+            $collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+            foreach ($collections as $collection) {
+                $this->collections[] = $collection;
+            }
+
+            $addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
+            foreach ($addresbookPlugins as $addresbookPlugin) {
+                $this->addressBookPlugins[] = $addresbookPlugin;
+            }
+
+            $calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
+            foreach ($calendarPlugins as $calendarPlugin) {
+                $this->calendarPlugins[] = $calendarPlugin;
+            }
+        }
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+                if (isset($array['sabre']['plugins']['plugin'])) {
+                    $items = $array['sabre']['plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCollectionList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+                if (isset($array['sabre']['collections']['collection'])) {
+                    $items = $array['sabre']['collections']['collection'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractAddressBookPluginList(array $array): array {
+        if (!isset($array['sabre']) || !is_array($array['sabre'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
+            return [];
+        }
+
+        $items = $array['sabre']['address-book-plugins']['plugin'];
+        if (!is_array($items)) {
+            $items = [$items];
+        }
+        return $items;
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCalendarPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
+                if (isset($array['sabre']['calendar-plugins']['plugin'])) {
+                    $items = $array['sabre']['calendar-plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    private function createClass(string $className): object {
+        try {
+            return $this->container->get($className);
+        } catch (QueryException $e) {
+            if (class_exists($className)) {
+                return new $className();
+            }
+        }
+
+        throw new \Exception('Could not load ' . $className, 0, $e);
+    }
+
+
+    /**
+     * @param string[] $classes
+     * @return ServerPlugin[]
+     * @throws \Exception
+     */
+    private function loadSabrePluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ServerPlugin {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ServerPlugin)) {
+                throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return Collection[]
+     */
+    private function loadSabreCollectionsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): Collection {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof Collection)) {
+                throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return IAddressBookProvider[]
+     */
+    private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): IAddressBookProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof IAddressBookProvider)) {
+                throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return ICalendarProvider[]
+     */
+    private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ICalendarProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ICalendarProvider)) {
+                throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
 }

lib/public/Files/Cache/AbstractCacheEvent.php

Indentation +51 added lines, -51 removed lines

@@ -35,61 +35,61 @@
  * @since 22.0.0
  */
 class AbstractCacheEvent extends Event implements ICacheEvent {
-	protected $storage;
-	protected $path;
-	protected $fileId;
-	protected $storageId;
+    protected $storage;
+    protected $path;
+    protected $fileId;
+    protected $storageId;
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param int $fileId
-	 * @since 22.0.0
-	 */
-	public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
-		$this->storage = $storage;
-		$this->path = $path;
-		$this->fileId = $fileId;
-		$this->storageId = $storageId;
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param int $fileId
+     * @since 22.0.0
+     */
+    public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
+        $this->storage = $storage;
+        $this->path = $path;
+        $this->fileId = $fileId;
+        $this->storageId = $storageId;
+    }
 
-	/**
-	 * @return IStorage
-	 * @since 22.0.0
-	 */
-	public function getStorage(): IStorage {
-		return $this->storage;
-	}
+    /**
+     * @return IStorage
+     * @since 22.0.0
+     */
+    public function getStorage(): IStorage {
+        return $this->storage;
+    }
 
-	/**
-	 * @return string
-	 * @since 22.0.0
-	 */
-	public function getPath(): string {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 22.0.0
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
 
-	/**
-	 * @param string $path
-	 * @since 22.0.0
-	 */
-	public function setPath(string $path): void {
-		$this->path = $path;
-	}
+    /**
+     * @param string $path
+     * @since 22.0.0
+     */
+    public function setPath(string $path): void {
+        $this->path = $path;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getFileId(): int {
-		return $this->fileId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getFileId(): int {
+        return $this->fileId;
+    }
 
-	/**
-	 * @return int
-	 * @since 22.0.0
-	 */
-	public function getStorageId(): int {
-		return $this->storageId;
-	}
+    /**
+     * @return int
+     * @since 22.0.0
+     */
+    public function getStorageId(): int {
+        return $this->storageId;
+    }
 }

apps/dav/lib/Migration/Version1011Date20190806104428.php

Indentation +34 added lines, -34 removed lines

@@ -38,41 +38,41 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1011Date20190806104428 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('dav_cal_proxy');
-		$table->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$table->addColumn('owner_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('proxy_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('permissions', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
+        $table = $schema->createTable('dav_cal_proxy');
+        $table->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('owner_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('proxy_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('permissions', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
 
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
-		$table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx');
+        $table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1017Date20210216083742.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version1017Date20210216083742 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('dav_cal_proxy');
-		if ($table->hasIndex('dav_cal_proxy_ioid')) {
-			$table->dropIndex('dav_cal_proxy_ioid');
-		}
+        $table = $schema->getTable('dav_cal_proxy');
+        if ($table->hasIndex('dav_cal_proxy_ioid')) {
+            $table->dropIndex('dav_cal_proxy_ioid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version22000Date20210216084241.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version22000Date20210216084241 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share_external');
-		if ($table->hasIndex('sh_external_user')) {
-			$table->dropIndex('sh_external_user');
-		}
+        $table = $schema->getTable('share_external');
+        if ($table->hasIndex('sh_external_user')) {
+            $table->dropIndex('sh_external_user');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
 			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
 			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
+				'label' => $remoteGroup." ($serverUrl)",
 				'guid' => $remoteGroup,
 				'name' => $remoteGroup,
 				'value' => [

Indentation +49 added lines, -49 removed lines

@@ -14,59 +14,59 @@
 use OCP\Share\IShare;
 
 class RemoteGroupPlugin implements ISearchPlugin {
-	private bool $enabled = false;
+    private bool $enabled = false;
 
-	public function __construct(
-		ICloudFederationProviderManager $cloudFederationProviderManager,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		try {
-			$fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
-			$supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
-			if (in_array('group', $supportedShareTypes)) {
-				$this->enabled = true;
-			}
-		} catch (\Exception $e) {
-			// do nothing, just don't enable federated group shares
-		}
-	}
+    public function __construct(
+        ICloudFederationProviderManager $cloudFederationProviderManager,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        try {
+            $fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
+            $supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
+            if (in_array('group', $supportedShareTypes)) {
+                $this->enabled = true;
+            }
+        } catch (\Exception $e) {
+            // do nothing, just don't enable federated group shares
+        }
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remote_groups');
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remote_groups');
 
-		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
-			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
-				'guid' => $remoteGroup,
-				'name' => $remoteGroup,
-				'value' => [
-					'shareType' => IShare::TYPE_REMOTE_GROUP,
-					'shareWith' => $search,
-					'server' => $serverUrl,
-				],
-			];
-		}
+        if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            [$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
+            $result['exact'][] = [
+                'label' => $remoteGroup . " ($serverUrl)",
+                'guid' => $remoteGroup,
+                'name' => $remoteGroup,
+                'value' => [
+                    'shareType' => IShare::TYPE_REMOTE_GROUP,
+                    'shareWith' => $search,
+                    'server' => $serverUrl,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split group and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitGroupRemote($address): array {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split group and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitGroupRemote($address): array {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

apps/dav/lib/CardDAV/Plugin.php

Indentation +39 added lines, -39 removed lines

@@ -31,46 +31,46 @@
 use Sabre\DAV\Server;
 
 class Plugin extends \Sabre\CardDAV\Plugin {
-	public function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-		parent::initialize($server);
-	}
+    public function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+        parent::initialize($server);
+    }
 
-	/**
-	 * Returns the addressbook home for a given principal
-	 *
-	 * @param string $principal
-	 * @return string|null
-	 */
-	protected function getAddressbookHomeForPrincipal($principal) {
-		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
-		}
-	}
+    /**
+     * Returns the addressbook home for a given principal
+     *
+     * @param string $principal
+     * @return string|null
+     */
+    protected function getAddressbookHomeForPrincipal($principal) {
+        if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+        }
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$ns = '{http://owncloud.org/ns}';
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $ns = '{http://owncloud.org/ns}';
 
-		if ($node instanceof AddressBook) {
-			$propFind->handle($ns . 'groups', function () use ($node) {
-				return new Groups($node->getContactsGroups());
-			});
-		}
-	}
+        if ($node instanceof AddressBook) {
+            $propFind->handle($ns . 'groups', function () use ($node) {
+                return new Groups($node->getContactsGroups());
+            });
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -45,15 +45,15 @@ 
 	protected function getAddressbookHomeForPrincipal($principal) {
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/users/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/groups/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/system/'.$principalId;
 		}
 	}
 
@@ -68,7 +68,7 @@ 
 		$ns = '{http://owncloud.org/ns}';
 
 		if ($node instanceof AddressBook) {
-			$propFind->handle($ns . 'groups', function () use ($node) {
+			$propFind->handle($ns.'groups', function() use ($node) {
 				return new Groups($node->getContactsGroups());
 			});
 		}

apps/dav/lib/Traits/PrincipalProxyTrait.php

Indentation +186 added lines, -186 removed lines

@@ -36,190 +36,190 @@
  */
 trait PrincipalProxyTrait {
 
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$members = [];
-
-		if ($this->isProxyPrincipal($principal)) {
-			$realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
-			$principalArray = $this->getPrincipalByPath($realPrincipal);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
-			foreach ($proxies as $proxy) {
-				if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-					$members[] = $proxy->getProxyId();
-				}
-
-				if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-					$members[] = $proxy->getProxyId();
-				}
-			}
-		}
-
-		return $members;
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		[$prefix, $name] = \Sabre\Uri\split($principal);
-
-		if ($prefix !== $this->principalPrefix) {
-			return [];
-		}
-
-		$principalArray = $this->getPrincipalByPath($principal);
-		if (!$principalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$groups = [];
-		$proxies = $this->proxyMapper->getProxiesFor($principal);
-		foreach ($proxies as $proxy) {
-			if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
-			}
-
-			if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
-			}
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		[$principalUri, $target] = \Sabre\Uri\split($principal);
-
-		if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
-			throw new Exception('Setting members of the group is not supported yet');
-		}
-
-		$masterPrincipalArray = $this->getPrincipalByPath($principalUri);
-		if (!$masterPrincipalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$permission = ProxyMapper::PERMISSION_READ;
-		if ($target === 'calendar-proxy-write') {
-			$permission |= ProxyMapper::PERMISSION_WRITE;
-		}
-
-		[$prefix, $owner] = \Sabre\Uri\split($principalUri);
-		$proxies = $this->proxyMapper->getProxiesOf($principalUri);
-
-		foreach ($members as $member) {
-			[$prefix, $name] = \Sabre\Uri\split($member);
-
-			if ($prefix !== $this->principalPrefix) {
-				throw new Exception('Invalid member group prefix: ' . $prefix);
-			}
-
-			$principalArray = $this->getPrincipalByPath($member);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$found = false;
-			foreach ($proxies as $proxy) {
-				if ($proxy->getProxyId() === $member) {
-					$found = true;
-					$proxy->setPermissions($proxy->getPermissions() | $permission);
-					$this->proxyMapper->update($proxy);
-
-					$proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
-						return $p->getId() !== $proxy->getId();
-					});
-					break;
-				}
-			}
-
-			if ($found === false) {
-				$proxy = new Proxy();
-				$proxy->setOwnerId($principalUri);
-				$proxy->setProxyId($member);
-				$proxy->setPermissions($permission);
-				$this->proxyMapper->insert($proxy);
-			}
-		}
-
-		// Delete all remaining proxies
-		foreach ($proxies as $proxy) {
-			// Write and Read Proxies have individual requests,
-			// so only delete proxies of this permission
-			if ($proxy->getPermissions() === $permission) {
-				$this->proxyMapper->delete($proxy);
-			}
-		}
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isProxyPrincipal(string $principalUri):bool {
-		[$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
-		[$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
-
-		if (!isset($prefix) || !isset($userId)) {
-			return false;
-		}
-		if ($prefix !== $this->principalPrefix) {
-			return false;
-		}
-
-		return $proxy === 'calendar-proxy-read'
-			|| $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isReadProxyPrincipal(string $principalUri):bool {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-read';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isWriteProxyPrincipal(string $principalUri):bool {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return string
-	 */
-	private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
-		[$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
-		return $realPrincipalUri;
-	}
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $members = [];
+
+        if ($this->isProxyPrincipal($principal)) {
+            $realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
+            $principalArray = $this->getPrincipalByPath($realPrincipal);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
+            foreach ($proxies as $proxy) {
+                if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                    $members[] = $proxy->getProxyId();
+                }
+
+                if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                    $members[] = $proxy->getProxyId();
+                }
+            }
+        }
+
+        return $members;
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        [$prefix, $name] = \Sabre\Uri\split($principal);
+
+        if ($prefix !== $this->principalPrefix) {
+            return [];
+        }
+
+        $principalArray = $this->getPrincipalByPath($principal);
+        if (!$principalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $groups = [];
+        $proxies = $this->proxyMapper->getProxiesFor($principal);
+        foreach ($proxies as $proxy) {
+            if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
+            }
+
+            if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
+            }
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        [$principalUri, $target] = \Sabre\Uri\split($principal);
+
+        if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
+            throw new Exception('Setting members of the group is not supported yet');
+        }
+
+        $masterPrincipalArray = $this->getPrincipalByPath($principalUri);
+        if (!$masterPrincipalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $permission = ProxyMapper::PERMISSION_READ;
+        if ($target === 'calendar-proxy-write') {
+            $permission |= ProxyMapper::PERMISSION_WRITE;
+        }
+
+        [$prefix, $owner] = \Sabre\Uri\split($principalUri);
+        $proxies = $this->proxyMapper->getProxiesOf($principalUri);
+
+        foreach ($members as $member) {
+            [$prefix, $name] = \Sabre\Uri\split($member);
+
+            if ($prefix !== $this->principalPrefix) {
+                throw new Exception('Invalid member group prefix: ' . $prefix);
+            }
+
+            $principalArray = $this->getPrincipalByPath($member);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $found = false;
+            foreach ($proxies as $proxy) {
+                if ($proxy->getProxyId() === $member) {
+                    $found = true;
+                    $proxy->setPermissions($proxy->getPermissions() | $permission);
+                    $this->proxyMapper->update($proxy);
+
+                    $proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
+                        return $p->getId() !== $proxy->getId();
+                    });
+                    break;
+                }
+            }
+
+            if ($found === false) {
+                $proxy = new Proxy();
+                $proxy->setOwnerId($principalUri);
+                $proxy->setProxyId($member);
+                $proxy->setPermissions($permission);
+                $this->proxyMapper->insert($proxy);
+            }
+        }
+
+        // Delete all remaining proxies
+        foreach ($proxies as $proxy) {
+            // Write and Read Proxies have individual requests,
+            // so only delete proxies of this permission
+            if ($proxy->getPermissions() === $permission) {
+                $this->proxyMapper->delete($proxy);
+            }
+        }
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isProxyPrincipal(string $principalUri):bool {
+        [$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
+        [$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
+
+        if (!isset($prefix) || !isset($userId)) {
+            return false;
+        }
+        if ($prefix !== $this->principalPrefix) {
+            return false;
+        }
+
+        return $proxy === 'calendar-proxy-read'
+            || $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isReadProxyPrincipal(string $principalUri):bool {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-read';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isWriteProxyPrincipal(string $principalUri):bool {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return string
+     */
+    private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
+        [$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
+        return $realPrincipalUri;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -92,11 +92,11 @@ 
 		$proxies = $this->proxyMapper->getProxiesFor($principal);
 		foreach ($proxies as $proxy) {
 			if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
+				$groups[] = $proxy->getOwnerId().'/calendar-proxy-read';
 			}
 
 			if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
+				$groups[] = $proxy->getOwnerId().'/calendar-proxy-write';
 			}
 		}
 
@@ -136,7 +136,7 @@ 
 			[$prefix, $name] = \Sabre\Uri\split($member);
 
 			if ($prefix !== $this->principalPrefix) {
-				throw new Exception('Invalid member group prefix: ' . $prefix);
+				throw new Exception('Invalid member group prefix: '.$prefix);
 			}
 
 			$principalArray = $this->getPrincipalByPath($member);
@@ -151,7 +151,7 @@ 
 					$proxy->setPermissions($proxy->getPermissions() | $permission);
 					$this->proxyMapper->update($proxy);
 
-					$proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
+					$proxies = array_filter($proxies, function(Proxy $p) use ($proxy) {
 						return $p->getId() !== $proxy->getId();
 					});
 					break;