Inject parameter/service maps directly instead of factories

Author: Wirone

Diff for: src/Symfony/SymfonyContainerResultCacheMetaExtension.php

@@ -10,17 +10,14 @@
 final class SymfonyContainerResultCacheMetaExtension implements ResultCacheMetaExtension
 {
 
-	private ParameterMapFactory $parameterMapFactory;
+	private ParameterMap $parameterMap;
 
-	private ServiceMapFactory $serviceMapFactory;
+	private ServiceMap $serviceMap;
 
-	public function __construct(
-		ParameterMapFactory $parameterMapFactory,
-		ServiceMapFactory $serviceMapFactory
-	)
+	public function __construct(ParameterMap $parameterMap, ServiceMap $serviceMap)
 	{
-		$this->parameterMapFactory = $parameterMapFactory;
-		$this->serviceMapFactory = $serviceMapFactory;
+		$this->parameterMap = $parameterMap;
+		$this->serviceMap = $serviceMap;
 	}
 
 	public function getKey(): string
@@ -36,7 +33,7 @@ public function getHash(): string
 					'name' => $parameter->getKey(),
 					'value' => $parameter->getValue(),
 				],
-				$this->parameterMapFactory->create()->getParameters(),
+				$this->parameterMap->getParameters(),
 			),
 			'services' => array_map(
 				static fn (ServiceDefinition $service) => [
@@ -46,7 +43,7 @@ public function getHash(): string
 					'synthetic' => $service->isSynthetic() ? 'yes' : 'no',
 					'alias' => $service->getAlias(),
 				],
-				$this->serviceMapFactory->create()->getServices(),
+				$this->serviceMap->getServices(),
 			),
 		]));
 	}

Diff for: src/Symfony/XmlParameterMapFactory.php

@@ -16,8 +16,6 @@
 final class XmlParameterMapFactory implements ParameterMapFactory
 {
 
-	private ?ParameterMap $parameterMap = null;
-
 	private ?string $containerXml = null;
 
 	public function __construct(?string $containerXmlPath)
@@ -27,10 +25,6 @@ public function __construct(?string $containerXmlPath)
 
 	public function create(): ParameterMap
 	{
-		if ($this->parameterMap !== null) {
-			return $this->parameterMap;
-		}
-
 		if ($this->containerXml === null) {
 			return new FakeParameterMap();
 		}
@@ -61,7 +55,7 @@ public function create(): ParameterMap
 
 		ksort($parameters);
 
-		return $this->parameterMap = new DefaultParameterMap($parameters);
+		return new DefaultParameterMap($parameters);
 	}
 
 	/**

Diff for: src/Symfony/XmlServiceMapFactory.php

@@ -13,8 +13,6 @@
 final class XmlServiceMapFactory implements ServiceMapFactory
 {
 
-	private ?ServiceMap $serviceMap = null;
-
 	private ?string $containerXml = null;
 
 	public function __construct(?string $containerXmlPath)
@@ -24,10 +22,6 @@ public function __construct(?string $containerXmlPath)
 
 	public function create(): ServiceMap
 	{
-		if ($this->serviceMap !== null) {
-			return $this->serviceMap;
-		}
-
 		if ($this->containerXml === null) {
 			return new FakeServiceMap();
 		}
@@ -94,7 +88,7 @@ public function create(): ServiceMap
 
 		ksort($services);
 
-		return $this->serviceMap = new DefaultServiceMap($services);
+		return new DefaultServiceMap($services);
 	}
 
 	private function cleanServiceId(string $id): string