nextcloud / server

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +326 added lines, -326 removed lines

@@ -36,330 +36,330 @@
 
 class RegistrationContext {
 
-	/** @var array[] */
-	private $capabilities = [];
-
-	/** @var array[] */
-	private $crashReporters = [];
-
-	/** @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 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 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 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 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,
-		];
-	}
-
-	/**
-	 * @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,
-				]);
-			}
-		}
-	}
-
-	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,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateSearchProviderRegistration(array $apps, SearchComposer $searchComposer): void {
-		foreach ($this->searchProviders as $registration) {
-			try {
-				$searchComposer->registerProvider($registration['class']);
-			} catch (Throwable $e) {
-				$appId = $registration['appId'];
-				$this->logger->logException($e, [
-					'message' => "Error during search provider registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
+    /** @var array[] */
+    private $capabilities = [];
+
+    /** @var array[] */
+    private $crashReporters = [];
+
+    /** @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 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 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 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 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,
+        ];
+    }
+
+    /**
+     * @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,
+                ]);
+            }
+        }
+    }
+
+    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,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateSearchProviderRegistration(array $apps, SearchComposer $searchComposer): void {
+        foreach ($this->searchProviders as $registration) {
+            try {
+                $searchComposer->registerProvider($registration['class']);
+            } catch (Throwable $e) {
+                $appId = $registration['appId'];
+                $this->logger->logException($e, [
+                    'message' => "Error during search provider registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -67,7 +67,7 @@ 
 		$this->logger = $logger;
 	}
 
-	public function for(string $appId): IRegistrationContext {
+	public function for (string $appId): IRegistrationContext {
 		return new class($appId, $this) implements IRegistrationContext {
 			/** @var string */
 			private $appId;
@@ -218,7 +218,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+					'message' => "Error during capability registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -235,7 +235,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(),
+					'message' => "Error during crash reporter registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -260,7 +260,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during event listener registration of $appId: " . $e->getMessage(),
+					'message' => "Error during event listener registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -286,7 +286,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during service registration of $appId: " . $e->getMessage(),
+					'message' => "Error during service registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -303,7 +303,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+					'message' => "Error during service alias registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -320,7 +320,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+					'message' => "Error during service alias registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -339,7 +339,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $middleware['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+					'message' => "Error during capability registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -356,7 +356,7 @@ 
 			} catch (Throwable $e) {
 				$appId = $registration['appId'];
 				$this->logger->logException($e, [
-					'message' => "Error during search provider registration of $appId: " . $e->getMessage(),
+					'message' => "Error during search provider registration of $appId: ".$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}

lib/private/AppFramework/Bootstrap/Coordinator.php

Indentation +102 added lines, -102 removed lines

@@ -41,118 +41,118 @@
 
 class Coordinator {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var Registry */
-	private $registry;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var SearchComposer */
-	private $searchComposer;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IServerContainer $container,
-								Registry $registry,
-								IEventDispatcher $eventListener,
-								SearchComposer $searchComposer,
-								ILogger $logger) {
-		$this->serverContainer = $container;
-		$this->registry = $registry;
-		$this->eventDispatcher = $eventListener;
-		$this->searchComposer = $searchComposer;
-		$this->logger = $logger;
-	}
-
-	public function runRegistration(): void {
-		$context = new RegistrationContext($this->logger);
-		$apps = [];
-		foreach (OC_App::getEnabledApps() as $appId) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    /** @var SearchComposer */
+    private $searchComposer;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(IServerContainer $container,
+                                Registry $registry,
+                                IEventDispatcher $eventListener,
+                                SearchComposer $searchComposer,
+                                ILogger $logger) {
+        $this->serverContainer = $container;
+        $this->registry = $registry;
+        $this->eventDispatcher = $eventListener;
+        $this->searchComposer = $searchComposer;
+        $this->logger = $logger;
+    }
+
+    public function runRegistration(): void {
+        $context = new RegistrationContext($this->logger);
+        $apps = [];
+        foreach (OC_App::getEnabledApps() as $appId) {
+            /*
 			 * First, we have to enable the app's autoloader
 			 *
 			 * @todo use $this->appManager->getAppPath($appId) here
 			 */
-			$path = OC_App::getAppPath($appId);
-			if ($path === false) {
-				// Ignore
-				continue;
-			}
-			OC_App::registerAutoloading($appId, $path);
-
-			/*
+            $path = OC_App::getAppPath($appId);
+            if ($path === false) {
+                // Ignore
+                continue;
+            }
+            OC_App::registerAutoloading($appId, $path);
+
+            /*
 			 * Next we check if there is an application class and it implements
 			 * the \OCP\AppFramework\Bootstrap\IBootstrap interface
 			 */
-			$appNameSpace = App::buildAppNamespace($appId);
-			$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
-			if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) {
-				try {
-					/** @var IBootstrap|App $application */
-					$apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
-				} catch (QueryException $e) {
-					// Weird, but ok
-					continue;
-				}
-				try {
-					$application->register($context->for($appId));
-				} catch (Throwable $e) {
-					$this->logger->logException($e, [
-						'message' => 'Error during app service registration: ' . $e->getMessage(),
-						'level' => ILogger::FATAL,
-					]);
-				}
-			}
-		}
-
-		/**
-		 * Now that all register methods have been called, we can delegate the registrations
-		 * to the actual services
-		 */
-		$context->delegateCapabilityRegistrations($apps);
-		$context->delegateCrashReporterRegistrations($apps, $this->registry);
-		$context->delegateEventListenerRegistrations($this->eventDispatcher);
-		$context->delegateContainerRegistrations($apps);
-		$context->delegateMiddlewareRegistrations($apps);
-		$context->delegateSearchProviderRegistration($apps, $this->searchComposer);
-	}
-
-	public function bootApp(string $appId): void {
-		$appNameSpace = App::buildAppNamespace($appId);
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
-		if (!class_exists($applicationClassName)) {
-			// Nothing to boot
-			return;
-		}
-
-		/*
+            $appNameSpace = App::buildAppNamespace($appId);
+            $applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+            if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) {
+                try {
+                    /** @var IBootstrap|App $application */
+                    $apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
+                } catch (QueryException $e) {
+                    // Weird, but ok
+                    continue;
+                }
+                try {
+                    $application->register($context->for($appId));
+                } catch (Throwable $e) {
+                    $this->logger->logException($e, [
+                        'message' => 'Error during app service registration: ' . $e->getMessage(),
+                        'level' => ILogger::FATAL,
+                    ]);
+                }
+            }
+        }
+
+        /**
+         * Now that all register methods have been called, we can delegate the registrations
+         * to the actual services
+         */
+        $context->delegateCapabilityRegistrations($apps);
+        $context->delegateCrashReporterRegistrations($apps, $this->registry);
+        $context->delegateEventListenerRegistrations($this->eventDispatcher);
+        $context->delegateContainerRegistrations($apps);
+        $context->delegateMiddlewareRegistrations($apps);
+        $context->delegateSearchProviderRegistration($apps, $this->searchComposer);
+    }
+
+    public function bootApp(string $appId): void {
+        $appNameSpace = App::buildAppNamespace($appId);
+        $applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+        if (!class_exists($applicationClassName)) {
+            // Nothing to boot
+            return;
+        }
+
+        /*
 		 * Now it is time to fetch an instance of the App class. For classes
 		 * that implement \OCP\AppFramework\Bootstrap\IBootstrap this means
 		 * the instance was already created for register, but any other
 		 * (legacy) code will now do their magic via the constructor.
 		 */
-		try {
-			/** @var App $application */
-			$application = $this->serverContainer->query($applicationClassName);
-			if ($application instanceof IBootstrap) {
-				/** @var BootContext $context */
-				$context = new BootContext($application->getContainer());
-				$application->boot($context);
-			}
-		} catch (QueryException $e) {
-			$this->logger->logException($e, [
-				'message' => "Could not boot $appId" . $e->getMessage(),
-			]);
-			return;
-		} catch (Throwable $e) {
-			$this->logger->logException($e, [
-				'message' => "Could not boot $appId" . $e->getMessage(),
-				'level' => ILogger::FATAL,
-			]);
-		}
-	}
+        try {
+            /** @var App $application */
+            $application = $this->serverContainer->query($applicationClassName);
+            if ($application instanceof IBootstrap) {
+                /** @var BootContext $context */
+                $context = new BootContext($application->getContainer());
+                $application->boot($context);
+            }
+        } catch (QueryException $e) {
+            $this->logger->logException($e, [
+                'message' => "Could not boot $appId" . $e->getMessage(),
+            ]);
+            return;
+        } catch (Throwable $e) {
+            $this->logger->logException($e, [
+                'message' => "Could not boot $appId" . $e->getMessage(),
+                'level' => ILogger::FATAL,
+            ]);
+        }
+    }
 }

lib/private/Search/Provider/File.php

Indentation +41 added lines, -41 removed lines

@@ -36,45 +36,45 @@
  */
 class File extends \OCP\Search\Provider {
 
-	/**
-	 * Search for files and folders matching the given query
-	 * @param string $query
-	 * @return \OCP\Search\Result
-	 * @deprecated 20.0.0
-	 */
-	public function search($query) {
-		$files = Filesystem::search($query);
-		$results = [];
-		// edit results
-		foreach ($files as $fileData) {
-			// skip versions
-			if (strpos($fileData['path'], '_versions') === 0) {
-				continue;
-			}
-			// skip top-level folder
-			if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
-				continue;
-			}
-			// create audio result
-			if ($fileData['mimepart'] === 'audio') {
-				$result = new \OC\Search\Result\Audio($fileData);
-			}
-			// create image result
-			elseif ($fileData['mimepart'] === 'image') {
-				$result = new \OC\Search\Result\Image($fileData);
-			}
-			// create folder result
-			elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
-				$result = new \OC\Search\Result\Folder($fileData);
-			}
-			// or create file result
-			else {
-				$result = new \OC\Search\Result\File($fileData);
-			}
-			// add to results
-			$results[] = $result;
-		}
-		// return
-		return $results;
-	}
+    /**
+     * Search for files and folders matching the given query
+     * @param string $query
+     * @return \OCP\Search\Result
+     * @deprecated 20.0.0
+     */
+    public function search($query) {
+        $files = Filesystem::search($query);
+        $results = [];
+        // edit results
+        foreach ($files as $fileData) {
+            // skip versions
+            if (strpos($fileData['path'], '_versions') === 0) {
+                continue;
+            }
+            // skip top-level folder
+            if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
+                continue;
+            }
+            // create audio result
+            if ($fileData['mimepart'] === 'audio') {
+                $result = new \OC\Search\Result\Audio($fileData);
+            }
+            // create image result
+            elseif ($fileData['mimepart'] === 'image') {
+                $result = new \OC\Search\Result\Image($fileData);
+            }
+            // create folder result
+            elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
+                $result = new \OC\Search\Result\Folder($fileData);
+            }
+            // or create file result
+            else {
+                $result = new \OC\Search\Result\File($fileData);
+            }
+            // add to results
+            $results[] = $result;
+        }
+        // return
+        return $results;
+    }
 }

lib/private/Search/SearchQuery.php

Indentation +48 added lines, -48 removed lines

@@ -28,61 +28,61 @@
 use OCP\Search\ISearchQuery;
 
 class SearchQuery implements ISearchQuery {
-	public const LIMIT_DEFAULT = 20;
+    public const LIMIT_DEFAULT = 20;
 
-	/** @var string */
-	private $term;
+    /** @var string */
+    private $term;
 
-	/** @var int */
-	private $sortOrder;
+    /** @var int */
+    private $sortOrder;
 
-	/** @var int */
-	private $limit;
+    /** @var int */
+    private $limit;
 
-	/** @var int|string|null */
-	private $cursor;
+    /** @var int|string|null */
+    private $cursor;
 
-	/**
-	 * @param string $term
-	 * @param int $sortOrder
-	 * @param int $limit
-	 * @param int|string|null $cursor
-	 */
-	public function __construct(string $term,
-								int $sortOrder = ISearchQuery::SORT_DATE_DESC,
-								int $limit = self::LIMIT_DEFAULT,
-								$cursor = null) {
-		$this->term = $term;
-		$this->sortOrder = $sortOrder;
-		$this->limit = $limit;
-		$this->cursor = $cursor;
-	}
+    /**
+     * @param string $term
+     * @param int $sortOrder
+     * @param int $limit
+     * @param int|string|null $cursor
+     */
+    public function __construct(string $term,
+                                int $sortOrder = ISearchQuery::SORT_DATE_DESC,
+                                int $limit = self::LIMIT_DEFAULT,
+                                $cursor = null) {
+        $this->term = $term;
+        $this->sortOrder = $sortOrder;
+        $this->limit = $limit;
+        $this->cursor = $cursor;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getTerm(): string {
-		return $this->term;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getTerm(): string {
+        return $this->term;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getSortOrder(): int {
-		return $this->sortOrder;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getSortOrder(): int {
+        return $this->sortOrder;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getLimit(): int {
-		return $this->limit;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getLimit(): int {
+        return $this->limit;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getCursor() {
-		return $this->cursor;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getCursor() {
+        return $this->cursor;
+    }
 }

lib/private/Search/SearchComposer.php

Indentation +94 added lines, -94 removed lines

@@ -57,98 +57,98 @@
  */
 class SearchComposer {
 
-	/** @var string[] */
-	private $lazyProviders = [];
-
-	/** @var IProvider[] */
-	private $providers = [];
-
-	/** @var IServerContainer */
-	private $container;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IServerContainer $container,
-								ILogger $logger) {
-		$this->container = $container;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Register a search provider lazily
-	 *
-	 * Registers the fully-qualified class name of an implementation of an
-	 * IProvider. The service will only be queried on demand. Apps will register
-	 * the providers through the registration context object.
-	 *
-	 * @see IRegistrationContext::registerSearchProvider()
-	 *
-	 * @param string $class
-	 */
-	public function registerProvider(string $class): void {
-		$this->lazyProviders[] = $class;
-	}
-
-	/**
-	 * Load all providers dynamically that were registered through `registerProvider`
-	 *
-	 * If a provider can't be loaded we log it but the operation continues nevertheless
-	 */
-	private function loadLazyProviders(): void {
-		$classes = $this->lazyProviders;
-		foreach ($classes as $class) {
-			try {
-				/** @var IProvider $provider */
-				$provider = $this->container->query($class);
-				$this->providers[$provider->getId()] = $provider;
-			} catch (QueryException $e) {
-				// Log an continue. We can be fault tolerant here.
-				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-		$this->lazyProviders = [];
-	}
-
-	/**
-	 * Get a list of all provider IDs for the consecutive calls to `search`
-	 *
-	 * @return string[]
-	 */
-	public function getProviders(): array {
-		$this->loadLazyProviders();
-
-		/**
-		 * Return an array with the IDs, but strip the associative keys
-		 */
-		return array_values(
-			array_map(function (IProvider $provider) {
-				return $provider->getId();
-			}, $this->providers));
-	}
-
-	/**
-	 * Query an individual search provider for results
-	 *
-	 * @param IUser $user
-	 * @param string $providerId one of the IDs received by `getProviders`
-	 * @param ISearchQuery $query
-	 *
-	 * @return SearchResult
-	 * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
-	 */
-	public function search(IUser $user,
-						   string $providerId,
-						   ISearchQuery $query): SearchResult {
-		$this->loadLazyProviders();
-
-		$provider = $this->providers[$providerId] ?? null;
-		if ($provider === null) {
-			throw new InvalidArgumentException("Provider $providerId is unknown");
-		}
-		return $provider->search($user, $query);
-	}
+    /** @var string[] */
+    private $lazyProviders = [];
+
+    /** @var IProvider[] */
+    private $providers = [];
+
+    /** @var IServerContainer */
+    private $container;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(IServerContainer $container,
+                                ILogger $logger) {
+        $this->container = $container;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Register a search provider lazily
+     *
+     * Registers the fully-qualified class name of an implementation of an
+     * IProvider. The service will only be queried on demand. Apps will register
+     * the providers through the registration context object.
+     *
+     * @see IRegistrationContext::registerSearchProvider()
+     *
+     * @param string $class
+     */
+    public function registerProvider(string $class): void {
+        $this->lazyProviders[] = $class;
+    }
+
+    /**
+     * Load all providers dynamically that were registered through `registerProvider`
+     *
+     * If a provider can't be loaded we log it but the operation continues nevertheless
+     */
+    private function loadLazyProviders(): void {
+        $classes = $this->lazyProviders;
+        foreach ($classes as $class) {
+            try {
+                /** @var IProvider $provider */
+                $provider = $this->container->query($class);
+                $this->providers[$provider->getId()] = $provider;
+            } catch (QueryException $e) {
+                // Log an continue. We can be fault tolerant here.
+                $this->logger->logException($e, [
+                    'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+        $this->lazyProviders = [];
+    }
+
+    /**
+     * Get a list of all provider IDs for the consecutive calls to `search`
+     *
+     * @return string[]
+     */
+    public function getProviders(): array {
+        $this->loadLazyProviders();
+
+        /**
+         * Return an array with the IDs, but strip the associative keys
+         */
+        return array_values(
+            array_map(function (IProvider $provider) {
+                return $provider->getId();
+            }, $this->providers));
+    }
+
+    /**
+     * Query an individual search provider for results
+     *
+     * @param IUser $user
+     * @param string $providerId one of the IDs received by `getProviders`
+     * @param ISearchQuery $query
+     *
+     * @return SearchResult
+     * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
+     */
+    public function search(IUser $user,
+                            string $providerId,
+                            ISearchQuery $query): SearchResult {
+        $this->loadLazyProviders();
+
+        $provider = $this->providers[$providerId] ?? null;
+        if ($provider === null) {
+            throw new InvalidArgumentException("Provider $providerId is unknown");
+        }
+        return $provider->search($user, $query);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+					'message' => 'Could not load search provider dynamically: '.$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -125,7 +125,7 @@ 
 		 * Return an array with the IDs, but strip the associative keys
 		 */
 		return array_values(
-			array_map(function (IProvider $provider) {
+			array_map(function(IProvider $provider) {
 				return $provider->getId();
 			}, $this->providers));
 	}

lib/private/Search/Result/Image.php

Indentation +9 added lines, -9 removed lines

@@ -31,14 +31,14 @@
  */
 class Image extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'image';
+    /**
+     * Type name; translated in templates
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $type = 'image';
 
-	/**
-	 * @TODO add EXIF information
-	 */
+    /**
+     * @TODO add EXIF information
+     */
 }

lib/private/Search/Result/Folder.php

Indentation +6 added lines, -6 removed lines

@@ -31,10 +31,10 @@
  */
 class Folder extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'folder';
+    /**
+     * Type name; translated in templates
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $type = 'folder';
 }

lib/private/Search/Result/Audio.php

Indentation +9 added lines, -9 removed lines

@@ -31,14 +31,14 @@
  */
 class Audio extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'audio';
+    /**
+     * Type name; translated in templates
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $type = 'audio';
 
-	/**
-	 * @TODO add ID3 information
-	 */
+    /**
+     * @TODO add ID3 information
+     */
 }

lib/private/Search/Result/File.php

Indentation +79 added lines, -79 removed lines

@@ -35,92 +35,92 @@
  */
 class File extends \OCP\Search\Result {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'file';
+    /**
+     * Type name; translated in templates
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $type = 'file';
 
-	/**
-	 * Path to file
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $path;
+    /**
+     * Path to file
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $path;
 
-	/**
-	 * Size, in bytes
-	 * @var int
-	 * @deprecated 20.0.0
-	 */
-	public $size;
+    /**
+     * Size, in bytes
+     * @var int
+     * @deprecated 20.0.0
+     */
+    public $size;
 
-	/**
-	 * Date modified, in human readable form
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $modified;
+    /**
+     * Date modified, in human readable form
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $modified;
 
-	/**
-	 * File mime type
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $mime_type;
+    /**
+     * File mime type
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $mime_type;
 
-	/**
-	 * File permissions:
-	 *
-	 * @var string
-	 * @deprecated 20.0.0
-	 */
-	public $permissions;
+    /**
+     * File permissions:
+     *
+     * @var string
+     * @deprecated 20.0.0
+     */
+    public $permissions;
 
-	/**
-	 * Create a new file search result
-	 * @param FileInfo $data file data given by provider
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(FileInfo $data) {
-		$path = $this->getRelativePath($data->getPath());
+    /**
+     * Create a new file search result
+     * @param FileInfo $data file data given by provider
+     * @deprecated 20.0.0
+     */
+    public function __construct(FileInfo $data) {
+        $path = $this->getRelativePath($data->getPath());
 
-		$info = pathinfo($path);
-		$this->id = $data->getId();
-		$this->name = $info['basename'];
-		$this->link = \OC::$server->getURLGenerator()->linkToRoute(
-			'files.view.index',
-			[
-				'dir' => $info['dirname'],
-				'scrollto' => $info['basename'],
-			]
-		);
-		$this->permissions = $data->getPermissions();
-		$this->path = $path;
-		$this->size = $data->getSize();
-		$this->modified = $data->getMtime();
-		$this->mime_type = $data->getMimetype();
-	}
+        $info = pathinfo($path);
+        $this->id = $data->getId();
+        $this->name = $info['basename'];
+        $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+            'files.view.index',
+            [
+                'dir' => $info['dirname'],
+                'scrollto' => $info['basename'],
+            ]
+        );
+        $this->permissions = $data->getPermissions();
+        $this->path = $path;
+        $this->size = $data->getSize();
+        $this->modified = $data->getMtime();
+        $this->mime_type = $data->getMimetype();
+    }
 
-	/**
-	 * @var Folder $userFolderCache
-	 * @deprecated 20.0.0
-	 */
-	protected static $userFolderCache = null;
+    /**
+     * @var Folder $userFolderCache
+     * @deprecated 20.0.0
+     */
+    protected static $userFolderCache = null;
 
-	/**
-	 * converts a path relative to the users files folder
-	 * eg /user/files/foo.txt -> /foo.txt
-	 * @param string $path
-	 * @return string relative path
-	 * @deprecated 20.0.0
-	 */
-	protected function getRelativePath($path) {
-		if (!isset(self::$userFolderCache)) {
-			$user = \OC::$server->getUserSession()->getUser()->getUID();
-			self::$userFolderCache = \OC::$server->getUserFolder($user);
-		}
-		return self::$userFolderCache->getRelativePath($path);
-	}
+    /**
+     * converts a path relative to the users files folder
+     * eg /user/files/foo.txt -> /foo.txt
+     * @param string $path
+     * @return string relative path
+     * @deprecated 20.0.0
+     */
+    protected function getRelativePath($path) {
+        if (!isset(self::$userFolderCache)) {
+            $user = \OC::$server->getUserSession()->getUser()->getUID();
+            self::$userFolderCache = \OC::$server->getUserFolder($user);
+        }
+        return self::$userFolderCache->getRelativePath($path);
+    }
 }