nextcloud / server

apps/accessibility/lib/Service/JSDataService.php

Indentation +28 added lines, -28 removed lines

@@ -32,37 +32,37 @@
 use OCP\IUserSession;
 
 class JSDataService extends InitialStateProvider {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(
-		IUserSession $userSession,
-		IConfig $config
-	) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-	}
+    public function __construct(
+        IUserSession $userSession,
+        IConfig $config
+    ) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+    }
 
-	public function getKey(): string {
-		return 'data';
-	}
+    public function getKey(): string {
+        return 'data';
+    }
 
-	public function getData() {
-		$user = $this->userSession->getUser();
+    public function getData() {
+        $user = $this->userSession->getUser();
 
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
-		}
+        if ($user === null) {
+            $theme = false;
+            $highcontrast = false;
+        } else {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
+            $highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
+        }
 
-		return [
-			'theme' => $theme,
-			'highcontrast' => $highcontrast,
-		];
-	}
+        return [
+            'theme' => $theme,
+            'highcontrast' => $highcontrast,
+        ];
+    }
 }

apps/accessibility/lib/AppInfo/Application.php

Indentation +32 added lines, -32 removed lines

@@ -45,41 +45,41 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'accessibility';
+    /** @var string */
+    public const APP_ID = 'accessibility';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerInitialStateProvider(JSDataService::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerInitialStateProvider(JSDataService::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn([$this, 'injectCss']);
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn([$this, 'injectCss']);
+    }
 
-	public function injectCss(IUserSession $userSession,
-							   IConfig $config,
-							   IURLGenerator $urlGenerator) {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $userSession->getUser();
-		if ($loggedUser !== null) {
-			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-			\OCP\Util::addScript('accessibility', 'accessibilityoca');
-		} else {
-			$userValues = ['dark'];
+    public function injectCss(IUserSession $userSession,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator) {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $userSession->getUser();
+        if ($loggedUser !== null) {
+            $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
+            // we want to check if any theme or font is enabled.
+            if (count($userValues) > 0) {
+                $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+                $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+            \OCP\Util::addScript('accessibility', 'accessibilityoca');
+        } else {
+            $userValues = ['dark'];
 
-			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
-		}
-	}
+            $hash = md5(implode('-', $userValues));
+            $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+            \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
 				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 			\OCP\Util::addScript('accessibility', 'accessibilityoca');
@@ -78,7 +78,7 @@ 
 			$userValues = ['dark'];
 
 			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +398 added lines, -398 removed lines

@@ -39,402 +39,402 @@
 
 class RegistrationContext {
 
-	/** @var array[] */
-	private $capabilities = [];
-
-	/** @var array[] */
-	private $crashReporters = [];
-
-	/** @var array[] */
-	private $dashboardPanels = [];
-
-	/** @var array[] */
-	private $services = [];
-
-	/** @var array[] */
-	private $aliases = [];
-
-	/** @var array[] */
-	private $parameters = [];
-
-	/** @var array[] */
-	private $eventListeners = [];
-
-	/** @var array[] */
-	private $middlewares = [];
-
-	/** @var array[] */
-	private $searchProviders = [];
-
-	/** @var array[] */
-	private $alternativeLogins = [];
-
-	/** @var array[] */
-	private $initialStates = [];
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
-
-	public function for(string $appId): IRegistrationContext {
-		return new class($appId, $this) implements IRegistrationContext {
-			/** @var string */
-			private $appId;
-
-			/** @var RegistrationContext */
-			private $context;
-
-			public function __construct(string $appId, RegistrationContext $context) {
-				$this->appId = $appId;
-				$this->context = $context;
-			}
-
-			public function registerCapability(string $capability): void {
-				$this->context->registerCapability(
-					$this->appId,
-					$capability
-				);
-			}
-
-			public function registerCrashReporter(string $reporterClass): void {
-				$this->context->registerCrashReporter(
-					$this->appId,
-					$reporterClass
-				);
-			}
-
-			public function registerDashboardWidget(string $widgetClass): void {
-				$this->context->registerDashboardPanel(
-					$this->appId,
-					$widgetClass
-				);
-			}
-
-			public function registerService(string $name, callable $factory, bool $shared = true): void {
-				$this->context->registerService(
-					$this->appId,
-					$name,
-					$factory,
-					$shared
-				);
-			}
-
-			public function registerServiceAlias(string $alias, string $target): void {
-				$this->context->registerServiceAlias(
-					$this->appId,
-					$alias,
-					$target
-				);
-			}
-
-			public function registerParameter(string $name, $value): void {
-				$this->context->registerParameter(
-					$this->appId,
-					$name,
-					$value
-				);
-			}
-
-			public function registerEventListener(string $event, string $listener, int $priority = 0): void {
-				$this->context->registerEventListener(
-					$this->appId,
-					$event,
-					$listener,
-					$priority
-				);
-			}
-
-			public function registerMiddleware(string $class): void {
-				$this->context->registerMiddleware(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerSearchProvider(string $class): void {
-				$this->context->registerSearchProvider(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerAlternativeLogin(string $class): void {
-				$this->context->registerAlternativeLogin(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerInitialStateProvider(string $class): void {
-				$this->context->registerInitialState(
-					$this->appId,
-					$class
-				);
-			}
-		};
-	}
-
-	public function registerCapability(string $appId, string $capability): void {
-		$this->capabilities[] = [
-			'appId' => $appId,
-			'capability' => $capability
-		];
-	}
-
-	public function registerCrashReporter(string $appId, string $reporterClass): void {
-		$this->crashReporters[] = [
-			'appId' => $appId,
-			'class' => $reporterClass,
-		];
-	}
-
-	public function registerDashboardPanel(string $appId, string $panelClass): void {
-		$this->dashboardPanels[] = [
-			'appId' => $appId,
-			'class' => $panelClass
-		];
-	}
-
-	public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
-		$this->services[] = [
-			"appId" => $appId,
-			"name" => $name,
-			"factory" => $factory,
-			"sharred" => $shared,
-		];
-	}
-
-	public function registerServiceAlias(string $appId, string $alias, string $target): void {
-		$this->aliases[] = [
-			"appId" => $appId,
-			"alias" => $alias,
-			"target" => $target,
-		];
-	}
-
-	public function registerParameter(string $appId, string $name, $value): void {
-		$this->parameters[] = [
-			"appId" => $appId,
-			"name" => $name,
-			"value" => $value,
-		];
-	}
-
-	public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
-		$this->eventListeners[] = [
-			"appId" => $appId,
-			"event" => $event,
-			"listener" => $listener,
-			"priority" => $priority,
-		];
-	}
-
-	public function registerMiddleware(string $appId, string $class): void {
-		$this->middlewares[] = [
-			"appId" => $appId,
-			"class" => $class,
-		];
-	}
-
-	public function registerSearchProvider(string $appId, string $class) {
-		$this->searchProviders[] = [
-			'appId' => $appId,
-			'class' => $class,
-		];
-	}
-
-	public function registerAlternativeLogin(string $appId, string $class): void {
-		$this->alternativeLogins[] = [
-			'appId' => $appId,
-			'class' => $class,
-		];
-	}
-
-	public function registerInitialState(string $appId, string $class): void {
-		$this->initialStates[] = [
-			'appId' => $appId,
-			'class' => $class,
-		];
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCapabilityRegistrations(array $apps): void {
-		foreach ($this->capabilities as $registration) {
-			try {
-				$apps[$registration['appId']]
-					->getContainer()
-					->registerCapability($registration['capability']);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCrashReporterRegistrations(array $apps, Registry $registry): void {
-		foreach ($this->crashReporters as $registration) {
-			try {
-				$registry->registerLazy($registration['class']);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateDashboardPanelRegistrations(array $apps, IManager $dashboardManager): void {
-		foreach ($this->dashboardPanels as $panel) {
-			try {
-				$dashboardManager->lazyRegisterWidget($panel['class']);
-			} catch (Throwable $e) {
-				$appId = $panel['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
-		foreach ($this->eventListeners as $registration) {
-			try {
-				if (isset($registration['priority'])) {
-					$eventDispatcher->addServiceListener(
-						$registration['event'],
-						$registration['listener'],
-						$registration['priority']
-					);
-				} else {
-					$eventDispatcher->addServiceListener(
-						$registration['event'],
-						$registration['listener']
-					);
-				}
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during event listener registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateContainerRegistrations(array $apps): void {
-		foreach ($this->services as $registration) {
-			try {
-				/**
-				 * Register the service and convert the callable into a \Closure if necessary
-				 */
-				$apps[$registration['appId']]
-					->getContainer()
-					->registerService(
-						$registration['name'],
-						Closure::fromCallable($registration['factory']),
-						$registration['shared'] ?? true
-					);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during service registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		foreach ($this->aliases as $registration) {
-			try {
-				$apps[$registration['appId']]
-					->getContainer()
-					->registerAlias(
-						$registration['alias'],
-						$registration['target']
-					);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		foreach ($this->parameters as $registration) {
-			try {
-				$apps[$registration['appId']]
-					->getContainer()
-					->registerParameter(
-						$registration['name'],
-						$registration['value']
-					);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateMiddlewareRegistrations(array $apps): void {
-		foreach ($this->middlewares as $middleware) {
-			try {
-				$apps[$middleware['appId']]
-					->getContainer()
-					->registerMiddleWare($middleware['class']);
-			} catch (Throwable $e) {
-				$appId = $middleware['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @return array[]
-	 */
-	public function getSearchProviders(): array {
-		return $this->searchProviders;
-	}
-
-	/**
-	 * @return array[]
-	 */
-	public function getAlternativeLogins(): array {
-		return $this->alternativeLogins;
-	}
-
-	/**
-	 * @erturn array[]
-	 */
-	public function getInitialStates(): array {
-		return $this->initialStates;
-	}
+    /** @var array[] */
+    private $capabilities = [];
+
+    /** @var array[] */
+    private $crashReporters = [];
+
+    /** @var array[] */
+    private $dashboardPanels = [];
+
+    /** @var array[] */
+    private $services = [];
+
+    /** @var array[] */
+    private $aliases = [];
+
+    /** @var array[] */
+    private $parameters = [];
+
+    /** @var array[] */
+    private $eventListeners = [];
+
+    /** @var array[] */
+    private $middlewares = [];
+
+    /** @var array[] */
+    private $searchProviders = [];
+
+    /** @var array[] */
+    private $alternativeLogins = [];
+
+    /** @var array[] */
+    private $initialStates = [];
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
+
+    public function for(string $appId): IRegistrationContext {
+        return new class($appId, $this) implements IRegistrationContext {
+            /** @var string */
+            private $appId;
+
+            /** @var RegistrationContext */
+            private $context;
+
+            public function __construct(string $appId, RegistrationContext $context) {
+                $this->appId = $appId;
+                $this->context = $context;
+            }
+
+            public function registerCapability(string $capability): void {
+                $this->context->registerCapability(
+                    $this->appId,
+                    $capability
+                );
+            }
+
+            public function registerCrashReporter(string $reporterClass): void {
+                $this->context->registerCrashReporter(
+                    $this->appId,
+                    $reporterClass
+                );
+            }
+
+            public function registerDashboardWidget(string $widgetClass): void {
+                $this->context->registerDashboardPanel(
+                    $this->appId,
+                    $widgetClass
+                );
+            }
+
+            public function registerService(string $name, callable $factory, bool $shared = true): void {
+                $this->context->registerService(
+                    $this->appId,
+                    $name,
+                    $factory,
+                    $shared
+                );
+            }
+
+            public function registerServiceAlias(string $alias, string $target): void {
+                $this->context->registerServiceAlias(
+                    $this->appId,
+                    $alias,
+                    $target
+                );
+            }
+
+            public function registerParameter(string $name, $value): void {
+                $this->context->registerParameter(
+                    $this->appId,
+                    $name,
+                    $value
+                );
+            }
+
+            public function registerEventListener(string $event, string $listener, int $priority = 0): void {
+                $this->context->registerEventListener(
+                    $this->appId,
+                    $event,
+                    $listener,
+                    $priority
+                );
+            }
+
+            public function registerMiddleware(string $class): void {
+                $this->context->registerMiddleware(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerSearchProvider(string $class): void {
+                $this->context->registerSearchProvider(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerAlternativeLogin(string $class): void {
+                $this->context->registerAlternativeLogin(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerInitialStateProvider(string $class): void {
+                $this->context->registerInitialState(
+                    $this->appId,
+                    $class
+                );
+            }
+        };
+    }
+
+    public function registerCapability(string $appId, string $capability): void {
+        $this->capabilities[] = [
+            'appId' => $appId,
+            'capability' => $capability
+        ];
+    }
+
+    public function registerCrashReporter(string $appId, string $reporterClass): void {
+        $this->crashReporters[] = [
+            'appId' => $appId,
+            'class' => $reporterClass,
+        ];
+    }
+
+    public function registerDashboardPanel(string $appId, string $panelClass): void {
+        $this->dashboardPanels[] = [
+            'appId' => $appId,
+            'class' => $panelClass
+        ];
+    }
+
+    public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
+        $this->services[] = [
+            "appId" => $appId,
+            "name" => $name,
+            "factory" => $factory,
+            "sharred" => $shared,
+        ];
+    }
+
+    public function registerServiceAlias(string $appId, string $alias, string $target): void {
+        $this->aliases[] = [
+            "appId" => $appId,
+            "alias" => $alias,
+            "target" => $target,
+        ];
+    }
+
+    public function registerParameter(string $appId, string $name, $value): void {
+        $this->parameters[] = [
+            "appId" => $appId,
+            "name" => $name,
+            "value" => $value,
+        ];
+    }
+
+    public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
+        $this->eventListeners[] = [
+            "appId" => $appId,
+            "event" => $event,
+            "listener" => $listener,
+            "priority" => $priority,
+        ];
+    }
+
+    public function registerMiddleware(string $appId, string $class): void {
+        $this->middlewares[] = [
+            "appId" => $appId,
+            "class" => $class,
+        ];
+    }
+
+    public function registerSearchProvider(string $appId, string $class) {
+        $this->searchProviders[] = [
+            'appId' => $appId,
+            'class' => $class,
+        ];
+    }
+
+    public function registerAlternativeLogin(string $appId, string $class): void {
+        $this->alternativeLogins[] = [
+            'appId' => $appId,
+            'class' => $class,
+        ];
+    }
+
+    public function registerInitialState(string $appId, string $class): void {
+        $this->initialStates[] = [
+            'appId' => $appId,
+            'class' => $class,
+        ];
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCapabilityRegistrations(array $apps): void {
+        foreach ($this->capabilities as $registration) {
+            try {
+                $apps[$registration['appId']]
+                    ->getContainer()
+                    ->registerCapability($registration['capability']);
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCrashReporterRegistrations(array $apps, Registry $registry): void {
+        foreach ($this->crashReporters as $registration) {
+            try {
+                $registry->registerLazy($registration['class']);
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateDashboardPanelRegistrations(array $apps, IManager $dashboardManager): void {
+        foreach ($this->dashboardPanels as $panel) {
+            try {
+                $dashboardManager->lazyRegisterWidget($panel['class']);
+            } catch (Throwable $e) {
+                $appId = $panel['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
+        foreach ($this->eventListeners as $registration) {
+            try {
+                if (isset($registration['priority'])) {
+                    $eventDispatcher->addServiceListener(
+                        $registration['event'],
+                        $registration['listener'],
+                        $registration['priority']
+                    );
+                } else {
+                    $eventDispatcher->addServiceListener(
+                        $registration['event'],
+                        $registration['listener']
+                    );
+                }
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during event listener registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateContainerRegistrations(array $apps): void {
+        foreach ($this->services as $registration) {
+            try {
+                /**
+                 * Register the service and convert the callable into a \Closure if necessary
+                 */
+                $apps[$registration['appId']]
+                    ->getContainer()
+                    ->registerService(
+                        $registration['name'],
+                        Closure::fromCallable($registration['factory']),
+                        $registration['shared'] ?? true
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during service registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        foreach ($this->aliases as $registration) {
+            try {
+                $apps[$registration['appId']]
+                    ->getContainer()
+                    ->registerAlias(
+                        $registration['alias'],
+                        $registration['target']
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        foreach ($this->parameters as $registration) {
+            try {
+                $apps[$registration['appId']]
+                    ->getContainer()
+                    ->registerParameter(
+                        $registration['name'],
+                        $registration['value']
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateMiddlewareRegistrations(array $apps): void {
+        foreach ($this->middlewares as $middleware) {
+            try {
+                $apps[$middleware['appId']]
+                    ->getContainer()
+                    ->registerMiddleWare($middleware['class']);
+            } catch (Throwable $e) {
+                $appId = $middleware['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function getSearchProviders(): array {
+        return $this->searchProviders;
+    }
+
+    /**
+     * @return array[]
+     */
+    public function getAlternativeLogins(): array {
+        return $this->alternativeLogins;
+    }
+
+    /**
+     * @erturn array[]
+     */
+    public function getInitialStates(): array {
+        return $this->initialStates;
+    }
 }

lib/private/InitialStateService.php

Indentation +111 added lines, -111 removed lines

@@ -37,115 +37,115 @@
 
 class InitialStateService implements IInitialStateService {
 
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string[][] */
-	private $states = [];
-
-	/** @var Closure[][] */
-	private $lazyStates = [];
-
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
-
-	/** @var IServerContainer */
-	private $container;
-
-	public function __construct(ILogger $logger, Coordinator $bootstrapCoordinator, IServerContainer $container) {
-		$this->logger = $logger;
-		$this->bootstrapCoordinator = $bootstrapCoordinator;
-		$this->container = $container;
-	}
-
-	public function provideInitialState(string $appName, string $key, $data): void {
-		// Scalars and JsonSerializable are fine
-		if (is_scalar($data) || $data instanceof \JsonSerializable || is_array($data)) {
-			if (!isset($this->states[$appName])) {
-				$this->states[$appName] = [];
-			}
-			$this->states[$appName][$key] = json_encode($data);
-			return;
-		}
-
-		$this->logger->warning('Invalid data provided to provideInitialState by ' . $appName);
-	}
-
-	public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {
-		if (!isset($this->lazyStates[$appName])) {
-			$this->lazyStates[$appName] = [];
-		}
-		$this->lazyStates[$appName][$key] = $closure;
-	}
-
-	/**
-	 * Invoke all callbacks to populate the `states` property
-	 */
-	private function invokeLazyStateCallbacks(): void {
-		foreach ($this->lazyStates as $app => $lazyStates) {
-			foreach ($lazyStates as $key => $lazyState) {
-				$startTime = microtime(true);
-				$this->provideInitialState($app, $key, $lazyState());
-				$endTime = microtime(true);
-				$duration = $endTime - $startTime;
-				if ($duration > 1) {
-					$this->logger->warning('Lazy initial state provider for {key} took {duration} seconds.', [
-						'app' => $app,
-						'key' => $key,
-						'duration' => round($duration, 2),
-					]);
-				}
-			}
-		}
-		$this->lazyStates = [];
-	}
-
-	/**
-	 * Load the lazy states via the IBootstrap mechanism
-	 */
-	private function loadLazyStates(): void {
-		$context = $this->bootstrapCoordinator->getRegistrationContext();
-
-		if ($context === null) {
-			// To early, nothing to do yet
-			return;
-		}
-
-		$initialStates = $context->getInitialStates();
-		foreach ($initialStates as $initialState) {
-			try {
-				$provider = $this->container->query($initialState['class']);
-			} catch (QueryException $e) {
-				// Log an continue. We can be fault tolerant here.
-				$this->logger->logException($e, [
-					'message' => 'Could not load initial state provider dynamically: ' . $e->getMessage(),
-					'level' => ILogger::ERROR,
-					'app' => $initialState['appId'],
-				]);
-				continue;
-			}
-
-			if (!($provider instanceof InitialStateProvider)) {
-				// Log an continue. We can be fault tolerant here.
-				$this->logger->error('Initial state provider is not an InitialStateProvider instance: ' . $initialState['class'], [
-					'app' => $initialState['appId'],
-				]);
-			}
-
-			$this->provideInitialState($initialState['appId'], $provider->getKey(), $provider);
-		}
-	}
-
-	public function getInitialStates(): array {
-		$this->invokeLazyStateCallbacks();
-		$this->loadLazyStates();
-
-		$appStates = [];
-		foreach ($this->states as $app => $states) {
-			foreach ($states as $key => $value) {
-				$appStates["$app-$key"] = $value;
-			}
-		}
-		return $appStates;
-	}
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string[][] */
+    private $states = [];
+
+    /** @var Closure[][] */
+    private $lazyStates = [];
+
+    /** @var Coordinator */
+    private $bootstrapCoordinator;
+
+    /** @var IServerContainer */
+    private $container;
+
+    public function __construct(ILogger $logger, Coordinator $bootstrapCoordinator, IServerContainer $container) {
+        $this->logger = $logger;
+        $this->bootstrapCoordinator = $bootstrapCoordinator;
+        $this->container = $container;
+    }
+
+    public function provideInitialState(string $appName, string $key, $data): void {
+        // Scalars and JsonSerializable are fine
+        if (is_scalar($data) || $data instanceof \JsonSerializable || is_array($data)) {
+            if (!isset($this->states[$appName])) {
+                $this->states[$appName] = [];
+            }
+            $this->states[$appName][$key] = json_encode($data);
+            return;
+        }
+
+        $this->logger->warning('Invalid data provided to provideInitialState by ' . $appName);
+    }
+
+    public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {
+        if (!isset($this->lazyStates[$appName])) {
+            $this->lazyStates[$appName] = [];
+        }
+        $this->lazyStates[$appName][$key] = $closure;
+    }
+
+    /**
+     * Invoke all callbacks to populate the `states` property
+     */
+    private function invokeLazyStateCallbacks(): void {
+        foreach ($this->lazyStates as $app => $lazyStates) {
+            foreach ($lazyStates as $key => $lazyState) {
+                $startTime = microtime(true);
+                $this->provideInitialState($app, $key, $lazyState());
+                $endTime = microtime(true);
+                $duration = $endTime - $startTime;
+                if ($duration > 1) {
+                    $this->logger->warning('Lazy initial state provider for {key} took {duration} seconds.', [
+                        'app' => $app,
+                        'key' => $key,
+                        'duration' => round($duration, 2),
+                    ]);
+                }
+            }
+        }
+        $this->lazyStates = [];
+    }
+
+    /**
+     * Load the lazy states via the IBootstrap mechanism
+     */
+    private function loadLazyStates(): void {
+        $context = $this->bootstrapCoordinator->getRegistrationContext();
+
+        if ($context === null) {
+            // To early, nothing to do yet
+            return;
+        }
+
+        $initialStates = $context->getInitialStates();
+        foreach ($initialStates as $initialState) {
+            try {
+                $provider = $this->container->query($initialState['class']);
+            } catch (QueryException $e) {
+                // Log an continue. We can be fault tolerant here.
+                $this->logger->logException($e, [
+                    'message' => 'Could not load initial state provider dynamically: ' . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                    'app' => $initialState['appId'],
+                ]);
+                continue;
+            }
+
+            if (!($provider instanceof InitialStateProvider)) {
+                // Log an continue. We can be fault tolerant here.
+                $this->logger->error('Initial state provider is not an InitialStateProvider instance: ' . $initialState['class'], [
+                    'app' => $initialState['appId'],
+                ]);
+            }
+
+            $this->provideInitialState($initialState['appId'], $provider->getKey(), $provider);
+        }
+    }
+
+    public function getInitialStates(): array {
+        $this->invokeLazyStateCallbacks();
+        $this->loadLazyStates();
+
+        $appStates = [];
+        foreach ($this->states as $app => $states) {
+            foreach ($states as $key => $value) {
+                $appStates["$app-$key"] = $value;
+            }
+        }
+        return $appStates;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 			return;
 		}
 
-		$this->logger->warning('Invalid data provided to provideInitialState by ' . $appName);
+		$this->logger->warning('Invalid data provided to provideInitialState by '.$appName);
 	}
 
 	public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {
@@ -118,7 +118,7 @@ 
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->logException($e, [
-					'message' => 'Could not load initial state provider dynamically: ' . $e->getMessage(),
+					'message' => 'Could not load initial state provider dynamically: '.$e->getMessage(),
 					'level' => ILogger::ERROR,
 					'app' => $initialState['appId'],
 				]);
@@ -127,7 +127,7 @@ 
 
 			if (!($provider instanceof InitialStateProvider)) {
 				// Log an continue. We can be fault tolerant here.
-				$this->logger->error('Initial state provider is not an InitialStateProvider instance: ' . $initialState['class'], [
+				$this->logger->error('Initial state provider is not an InitialStateProvider instance: '.$initialState['class'], [
 					'app' => $initialState['appId'],
 				]);
 			}

lib/public/AppFramework/Services/InitialStateProvider.php

Indentation +14 added lines, -14 removed lines

@@ -30,20 +30,20 @@
  */
 abstract class InitialStateProvider implements \JsonSerializable {
 
-	/**
-	 * @since 21.0.0
-	 */
-	abstract public function getKey(): string;
+    /**
+     * @since 21.0.0
+     */
+    abstract public function getKey(): string;
 
-	/**
-	 * @since 21.0.0
-	 */
-	abstract public function getData();
+    /**
+     * @since 21.0.0
+     */
+    abstract public function getData();
 
-	/**
-	 * @since 21.0.0
-	 */
-	final public function jsonSerialize() {
-		return $this->getData();
-	}
+    /**
+     * @since 21.0.0
+     */
+    final public function jsonSerialize() {
+        return $this->getData();
+    }
 }

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +119 added lines, -119 removed lines

@@ -40,132 +40,132 @@
  */
 interface IRegistrationContext {
 
-	/**
-	 * @param string $capability
-	 * @see IAppContainer::registerCapability
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerCapability(string $capability): void;
+    /**
+     * @param string $capability
+     * @see IAppContainer::registerCapability
+     *
+     * @since 20.0.0
+     */
+    public function registerCapability(string $capability): void;
 
-	/**
-	 * Register an implementation of \OCP\Support\CrashReport\IReporter that
-	 * will receive unhandled exceptions and throwables
-	 *
-	 * @param string $reporterClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerCrashReporter(string $reporterClass): void;
+    /**
+     * Register an implementation of \OCP\Support\CrashReport\IReporter that
+     * will receive unhandled exceptions and throwables
+     *
+     * @param string $reporterClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerCrashReporter(string $reporterClass): void;
 
-	/**
-	 * Register an implementation of \OCP\Dashboard\IPanel that
-	 * will handle the implementation of a dashboard panel
-	 *
-	 * @param string $widgetClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerDashboardWidget(string $widgetClass): void;
-	/**
-	 * Register a service
-	 *
-	 * @param string $name
-	 * @param callable $factory
-	 * @param bool $shared
-	 *
-	 * @return void
-	 * @see IContainer::registerService()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $name, callable $factory, bool $shared = true): void;
+    /**
+     * Register an implementation of \OCP\Dashboard\IPanel that
+     * will handle the implementation of a dashboard panel
+     *
+     * @param string $widgetClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerDashboardWidget(string $widgetClass): void;
+    /**
+     * Register a service
+     *
+     * @param string $name
+     * @param callable $factory
+     * @param bool $shared
+     *
+     * @return void
+     * @see IContainer::registerService()
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $name, callable $factory, bool $shared = true): void;
 
-	/**
-	 * @param string $alias
-	 * @param string $target
-	 *
-	 * @return void
-	 * @see IContainer::registerAlias()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerServiceAlias(string $alias, string $target): void;
+    /**
+     * @param string $alias
+     * @param string $target
+     *
+     * @return void
+     * @see IContainer::registerAlias()
+     *
+     * @since 20.0.0
+     */
+    public function registerServiceAlias(string $alias, string $target): void;
 
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return void
-	 * @see IContainer::registerParameter()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerParameter(string $name, $value): void;
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     * @see IContainer::registerParameter()
+     *
+     * @since 20.0.0
+     */
+    public function registerParameter(string $name, $value): void;
 
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @param int $priority
-	 *
-	 * @see IEventDispatcher::addServiceListener()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerEventListener(string $event, string $listener, int $priority = 0): void;
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
+     * @param int $priority
+     *
+     * @see IEventDispatcher::addServiceListener()
+     *
+     * @since 20.0.0
+     */
+    public function registerEventListener(string $event, string $listener, int $priority = 0): void;
 
-	/**
-	 * @param string $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerMiddleware(string $class): void;
+    /**
+     * @param string $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     */
+    public function registerMiddleware(string $class): void;
 
-	/**
-	 * Register a search provider for the unified search
-	 *
-	 * It is allowed to register more than one provider per app as the search
-	 * results can go into distinct sections, e.g. "Files" and "Files shared
-	 * with you" in the Files app.
-	 *
-	 * @param string $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerSearchProvider(string $class): void;
+    /**
+     * Register a search provider for the unified search
+     *
+     * It is allowed to register more than one provider per app as the search
+     * results can go into distinct sections, e.g. "Files" and "Files shared
+     * with you" in the Files app.
+     *
+     * @param string $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerSearchProvider(string $class): void;
 
-	/**
-	 * Register an alternative login option
-	 *
-	 * It is allowed to register more than one option per app.
-	 *
-	 * @param string $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerAlternativeLogin(string $class): void;
+    /**
+     * Register an alternative login option
+     *
+     * It is allowed to register more than one option per app.
+     *
+     * @param string $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerAlternativeLogin(string $class): void;
 
-	/**
-	 * Register an initialstate provider
-	 *
-	 * It is allowed to register more than one provider per app.
-	 *
-	 * @param string $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerInitialStateProvider(string $class): void;
+    /**
+     * Register an initialstate provider
+     *
+     * It is allowed to register more than one provider per app.
+     *
+     * @param string $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerInitialStateProvider(string $class): void;
 }

lib/public/IInitialStateService.php

Indentation +30 added lines, -30 removed lines

@@ -33,35 +33,35 @@
  * @since 16.0.0
  */
 interface IInitialStateService {
-	/**
-	 * Allows an app to provide its initial state to the template system.
-	 * Use this if you know your initial state sill be used for example if
-	 * you are in the render function of you controller.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $appName
-	 * @param string $key
-	 * @param bool|int|float|string|array|\JsonSerializable $data
-	 *
-	 * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
-	 */
-	public function provideInitialState(string $appName, string $key, $data): void;
+    /**
+     * Allows an app to provide its initial state to the template system.
+     * Use this if you know your initial state sill be used for example if
+     * you are in the render function of you controller.
+     *
+     * @since 16.0.0
+     *
+     * @param string $appName
+     * @param string $key
+     * @param bool|int|float|string|array|\JsonSerializable $data
+     *
+     * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
+     */
+    public function provideInitialState(string $appName, string $key, $data): void;
 
-	/**
-	 * Allows an app to provide its initial state via a lazy method.
-	 * This will call the closure when the template is being generated.
-	 * Use this if your app is injected into pages. Since then the render method
-	 * is not called explicitly. But we do not want to load the state on webdav
-	 * requests for example.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $appName
-	 * @param string $key
-	 * @param Closure $closure returns a primitive or an object that implements JsonSerializable
-	 *
-	 * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
-	 */
-	public function provideLazyInitialState(string $appName, string $key, Closure $closure): void;
+    /**
+     * Allows an app to provide its initial state via a lazy method.
+     * This will call the closure when the template is being generated.
+     * Use this if your app is injected into pages. Since then the render method
+     * is not called explicitly. But we do not want to load the state on webdav
+     * requests for example.
+     *
+     * @since 16.0.0
+     *
+     * @param string $appName
+     * @param string $key
+     * @param Closure $closure returns a primitive or an object that implements JsonSerializable
+     *
+     * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
+     */
+    public function provideLazyInitialState(string $appName, string $key, Closure $closure): void;
 }