nextcloud / server

lib/public/Support/CrashReport/IRegistry.php

Indentation +43 added lines, -43 removed lines

@@ -36,50 +36,50 @@
  */
 interface IRegistry {
 
-	/**
-	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
-	 *
-	 * @since 13.0.0
-	 * @deprecated 20.0.0 use IRegistrationContext::registerCrashReporter
-	 * @see IRegistrationContext::registerCrashReporter()
-	 */
-	public function register(IReporter $reporter): void;
+    /**
+     * Register a reporter instance
+     *
+     * @param IReporter $reporter
+     *
+     * @since 13.0.0
+     * @deprecated 20.0.0 use IRegistrationContext::registerCrashReporter
+     * @see IRegistrationContext::registerCrashReporter()
+     */
+    public function register(IReporter $reporter): void;
 
-	/**
-	 * Delegate breadcrumb collection to all registered reporters
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @deprecated used internally only
-	 * @since 15.0.0
-	 */
-	public function delegateBreadcrumb(string $message, string $category, array $context = []): void;
+    /**
+     * Delegate breadcrumb collection to all registered reporters
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @deprecated used internally only
+     * @since 15.0.0
+     */
+    public function delegateBreadcrumb(string $message, string $category, array $context = []): void;
 
-	/**
-	 * Delegate crash reporting to all registered reporters
-	 *
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 *
-	 * @deprecated used internally only
-	 * @since 13.0.0
-	 */
-	public function delegateReport($exception, array $context = []);
+    /**
+     * Delegate crash reporting to all registered reporters
+     *
+     * @param Exception|Throwable $exception
+     * @param array $context
+     *
+     * @deprecated used internally only
+     * @since 13.0.0
+     */
+    public function delegateReport($exception, array $context = []);
 
-	/**
-	 * Delegate a message to all reporters that implement IMessageReporter
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 *
-	 * @deprecated used internally only
-	 * @since 17.0.0
-	 */
-	public function delegateMessage(string $message, array $context = []): void;
+    /**
+     * Delegate a message to all reporters that implement IMessageReporter
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     *
+     * @deprecated used internally only
+     * @since 17.0.0
+     */
+    public function delegateMessage(string $message, array $context = []): void;
 }

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +72 added lines, -72 removed lines

@@ -37,82 +37,82 @@
  */
 interface IRegistrationContext {
 
-	/**
-	 * @param string $capability
-	 * @see IAppContainer::registerCapability
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerCapability(string $capability): void;
+    /**
+     * @param string $capability
+     * @see IAppContainer::registerCapability
+     *
+     * @since 20.0.0
+     */
+    public function registerCapability(string $capability): void;
 
-	/**
-	 * Register an implementation of \OCP\Support\CrashReport\IReporter that
-	 * will receive unhandled exceptions and throwables
-	 *
-	 * @param string $reporterClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerCrashReporter(string $reporterClass): void;
+    /**
+     * Register an implementation of \OCP\Support\CrashReport\IReporter that
+     * will receive unhandled exceptions and throwables
+     *
+     * @param string $reporterClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerCrashReporter(string $reporterClass): void;
 
-	/**
-	 * Register a service
-	 *
-	 * @param string $name
-	 * @param callable $factory
-	 * @param bool $shared
-	 *
-	 * @return void
-	 * @see IContainer::registerService()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $name, callable $factory, bool $shared = true): void;
+    /**
+     * Register a service
+     *
+     * @param string $name
+     * @param callable $factory
+     * @param bool $shared
+     *
+     * @return void
+     * @see IContainer::registerService()
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $name, callable $factory, bool $shared = true): void;
 
-	/**
-	 * @param string $alias
-	 * @param string $target
-	 *
-	 * @return void
-	 * @see IContainer::registerAlias()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerServiceAlias(string $alias, string $target): void;
+    /**
+     * @param string $alias
+     * @param string $target
+     *
+     * @return void
+     * @see IContainer::registerAlias()
+     *
+     * @since 20.0.0
+     */
+    public function registerServiceAlias(string $alias, string $target): void;
 
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return void
-	 * @see IContainer::registerParameter()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerParameter(string $name, $value): void;
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     * @see IContainer::registerParameter()
+     *
+     * @since 20.0.0
+     */
+    public function registerParameter(string $name, $value): void;
 
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @param int $priority
-	 *
-	 * @see IEventDispatcher::addServiceListener()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerEventListener(string $event, string $listener, int $priority = 0): void;
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
+     * @param int $priority
+     *
+     * @see IEventDispatcher::addServiceListener()
+     *
+     * @since 20.0.0
+     */
+    public function registerEventListener(string $event, string $listener, int $priority = 0): void;
 
-	/**
-	 * @param string $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerMiddleware(string $class): void;
+    /**
+     * @param string $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     */
+    public function registerMiddleware(string $class): void;
 }

lib/private/Support/CrashReport/Registry.php

Indentation +109 added lines, -109 removed lines

@@ -39,119 +39,119 @@
 
 class Registry implements IRegistry {
 
-	/** @var string[] */
-	private $lazyReporters = [];
-
-	/** @var IReporter[] */
-	private $reporters = [];
-
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
-	 */
-	public function register(IReporter $reporter): void {
-		$this->reporters[] = $reporter;
-	}
-
-	public function registerLazy(string $class): void {
-		$this->lazyReporters[] = $class;
-	}
-
-	/**
-	 * Delegate breadcrumb collection to all registered reporters
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @since 15.0.0
-	 */
-	public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof ICollectBreadcrumbs) {
-				$reporter->collect($message, $category, $context);
-			}
-		}
-	}
-
-	/**
-	 * Delegate crash reporting to all registered reporters
-	 *
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function delegateReport($exception, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			$reporter->report($exception, $context);
-		}
-	}
-
-	/**
-	 * Delegate a message to all reporters that implement IMessageReporter
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function delegateMessage(string $message, array $context = []): void {
-		$this->loadLazyProviders();
-
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof IMessageReporter) {
-				$reporter->reportMessage($message, $context);
-			}
-		}
-	}
-
-	private function loadLazyProviders(): void {
-		$classes = $this->lazyReporters;
-		foreach ($classes as $class) {
-			try {
-				/** @var IReporter $reporter */
-				$reporter = $this->serverContainer->query($class);
-			} catch (QueryException $e) {
-				/*
+    /** @var string[] */
+    private $lazyReporters = [];
+
+    /** @var IReporter[] */
+    private $reporters = [];
+
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Register a reporter instance
+     *
+     * @param IReporter $reporter
+     */
+    public function register(IReporter $reporter): void {
+        $this->reporters[] = $reporter;
+    }
+
+    public function registerLazy(string $class): void {
+        $this->lazyReporters[] = $class;
+    }
+
+    /**
+     * Delegate breadcrumb collection to all registered reporters
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @since 15.0.0
+     */
+    public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof ICollectBreadcrumbs) {
+                $reporter->collect($message, $category, $context);
+            }
+        }
+    }
+
+    /**
+     * Delegate crash reporting to all registered reporters
+     *
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function delegateReport($exception, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            $reporter->report($exception, $context);
+        }
+    }
+
+    /**
+     * Delegate a message to all reporters that implement IMessageReporter
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     */
+    public function delegateMessage(string $message, array $context = []): void {
+        $this->loadLazyProviders();
+
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof IMessageReporter) {
+                $reporter->reportMessage($message, $context);
+            }
+        }
+    }
+
+    private function loadLazyProviders(): void {
+        $classes = $this->lazyReporters;
+        foreach ($classes as $class) {
+            try {
+                /** @var IReporter $reporter */
+                $reporter = $this->serverContainer->query($class);
+            } catch (QueryException $e) {
+                /*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not load lazy crash reporter: ' . $e->getMessage(),
-					'level' => ILogger::FATAL,
-				]);
-			}
-			/**
-			 * Try to register the loaded reporter. Theoretically it could be of a wrong
-			 * type, so we might get a TypeError here that we should catch.
-			 */
-			try {
-				$this->register($reporter);
-			} catch (Throwable $e) {
-				/*
+                \OC::$server->getLogger()->logException($e, [
+                    'message' => 'Could not load lazy crash reporter: ' . $e->getMessage(),
+                    'level' => ILogger::FATAL,
+                ]);
+            }
+            /**
+             * Try to register the loaded reporter. Theoretically it could be of a wrong
+             * type, so we might get a TypeError here that we should catch.
+             */
+            try {
+                $this->register($reporter);
+            } catch (Throwable $e) {
+                /*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not register lazy crash reporter: ' . $e->getMessage(),
-					'level' => ILogger::FATAL,
-				]);
-			}
-		}
-		$this->lazyReporters = [];
-	}
+                \OC::$server->getLogger()->logException($e, [
+                    'message' => 'Could not register lazy crash reporter: ' . $e->getMessage(),
+                    'level' => ILogger::FATAL,
+                ]);
+            }
+        }
+        $this->lazyReporters = [];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
 				 * we can not inject it. Thus the static call.
 				 */
 				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not load lazy crash reporter: ' . $e->getMessage(),
+					'message' => 'Could not load lazy crash reporter: '.$e->getMessage(),
 					'level' => ILogger::FATAL,
 				]);
 			}
@@ -147,7 +147,7 @@ 
 				 * we can not inject it. Thus the static call.
 				 */
 				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Could not register lazy crash reporter: ' . $e->getMessage(),
+					'message' => 'Could not register lazy crash reporter: '.$e->getMessage(),
 					'level' => ILogger::FATAL,
 				]);
 			}

lib/private/AppFramework/Bootstrap/Coordinator.php

Indentation +87 added lines, -87 removed lines

@@ -40,112 +40,112 @@
 
 class Coordinator {
 
-	/** @var IServerContainer */
-	private $serverContainer;
+    /** @var IServerContainer */
+    private $serverContainer;
 
-	/** @var Registry */
-	private $registry;
+    /** @var Registry */
+    private $registry;
 
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(IServerContainer $container,
-								Registry $registry,
-								IEventDispatcher $eventListener,
-								ILogger $logger) {
-		$this->serverContainer = $container;
-		$this->registry = $registry;
-		$this->eventDispatcher = $eventListener;
-		$this->logger = $logger;
-	}
+    public function __construct(IServerContainer $container,
+                                Registry $registry,
+                                IEventDispatcher $eventListener,
+                                ILogger $logger) {
+        $this->serverContainer = $container;
+        $this->registry = $registry;
+        $this->eventDispatcher = $eventListener;
+        $this->logger = $logger;
+    }
 
-	public function runRegistration(): void {
-		$context = new RegistrationContext($this->logger);
-		$apps = [];
-		foreach (OC_App::getEnabledApps() as $appId) {
-			/*
+    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,
-					]);
-				}
-			}
-		}
+            $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);
-	}
+        /**
+         * 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);
+    }
 
-	public function bootApp(string $appId): void {
-		$appNameSpace = App::buildAppNamespace($appId);
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
-		if (!class_exists($applicationClassName)) {
-			// Nothing to boot
-			return;
-		}
+    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/AppFramework/Bootstrap/RegistrationContext.php

Indentation +292 added lines, -292 removed lines

@@ -35,296 +35,296 @@
 
 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 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 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,
-		];
-	}
-
-	/**
-	 * @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->addListener(
-						$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,
-				]);
-			}
-		}
-	}
+    /** @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 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 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,
+        ];
+    }
+
+    /**
+     * @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->addListener(
+                        $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,
+                ]);
+            }
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,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;
@@ -200,7 +200,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,
 				]);
 			}
@@ -217,7 +217,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,
 				]);
 			}
@@ -242,7 +242,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,
 				]);
 			}
@@ -268,7 +268,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,
 				]);
 			}
@@ -285,7 +285,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,
 				]);
 			}
@@ -302,7 +302,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,
 				]);
 			}
@@ -321,7 +321,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,
 				]);
 			}