nextcloud / server

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +406 added lines, -406 removed lines

@@ -51,410 +51,410 @@
 
 class RegistrationContext {
 
-	/** @var ServiceRegistration<ICapability>[] */
-	private $capabilities = [];
-
-	/** @var ServiceRegistration<IReporter>[] */
-	private $crashReporters = [];
-
-	/** @var ServiceRegistration<IWidget>[] */
-	private $dashboardPanels = [];
-
-	/** @var ServiceFactoryRegistration[] */
-	private $services = [];
-
-	/** @var ServiceAliasRegistration[] */
-	private $aliases = [];
-
-	/** @var ParameterRegistration[] */
-	private $parameters = [];
-
-	/** @var EventListenerRegistration[] */
-	private $eventListeners = [];
-
-	/** @var ServiceRegistration<Middleware>[] */
-	private $middlewares = [];
-
-	/** @var ServiceRegistration<IProvider>[] */
-	private $searchProviders = [];
-
-	/** @var ServiceRegistration<IAlternativeLogin>[] */
-	private $alternativeLogins = [];
-
-	/** @var ServiceRegistration<InitialStateProvider>[] */
-	private $initialStates = [];
-
-	/** @var ServiceRegistration<IHandler>[] */
-	private $wellKnownHandlers = [];
-
-	/** @var ServiceRegistration<ICustomTemplateProvider>[] */
-	private $templateProviders = [];
-
-	/** @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 registerWellKnownHandler(string $class): void {
-				$this->context->registerWellKnown(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerTemplateProvider(string $providerClass): void {
-				$this->context->registerTemplateProvider(
-					$this->appId,
-					$providerClass
-				);
-			}
-		};
-	}
-
-	/**
-	 * @psalm-param class-string<ICapability> $capability
-	 */
-	public function registerCapability(string $appId, string $capability): void {
-		$this->capabilities[] = new ServiceRegistration($appId, $capability);
-	}
-
-	/**
-	 * @psalm-param class-string<IReporter> $capability
-	 */
-	public function registerCrashReporter(string $appId, string $reporterClass): void {
-		$this->crashReporters[] = new ServiceRegistration($appId, $reporterClass);
-	}
-
-	/**
-	 * @psalm-param class-string<IWidget> $capability
-	 */
-	public function registerDashboardPanel(string $appId, string $panelClass): void {
-		$this->dashboardPanels[] = new ServiceRegistration($appId, $panelClass);
-	}
-
-	public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
-		$this->services[] = new ServiceFactoryRegistration($appId, $name, $factory, $shared);
-	}
-
-	public function registerServiceAlias(string $appId, string $alias, string $target): void {
-		$this->aliases[] = new ServiceAliasRegistration($appId, $alias, $target);
-	}
-
-	public function registerParameter(string $appId, string $name, $value): void {
-		$this->parameters[] = new ParameterRegistration($appId, $name, $value);
-	}
-
-	public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
-		$this->eventListeners[] = new EventListenerRegistration($appId, $event, $listener, $priority);
-	}
-
-	/**
-	 * @psalm-param class-string<Middleware> $class
-	 */
-	public function registerMiddleware(string $appId, string $class): void {
-		$this->middlewares[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerSearchProvider(string $appId, string $class) {
-		$this->searchProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerAlternativeLogin(string $appId, string $class): void {
-		$this->alternativeLogins[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerInitialState(string $appId, string $class): void {
-		$this->initialStates[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerWellKnown(string $appId, string $class): void {
-		$this->wellKnownHandlers[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerTemplateProvider(string $appId, string $class): void {
-		$this->templateProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCapabilityRegistrations(array $apps): void {
-		while (($registration = array_shift($this->capabilities)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerCapability($registration->getService());
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$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 {
-		while (($registration = array_shift($this->crashReporters)) !== null) {
-			try {
-				$registry->registerLazy($registration->getService());
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$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 {
-		while (($panel = array_shift($this->dashboardPanels)) !== null) {
-			try {
-				$dashboardManager->lazyRegisterWidget($panel->getService());
-			} catch (Throwable $e) {
-				$appId = $panel->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
-		while (($registration = array_shift($this->eventListeners)) !== null) {
-			try {
-				$eventDispatcher->addServiceListener(
-					$registration->getEvent(),
-					$registration->getService(),
-					$registration->getPriority()
-				);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$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 {
-		while (($registration = array_shift($this->services)) !== null) {
-			try {
-				/**
-				 * Register the service and convert the callable into a \Closure if necessary
-				 */
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerService(
-						$registration->getName(),
-						Closure::fromCallable($registration->getFactory()),
-						$registration->isShared()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during service registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->aliases)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerAlias(
-						$registration->getAlias(),
-						$registration->getTarget()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->parameters)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerParameter(
-						$registration->getName(),
-						$registration->getValue()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$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 {
-		while (($middleware = array_shift($this->middlewares)) !== null) {
-			try {
-				$apps[$middleware->getAppId()]
-					->getContainer()
-					->registerMiddleWare($middleware->getService());
-			} catch (Throwable $e) {
-				$appId = $middleware->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @return ServiceRegistration<IProvider>[]
-	 */
-	public function getSearchProviders(): array {
-		return $this->searchProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<IAlternativeLogin>[]
-	 */
-	public function getAlternativeLogins(): array {
-		return $this->alternativeLogins;
-	}
-
-	/**
-	 * @return ServiceRegistration<InitialStateProvider>[]
-	 */
-	public function getInitialStates(): array {
-		return $this->initialStates;
-	}
-
-	/**
-	 * @return ServiceRegistration<IHandler>[]
-	 */
-	public function getWellKnownHandlers(): array {
-		return $this->wellKnownHandlers;
-	}
-
-	/**
-	 * @return ServiceRegistration<ICustomTemplateProvider>[]
-	 */
-	public function getTemplateProviders(): array {
-		return $this->templateProviders;
-	}
+    /** @var ServiceRegistration<ICapability>[] */
+    private $capabilities = [];
+
+    /** @var ServiceRegistration<IReporter>[] */
+    private $crashReporters = [];
+
+    /** @var ServiceRegistration<IWidget>[] */
+    private $dashboardPanels = [];
+
+    /** @var ServiceFactoryRegistration[] */
+    private $services = [];
+
+    /** @var ServiceAliasRegistration[] */
+    private $aliases = [];
+
+    /** @var ParameterRegistration[] */
+    private $parameters = [];
+
+    /** @var EventListenerRegistration[] */
+    private $eventListeners = [];
+
+    /** @var ServiceRegistration<Middleware>[] */
+    private $middlewares = [];
+
+    /** @var ServiceRegistration<IProvider>[] */
+    private $searchProviders = [];
+
+    /** @var ServiceRegistration<IAlternativeLogin>[] */
+    private $alternativeLogins = [];
+
+    /** @var ServiceRegistration<InitialStateProvider>[] */
+    private $initialStates = [];
+
+    /** @var ServiceRegistration<IHandler>[] */
+    private $wellKnownHandlers = [];
+
+    /** @var ServiceRegistration<ICustomTemplateProvider>[] */
+    private $templateProviders = [];
+
+    /** @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 registerWellKnownHandler(string $class): void {
+                $this->context->registerWellKnown(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerTemplateProvider(string $providerClass): void {
+                $this->context->registerTemplateProvider(
+                    $this->appId,
+                    $providerClass
+                );
+            }
+        };
+    }
+
+    /**
+     * @psalm-param class-string<ICapability> $capability
+     */
+    public function registerCapability(string $appId, string $capability): void {
+        $this->capabilities[] = new ServiceRegistration($appId, $capability);
+    }
+
+    /**
+     * @psalm-param class-string<IReporter> $capability
+     */
+    public function registerCrashReporter(string $appId, string $reporterClass): void {
+        $this->crashReporters[] = new ServiceRegistration($appId, $reporterClass);
+    }
+
+    /**
+     * @psalm-param class-string<IWidget> $capability
+     */
+    public function registerDashboardPanel(string $appId, string $panelClass): void {
+        $this->dashboardPanels[] = new ServiceRegistration($appId, $panelClass);
+    }
+
+    public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
+        $this->services[] = new ServiceFactoryRegistration($appId, $name, $factory, $shared);
+    }
+
+    public function registerServiceAlias(string $appId, string $alias, string $target): void {
+        $this->aliases[] = new ServiceAliasRegistration($appId, $alias, $target);
+    }
+
+    public function registerParameter(string $appId, string $name, $value): void {
+        $this->parameters[] = new ParameterRegistration($appId, $name, $value);
+    }
+
+    public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
+        $this->eventListeners[] = new EventListenerRegistration($appId, $event, $listener, $priority);
+    }
+
+    /**
+     * @psalm-param class-string<Middleware> $class
+     */
+    public function registerMiddleware(string $appId, string $class): void {
+        $this->middlewares[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerSearchProvider(string $appId, string $class) {
+        $this->searchProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerAlternativeLogin(string $appId, string $class): void {
+        $this->alternativeLogins[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerInitialState(string $appId, string $class): void {
+        $this->initialStates[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerWellKnown(string $appId, string $class): void {
+        $this->wellKnownHandlers[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerTemplateProvider(string $appId, string $class): void {
+        $this->templateProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCapabilityRegistrations(array $apps): void {
+        while (($registration = array_shift($this->capabilities)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerCapability($registration->getService());
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $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 {
+        while (($registration = array_shift($this->crashReporters)) !== null) {
+            try {
+                $registry->registerLazy($registration->getService());
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $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 {
+        while (($panel = array_shift($this->dashboardPanels)) !== null) {
+            try {
+                $dashboardManager->lazyRegisterWidget($panel->getService());
+            } catch (Throwable $e) {
+                $appId = $panel->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
+        while (($registration = array_shift($this->eventListeners)) !== null) {
+            try {
+                $eventDispatcher->addServiceListener(
+                    $registration->getEvent(),
+                    $registration->getService(),
+                    $registration->getPriority()
+                );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $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 {
+        while (($registration = array_shift($this->services)) !== null) {
+            try {
+                /**
+                 * Register the service and convert the callable into a \Closure if necessary
+                 */
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerService(
+                        $registration->getName(),
+                        Closure::fromCallable($registration->getFactory()),
+                        $registration->isShared()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during service registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->aliases)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerAlias(
+                        $registration->getAlias(),
+                        $registration->getTarget()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->parameters)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerParameter(
+                        $registration->getName(),
+                        $registration->getValue()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $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 {
+        while (($middleware = array_shift($this->middlewares)) !== null) {
+            try {
+                $apps[$middleware->getAppId()]
+                    ->getContainer()
+                    ->registerMiddleWare($middleware->getService());
+            } catch (Throwable $e) {
+                $appId = $middleware->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @return ServiceRegistration<IProvider>[]
+     */
+    public function getSearchProviders(): array {
+        return $this->searchProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<IAlternativeLogin>[]
+     */
+    public function getAlternativeLogins(): array {
+        return $this->alternativeLogins;
+    }
+
+    /**
+     * @return ServiceRegistration<InitialStateProvider>[]
+     */
+    public function getInitialStates(): array {
+        return $this->initialStates;
+    }
+
+    /**
+     * @return ServiceRegistration<IHandler>[]
+     */
+    public function getWellKnownHandlers(): array {
+        return $this->wellKnownHandlers;
+    }
+
+    /**
+     * @return ServiceRegistration<ICustomTemplateProvider>[]
+     */
+    public function getTemplateProviders(): array {
+        return $this->templateProviders;
+    }
 }

lib/private/InitialStateService.php

Indentation +111 added lines, -111 removed lines

@@ -38,115 +38,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->getService());
-			} 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->getAppId(),
-				]);
-				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->getService(), [
-					'app' => $initialState->getAppId(),
-				]);
-			}
-
-			$this->provideInitialState($initialState->getAppId(), $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->getService());
+            } 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->getAppId(),
+                ]);
+                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->getService(), [
+                    'app' => $initialState->getAppId(),
+                ]);
+            }
+
+            $this->provideInitialState($initialState->getAppId(), $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

@@ -69,7 +69,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 {
@@ -119,7 +119,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->getAppId(),
 				]);
@@ -128,7 +128,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->getService(), [
+				$this->logger->error('Initial state provider is not an InitialStateProvider instance: '.$initialState->getService(), [
 					'app' => $initialState->getAppId(),
 				]);
 			}