nextcloud / server

lib/private/InitialStateService.php

Indentation +114 added lines, -114 removed lines

@@ -37,118 +37,118 @@
 use Psr\Log\LoggerInterface;
 
 class InitialStateService implements IInitialStateService {
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var string[][] */
-	private $states = [];
-
-	/** @var Closure[][] */
-	private $lazyStates = [];
-
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
-
-	/** @var IServerContainer */
-	private $container;
-
-	public function __construct(LoggerInterface $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] = [];
-			}
-			try {
-				$this->states[$appName][$key] = json_encode($data, JSON_THROW_ON_ERROR);
-			} catch (\JsonException $e) {
-				$this->logger->error('Invalid '. $key . ' data provided to provideInitialState by ' . $appName, ['exception' => $e]);
-			}
-			return;
-		}
-
-		$this->logger->warning('Invalid '. $key . ' 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->error('Could not load initial state provider dynamically: ' . $e->getMessage(), [
-					'exception' => $e,
-					'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 LoggerInterface */
+    private $logger;
+
+    /** @var string[][] */
+    private $states = [];
+
+    /** @var Closure[][] */
+    private $lazyStates = [];
+
+    /** @var Coordinator */
+    private $bootstrapCoordinator;
+
+    /** @var IServerContainer */
+    private $container;
+
+    public function __construct(LoggerInterface $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] = [];
+            }
+            try {
+                $this->states[$appName][$key] = json_encode($data, JSON_THROW_ON_ERROR);
+            } catch (\JsonException $e) {
+                $this->logger->error('Invalid '. $key . ' data provided to provideInitialState by ' . $appName, ['exception' => $e]);
+            }
+            return;
+        }
+
+        $this->logger->warning('Invalid '. $key . ' 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->error('Could not load initial state provider dynamically: ' . $e->getMessage(), [
+                    'exception' => $e,
+                    '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 +4 added lines, -4 removed lines

@@ -67,12 +67,12 @@ 
 			try {
 				$this->states[$appName][$key] = json_encode($data, JSON_THROW_ON_ERROR);
 			} catch (\JsonException $e) {
-				$this->logger->error('Invalid '. $key . ' data provided to provideInitialState by ' . $appName, ['exception' => $e]);
+				$this->logger->error('Invalid '.$key.' data provided to provideInitialState by '.$appName, ['exception' => $e]);
 			}
 			return;
 		}
 
-		$this->logger->warning('Invalid '. $key . ' data provided to provideInitialState by ' . $appName);
+		$this->logger->warning('Invalid '.$key.' data provided to provideInitialState by '.$appName);
 	}
 
 	public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {
@@ -121,7 +121,7 @@ 
 				$provider = $this->container->query($initialState->getService());
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
-				$this->logger->error('Could not load initial state provider dynamically: ' . $e->getMessage(), [
+				$this->logger->error('Could not load initial state provider dynamically: '.$e->getMessage(), [
 					'exception' => $e,
 					'app' => $initialState->getAppId(),
 				]);
@@ -130,7 +130,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(),
 				]);
 			}