tweak: ensure only one DocumentBinder instance

Author: g105b

src/Dispatch/Dispatcher.php

@@ -174,7 +174,7 @@ public function __construct(
 		);
 		$this->viewModelProcessor = $viewModelInit->getViewModelProcessor();
 		$this->viewREADYTHING = fn() => $viewModelInit->initHTMLDocument(
-			$this->serviceContainer->get(DocumentBinder::class),
+			$this->serviceContainer->get(Binder::class),
 			$this->serviceContainer->get(HTMLAttributeBinder::class),
 			$this->serviceContainer->get(ListBinder::class),
 			$this->serviceContainer->get(TableBinder::class),
@@ -237,7 +237,7 @@ public function generateResponse():Response {
 		}
 
 // TODO: Why is this here in the dispatcher? Move it to the ViewModel::cleanup() or similar
-		$documentBinder = $this->serviceContainer->get(DocumentBinder::class);
+		$documentBinder = $this->serviceContainer->get(Binder::class);
 		$documentBinder->cleanupDocument();
 
 		$this->viewStreamer->stream($this->view, $this->viewModel);

src/Init/ViewModelInit.php

@@ -37,7 +37,7 @@ public function __construct(
 	}
 
 	public function initHTMLDocument(
-		DocumentBinder $binder,
+		DocumentBinder $documentBinder,
 		HTMLAttributeBinder $htmlAttributeBinder,
 		ListBinder $listBinder,
 		TableBinder $tableBinder,
@@ -70,7 +70,7 @@ public function initHTMLDocument(
 			$bindableCache,
 			$tableBinder,
 		);
-		$binder->setDependencies(
+		$documentBinder->setDependencies(
 			$elementBinder,
 			$placeholderBinder,
 			$tableBinder,

src/Middleware/DefaultServiceLoader.php

@@ -31,10 +31,14 @@
  * responsibilities focused and testable.
  */
 class DefaultServiceLoader {
+	protected string $uniqid;
+
 	public function __construct(
 		protected Config $config,
 		protected Container $container
-	) {}
+	) {
+		$this->uniqid = uniqid(more_entropy: true);
+	}
 
 	public function loadResponseHeaders():ResponseHeaders {
 		$response = $this->container->get(Response::class);
@@ -91,7 +95,7 @@ public function loadListBinder():ListBinder {
 		return new ListBinder();
 	}
 
-	public function loadBinder():DocumentBinder {
+	public function loadBinder():Binder {
 		$document = $this->container->get(Document::class);
 		return new DocumentBinder($document);
 	}

src/Service/ContainerFactory.php

@@ -9,25 +9,18 @@ class ContainerFactory {
 	public function create(Config $config):Container {
 		$container = new Container();
 
-		// Always register the DefaultServiceLoader for core WebEngine services.
-		$container->addLoaderClass(new DefaultServiceLoader($config, $container));
-
 		// Optionally, register an application-provided service loader.
 		$customServiceContainerClassName = implode("\\", [
 			$config->get("app.namespace"),
 			$config->get("app.service_loader"),
 		]);
 
 		if(class_exists($customServiceContainerClassName)) {
-			$constructorArgs = [];
-			if(is_a($customServiceContainerClassName, DefaultServiceLoader::class, true)) {
-				$constructorArgs = [
-					$config,
-					$container,
-				];
-			}
-
-			$container->addLoaderClass(new $customServiceContainerClassName(...$constructorArgs));
+			$container->addLoaderClass(new $customServiceContainerClassName($config, $container));
+		}
+		else {
+			// Always register the DefaultServiceLoader for core WebEngine services.
+			$container->addLoaderClass(new DefaultServiceLoader($config, $container));
 		}
 
 		return $container;