nextcloud / server

apps/federation/lib/Migration/Version1010Date20200630191302.php

Indentation +46 added lines, -46 removed lines

@@ -33,51 +33,51 @@
 
 class Version1010Date20200630191302 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();
 
-		if (!$schema->hasTable('trusted_servers')) {
-			$table = $schema->createTable('trusted_servers');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('url', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-			]);
-			$table->addColumn('url_hash', Types::STRING, [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => false,
-				'length' => 128,
-			]);
-			$table->addColumn('shared_secret', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-			]);
-			$table->addColumn('status', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 2,
-			]);
-			$table->addColumn('sync_token', Types::STRING, [
-				'notnull' => false,
-				'length' => 512,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['url_hash'], 'url_hash');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('trusted_servers')) {
+            $table = $schema->createTable('trusted_servers');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('url', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+            ]);
+            $table->addColumn('url_hash', Types::STRING, [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => false,
+                'length' => 128,
+            ]);
+            $table->addColumn('shared_secret', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+            ]);
+            $table->addColumn('status', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 2,
+            ]);
+            $table->addColumn('sync_token', Types::STRING, [
+                'notnull' => false,
+                'length' => 512,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['url_hash'], 'url_hash');
+        }
+        return $schema;
+    }
 }

apps/contactsinteraction/lib/AppInfo/Application.php

Indentation +9 added lines, -9 removed lines

@@ -33,16 +33,16 @@
 use OCP\Contacts\Events\ContactInteractedWithEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'contactsinteraction';
+    public const APP_ID = 'contactsinteraction';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/cloud_federation_api/lib/AppInfo/Application.php

Indentation +9 added lines, -9 removed lines

@@ -33,16 +33,16 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'cloud_federation_api';
+    public const APP_ID = 'cloud_federation_api';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

lib/private/ServerContainer.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 
 		if (isset($this->namespaces[$namespace])) {
 			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+				$applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
 				if (class_exists($applicationClassName)) {
 					$app = new $applicationClassName();
 					if (isset($this->appContainers[$namespace])) {
@@ -159,7 +159,7 @@ 
 		}
 
 		try {
-			[,$namespace,] = explode('\\', $id);
+			[,$namespace, ] = explode('\\', $id);
 			return $this->getAppContainer(strtolower($namespace), $namespace);
 		} catch (QueryException $e) {
 			return null;

Indentation +150 added lines, -150 removed lines

@@ -21,154 +21,154 @@
  * @package OC
  */
 class ServerContainer extends SimpleContainer {
-	/** @var DIContainer[] */
-	protected $appContainers;
-
-	/** @var string[] */
-	protected $hasNoAppContainer;
-
-	/** @var string[] */
-	protected $namespaces;
-
-	/**
-	 * ServerContainer constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->appContainers = [];
-		$this->namespaces = [];
-		$this->hasNoAppContainer = [];
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $appNamespace
-	 */
-	public function registerNamespace(string $appName, string $appNamespace): void {
-		// Cut of OCA\ and lowercase
-		$appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
-		$this->namespaces[$appNamespace] = $appName;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param DIContainer $container
-	 */
-	public function registerAppContainer(string $appName, DIContainer $container): void {
-		$this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
-	}
-
-	/**
-	 * @param string $appName
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	public function getRegisteredAppContainer(string $appName): DIContainer {
-		if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
-			return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
-		}
-
-		throw new QueryException();
-	}
-
-	/**
-	 * @param string $namespace
-	 * @param string $sensitiveNamespace
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
-		if (isset($this->appContainers[$namespace])) {
-			return $this->appContainers[$namespace];
-		}
-
-		if (isset($this->namespaces[$namespace])) {
-			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
-				if (class_exists($applicationClassName)) {
-					$app = new $applicationClassName();
-					if (isset($this->appContainers[$namespace])) {
-						$this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
-						return $this->appContainers[$namespace];
-					}
-				}
-				$this->hasNoAppContainer[$namespace] = true;
-			}
-
-			return new DIContainer($this->namespaces[$namespace]);
-		}
-		throw new QueryException();
-	}
-
-	public function has($id, bool $noRecursion = false): bool {
-		if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
-			return $appContainer->has($id);
-		}
-
-		return parent::has($id);
-	}
-
-	/**
-	 * @template T
-	 * @param class-string<T>|string $name
-	 * @return T|mixed
-	 * @psalm-template S as class-string<T>|string
-	 * @psalm-param S $name
-	 * @psalm-return (S is class-string<T> ? T : mixed)
-	 * @throws QueryException
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 */
-	public function query(string $name, bool $autoload = true) {
-		$name = $this->sanitizeName($name);
-
-		if (str_starts_with($name, 'OCA\\')) {
-			// Skip server container query for app namespace classes
-			try {
-				return parent::query($name, false);
-			} catch (QueryException $e) {
-				// Continue with general autoloading then
-			}
-			// In case the service starts with OCA\ we try to find the service in
-			// the apps container first.
-			if (($appContainer = $this->getAppContainerForService($name)) !== null) {
-				try {
-					return $appContainer->queryNoFallback($name);
-				} catch (QueryException $e) {
-					// Didn't find the service or the respective app container
-					// In this case the service won't be part of the core container,
-					// so we can throw directly
-					throw $e;
-				}
-			}
-		} elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
-			$segments = explode('\\', $name);
-			try {
-				$appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
-				return $appContainer->queryNoFallback($name);
-			} catch (QueryException $e) {
-				// Didn't find the service or the respective app container,
-				// ignore it and fall back to the core container.
-			}
-		}
-
-		return parent::query($name, $autoload);
-	}
-
-	/**
-	 * @internal
-	 * @param string $id
-	 * @return DIContainer|null
-	 */
-	public function getAppContainerForService(string $id): ?DIContainer {
-		if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
-			return null;
-		}
-
-		try {
-			[,$namespace,] = explode('\\', $id);
-			return $this->getAppContainer(strtolower($namespace), $namespace);
-		} catch (QueryException $e) {
-			return null;
-		}
-	}
+    /** @var DIContainer[] */
+    protected $appContainers;
+
+    /** @var string[] */
+    protected $hasNoAppContainer;
+
+    /** @var string[] */
+    protected $namespaces;
+
+    /**
+     * ServerContainer constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->appContainers = [];
+        $this->namespaces = [];
+        $this->hasNoAppContainer = [];
+    }
+
+    /**
+     * @param string $appName
+     * @param string $appNamespace
+     */
+    public function registerNamespace(string $appName, string $appNamespace): void {
+        // Cut of OCA\ and lowercase
+        $appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
+        $this->namespaces[$appNamespace] = $appName;
+    }
+
+    /**
+     * @param string $appName
+     * @param DIContainer $container
+     */
+    public function registerAppContainer(string $appName, DIContainer $container): void {
+        $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
+    }
+
+    /**
+     * @param string $appName
+     * @return DIContainer
+     * @throws QueryException
+     */
+    public function getRegisteredAppContainer(string $appName): DIContainer {
+        if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
+            return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
+        }
+
+        throw new QueryException();
+    }
+
+    /**
+     * @param string $namespace
+     * @param string $sensitiveNamespace
+     * @return DIContainer
+     * @throws QueryException
+     */
+    protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
+        if (isset($this->appContainers[$namespace])) {
+            return $this->appContainers[$namespace];
+        }
+
+        if (isset($this->namespaces[$namespace])) {
+            if (!isset($this->hasNoAppContainer[$namespace])) {
+                $applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+                if (class_exists($applicationClassName)) {
+                    $app = new $applicationClassName();
+                    if (isset($this->appContainers[$namespace])) {
+                        $this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
+                        return $this->appContainers[$namespace];
+                    }
+                }
+                $this->hasNoAppContainer[$namespace] = true;
+            }
+
+            return new DIContainer($this->namespaces[$namespace]);
+        }
+        throw new QueryException();
+    }
+
+    public function has($id, bool $noRecursion = false): bool {
+        if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
+            return $appContainer->has($id);
+        }
+
+        return parent::has($id);
+    }
+
+    /**
+     * @template T
+     * @param class-string<T>|string $name
+     * @return T|mixed
+     * @psalm-template S as class-string<T>|string
+     * @psalm-param S $name
+     * @psalm-return (S is class-string<T> ? T : mixed)
+     * @throws QueryException
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     */
+    public function query(string $name, bool $autoload = true) {
+        $name = $this->sanitizeName($name);
+
+        if (str_starts_with($name, 'OCA\\')) {
+            // Skip server container query for app namespace classes
+            try {
+                return parent::query($name, false);
+            } catch (QueryException $e) {
+                // Continue with general autoloading then
+            }
+            // In case the service starts with OCA\ we try to find the service in
+            // the apps container first.
+            if (($appContainer = $this->getAppContainerForService($name)) !== null) {
+                try {
+                    return $appContainer->queryNoFallback($name);
+                } catch (QueryException $e) {
+                    // Didn't find the service or the respective app container
+                    // In this case the service won't be part of the core container,
+                    // so we can throw directly
+                    throw $e;
+                }
+            }
+        } elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
+            $segments = explode('\\', $name);
+            try {
+                $appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
+                return $appContainer->queryNoFallback($name);
+            } catch (QueryException $e) {
+                // Didn't find the service or the respective app container,
+                // ignore it and fall back to the core container.
+            }
+        }
+
+        return parent::query($name, $autoload);
+    }
+
+    /**
+     * @internal
+     * @param string $id
+     * @return DIContainer|null
+     */
+    public function getAppContainerForService(string $id): ?DIContainer {
+        if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
+            return null;
+        }
+
+        try {
+            [,$namespace,] = explode('\\', $id);
+            return $this->getAppContainer(strtolower($namespace), $namespace);
+        } catch (QueryException $e) {
+            return null;
+        }
+    }
 }

lib/public/User/Backend/ICustomLogout.php

Indentation +8 added lines, -8 removed lines

@@ -32,12 +32,12 @@
  * SSO providers that also have a SSO logout url
  */
 interface ICustomLogout {
-	/**
-	 * @since 20.0.0
-	 *
-	 * The url to redirect to for logout
-	 *
-	 * @return string
-	 */
-	public function getLogoutUrl(): string;
+    /**
+     * @since 20.0.0
+     *
+     * The url to redirect to for logout
+     *
+     * @return string
+     */
+    public function getLogoutUrl(): string;
 }

apps/user_status/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

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

apps/user_status/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

lib/public/UserStatus/IUserStatus.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return string|null
 	 * @since 20.0.0
 	 */
-	public function getMessage():?string;
+	public function getMessage(): ?string;
 
 	/**
 	 * Get a custom icon provided by the user
@@ -93,7 +93,7 @@ 
 	 * @return string|null
 	 * @since 20.0.0
 	 */
-	public function getIcon():?string;
+	public function getIcon(): ?string;
 
 	/**
 	 * Gets the time that the custom status will be cleared at
@@ -101,5 +101,5 @@ 
 	 * @return DateTimeImmutable|null
 	 * @since 20.0.0
 	 */
-	public function getClearAt():?DateTimeImmutable;
+	public function getClearAt(): ?DateTimeImmutable;
 }

Indentation +115 added lines, -115 removed lines

@@ -16,119 +16,119 @@
  * @since 20.0.0
  */
 interface IUserStatus {
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	public const ONLINE = 'online';
-
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	public const AWAY = 'away';
-
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	public const DND = 'dnd';
-
-	/**
-	 * @var string
-	 * @since 28.0.0
-	 */
-	public const BUSY = 'busy';
-
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	public const OFFLINE = 'offline';
-
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	public const INVISIBLE = 'invisible';
-
-	/**
-	 * @var string
-	 * @since 25.0.0
-	 */
-	public const MESSAGE_CALL = 'call';
-
-	/**
-	 * @var string
-	 * @since 25.0.0
-	 */
-	public const MESSAGE_AVAILABILITY = 'availability';
-
-	/**
-	 * @var string
-	 * @since 28.0.1
-	 */
-	public const MESSAGE_OUT_OF_OFFICE = 'out-of-office';
-
-	/**
-	 * @var string
-	 * @since 28.0.0
-	 */
-	public const MESSAGE_VACATION = 'vacationing';
-
-	/**
-	 * @var string
-	 * @since 28.0.0
-	 */
-	public const MESSAGE_CALENDAR_BUSY = 'meeting';
-
-	/**
-	 * @var string
-	 * @since 28.0.0
-	 */
-	public const MESSAGE_CALENDAR_BUSY_TENTATIVE = 'busy-tentative';
-
-	/**
-	 * Get the user this status is connected to
-	 *
-	 * @return string
-	 * @since 20.0.0
-	 */
-	public function getUserId():string;
-
-	/**
-	 * Get the status
-	 *
-	 * It will return one of the constants defined above.
-	 * It will never return invisible. In case a user marked
-	 * themselves as invisible, it will return offline.
-	 *
-	 * @return string See IUserStatus constants
-	 * @since 20.0.0
-	 */
-	public function getStatus():string;
-
-	/**
-	 * Get a custom message provided by the user
-	 *
-	 * @return string|null
-	 * @since 20.0.0
-	 */
-	public function getMessage():?string;
-
-	/**
-	 * Get a custom icon provided by the user
-	 *
-	 * @return string|null
-	 * @since 20.0.0
-	 */
-	public function getIcon():?string;
-
-	/**
-	 * Gets the time that the custom status will be cleared at
-	 *
-	 * @return DateTimeImmutable|null
-	 * @since 20.0.0
-	 */
-	public function getClearAt():?DateTimeImmutable;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    public const ONLINE = 'online';
+
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    public const AWAY = 'away';
+
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    public const DND = 'dnd';
+
+    /**
+     * @var string
+     * @since 28.0.0
+     */
+    public const BUSY = 'busy';
+
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    public const OFFLINE = 'offline';
+
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    public const INVISIBLE = 'invisible';
+
+    /**
+     * @var string
+     * @since 25.0.0
+     */
+    public const MESSAGE_CALL = 'call';
+
+    /**
+     * @var string
+     * @since 25.0.0
+     */
+    public const MESSAGE_AVAILABILITY = 'availability';
+
+    /**
+     * @var string
+     * @since 28.0.1
+     */
+    public const MESSAGE_OUT_OF_OFFICE = 'out-of-office';
+
+    /**
+     * @var string
+     * @since 28.0.0
+     */
+    public const MESSAGE_VACATION = 'vacationing';
+
+    /**
+     * @var string
+     * @since 28.0.0
+     */
+    public const MESSAGE_CALENDAR_BUSY = 'meeting';
+
+    /**
+     * @var string
+     * @since 28.0.0
+     */
+    public const MESSAGE_CALENDAR_BUSY_TENTATIVE = 'busy-tentative';
+
+    /**
+     * Get the user this status is connected to
+     *
+     * @return string
+     * @since 20.0.0
+     */
+    public function getUserId():string;
+
+    /**
+     * Get the status
+     *
+     * It will return one of the constants defined above.
+     * It will never return invisible. In case a user marked
+     * themselves as invisible, it will return offline.
+     *
+     * @return string See IUserStatus constants
+     * @since 20.0.0
+     */
+    public function getStatus():string;
+
+    /**
+     * Get a custom message provided by the user
+     *
+     * @return string|null
+     * @since 20.0.0
+     */
+    public function getMessage():?string;
+
+    /**
+     * Get a custom icon provided by the user
+     *
+     * @return string|null
+     * @since 20.0.0
+     */
+    public function getIcon():?string;
+
+    /**
+     * Gets the time that the custom status will be cleared at
+     *
+     * @return DateTimeImmutable|null
+     * @since 20.0.0
+     */
+    public function getClearAt():?DateTimeImmutable;
 }

apps/files_external/lib/Service/UserGlobalStoragesService.php

Spacing +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
 
 		$result = [];
 		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
+			$storage = array_reduce($storageList, function($carry, $item) {
 				if (isset($carry)) {
 					$carryPriorityType = $this->getPriorityType($carry);
 					$itemPriorityType = $this->getPriorityType($item);
@@ -191,11 +191,11 @@ 
 		$groupIds = $this->groupManager->getUserGroupIds($user);
 		$mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
+		$configs = array_filter($configs, function($config) {
 			return $config instanceof StorageConfig;
 		});
 
-		$keys = array_map(function (StorageConfig $config) {
+		$keys = array_map(function(StorageConfig $config) {
 			return $config->getId();
 		}, $configs);
 

Indentation +165 added lines, -165 removed lines

@@ -18,169 +18,169 @@
  * Read-only access available, attempting to write will throw DomainException
  */
 class UserGlobalStoragesService extends GlobalStoragesService {
-	use UserTrait;
-
-	/**
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param IUserMountCache $userMountCache
-	 * @param IEventDispatcher $eventDispatcher
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IUserSession $userSession,
-		protected IGroupManager $groupManager,
-		IUserMountCache $userMountCache,
-		IEventDispatcher $eventDispatcher,
-	) {
-		parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher);
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * Replace config hash ID with real IDs, for migrating legacy storages
-	 *
-	 * @param StorageConfig[] $storages Storages with real IDs
-	 * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
-	 */
-	protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
-		// as a read-only view, storage IDs don't need to be real
-		foreach ($storagesWithConfigHash as $storage) {
-			$storages[$storage->getId()] = $storage;
-		}
-	}
-
-	protected function readDBConfig() {
-		$userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
-		$globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		$groups = $this->groupManager->getUserGroupIds($this->getUser());
-		if (count($groups) !== 0) {
-			$groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
-		} else {
-			$groupMounts = [];
-		}
-		return array_merge($userMounts, $groupMounts, $globalMounts);
-	}
-
-	public function addStorage(StorageConfig $newStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	public function updateStorage(StorageConfig $updatedStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * @param integer $id
-	 */
-	public function removeStorage($id) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * Get unique storages, in case two are defined with the same mountpoint
-	 * Higher priority storages take precedence
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getUniqueStorages() {
-		$storages = $this->getStorages();
-
-		$storagesByMountpoint = [];
-		foreach ($storages as $storage) {
-			$storagesByMountpoint[$storage->getMountPoint()][] = $storage;
-		}
-
-		$result = [];
-		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
-				if (isset($carry)) {
-					$carryPriorityType = $this->getPriorityType($carry);
-					$itemPriorityType = $this->getPriorityType($item);
-					if ($carryPriorityType > $itemPriorityType) {
-						return $carry;
-					} elseif ($carryPriorityType === $itemPriorityType) {
-						if ($carry->getPriority() > $item->getPriority()) {
-							return $carry;
-						}
-					}
-				}
-				return $item;
-			});
-			$result[$storage->getID()] = $storage;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get a priority 'type', where a bigger number means higher priority
-	 * user applicable > group applicable > 'all'
-	 *
-	 * @param StorageConfig $storage
-	 * @return int
-	 */
-	protected function getPriorityType(StorageConfig $storage) {
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-
-		if ($applicableUsers && $applicableUsers[0] !== 'all') {
-			return 2;
-		}
-		if ($applicableGroups) {
-			return 1;
-		}
-		return 0;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		$applicableUsers = $config->getApplicableUsers();
-		$applicableGroups = $config->getApplicableGroups();
-
-		if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
-			return true;
-		}
-		if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
-			return true;
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
-		foreach ($groupIds as $groupId) {
-			if (in_array($groupId, $applicableGroups, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Gets all storages for the user, admin, personal, global, etc
-	 *
-	 * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStoragesForUser(?IUser $user = null) {
-		if (is_null($user)) {
-			$user = $this->getUser();
-		}
-		if (is_null($user)) {
-			return [];
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($user);
-		$mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		$storages = array_combine($keys, $configs);
-		return array_filter($storages, [$this, 'validateStorage']);
-	}
+    use UserTrait;
+
+    /**
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param IUserMountCache $userMountCache
+     * @param IEventDispatcher $eventDispatcher
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IUserSession $userSession,
+        protected IGroupManager $groupManager,
+        IUserMountCache $userMountCache,
+        IEventDispatcher $eventDispatcher,
+    ) {
+        parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher);
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * Replace config hash ID with real IDs, for migrating legacy storages
+     *
+     * @param StorageConfig[] $storages Storages with real IDs
+     * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
+     */
+    protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
+        // as a read-only view, storage IDs don't need to be real
+        foreach ($storagesWithConfigHash as $storage) {
+            $storages[$storage->getId()] = $storage;
+        }
+    }
+
+    protected function readDBConfig() {
+        $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
+        $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        $groups = $this->groupManager->getUserGroupIds($this->getUser());
+        if (count($groups) !== 0) {
+            $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
+        } else {
+            $groupMounts = [];
+        }
+        return array_merge($userMounts, $groupMounts, $globalMounts);
+    }
+
+    public function addStorage(StorageConfig $newStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    public function updateStorage(StorageConfig $updatedStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * @param integer $id
+     */
+    public function removeStorage($id) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * Get unique storages, in case two are defined with the same mountpoint
+     * Higher priority storages take precedence
+     *
+     * @return StorageConfig[]
+     */
+    public function getUniqueStorages() {
+        $storages = $this->getStorages();
+
+        $storagesByMountpoint = [];
+        foreach ($storages as $storage) {
+            $storagesByMountpoint[$storage->getMountPoint()][] = $storage;
+        }
+
+        $result = [];
+        foreach ($storagesByMountpoint as $storageList) {
+            $storage = array_reduce($storageList, function ($carry, $item) {
+                if (isset($carry)) {
+                    $carryPriorityType = $this->getPriorityType($carry);
+                    $itemPriorityType = $this->getPriorityType($item);
+                    if ($carryPriorityType > $itemPriorityType) {
+                        return $carry;
+                    } elseif ($carryPriorityType === $itemPriorityType) {
+                        if ($carry->getPriority() > $item->getPriority()) {
+                            return $carry;
+                        }
+                    }
+                }
+                return $item;
+            });
+            $result[$storage->getID()] = $storage;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a priority 'type', where a bigger number means higher priority
+     * user applicable > group applicable > 'all'
+     *
+     * @param StorageConfig $storage
+     * @return int
+     */
+    protected function getPriorityType(StorageConfig $storage) {
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+
+        if ($applicableUsers && $applicableUsers[0] !== 'all') {
+            return 2;
+        }
+        if ($applicableGroups) {
+            return 1;
+        }
+        return 0;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        $applicableUsers = $config->getApplicableUsers();
+        $applicableGroups = $config->getApplicableGroups();
+
+        if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
+            return true;
+        }
+        if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
+            return true;
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($this->getUser());
+        foreach ($groupIds as $groupId) {
+            if (in_array($groupId, $applicableGroups, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Gets all storages for the user, admin, personal, global, etc
+     *
+     * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStoragesForUser(?IUser $user = null) {
+        if (is_null($user)) {
+            $user = $this->getUser();
+        }
+        if (is_null($user)) {
+            return [];
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($user);
+        $mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        $storages = array_combine($keys, $configs);
+        return array_filter($storages, [$this, 'validateStorage']);
+    }
 }