Extension: introduce ManagerProvider, replace entityManagerHelper

Author: f3l1x

src/DI/OrmConsoleExtension.php

@@ -82,25 +82,4 @@ public function loadConfiguration(): void
 			->setAutowired(false);
 	}
 
-	/**
-	 * Decorate services
-	 */
-	public function beforeCompile(): void
-	{
-		// Skip if it's not CLI mode
-		if (!$this->cliMode) {
-			return;
-		}
-
-		$builder = $this->getContainerBuilder();
-
-		// Lookup for Symfony Console Application
-		/** @var ServiceDefinition $applicationDef */
-		$applicationDef = $builder->getDefinitionByType(Application::class);
-
-		// Register helpers
-		$entityManagerHelper = $this->prefix('@entityManagerHelper');
-		$applicationDef->addSetup(new Statement('$service->getHelperSet()->set(?,?)', [$entityManagerHelper, 'em']));
-	}
-
 }

src/DI/OrmExtension.php

@@ -16,6 +16,7 @@
 use Nettrine\ORM\EntityManagerDecorator;
 use Nettrine\ORM\Exception\Logical\InvalidArgumentException;
 use Nettrine\ORM\Exception\Logical\InvalidStateException;
+use Nettrine\ORM\ManagerProvider;
 use Nettrine\ORM\ManagerRegistry;
 use Nettrine\ORM\Mapping\ContainerEntityListenerResolver;
 use stdClass;
@@ -181,6 +182,7 @@ public function loadEntityManagerConfiguration(): void
 		$decorator = $builder->addDefinition($this->prefix('entityManagerDecorator'))
 			->setFactory($entityManagerDecoratorClass, [$original]);
 
+		// Configuration filters
 		if ($config->configuration->filters !== []) {
 			foreach ($config->configuration->filters as $filterName => $filter) {
 				if ($filter->enabled) {
@@ -189,13 +191,17 @@ public function loadEntityManagerConfiguration(): void
 			}
 		}
 
-		// ManagerRegistry
+		// Manager Registry
 		$builder->addDefinition($this->prefix('managerRegistry'))
-			->setType(ManagerRegistry::class)
-			->setArguments([
+			->setType(\Doctrine\Persistence\ManagerRegistry::class)
+			->setFactory(ManagerRegistry::class, [
 				$builder->getDefinitionByType(Connection::class),
 				$this->prefix('@entityManagerDecorator'),
 			]);
+
+		// Manager Provider
+		$builder->addDefinition($this->prefix('managerProvider'))
+			->setFactory(ManagerProvider::class, [$this->prefix('@managerRegistry')]);
 	}
 
 	public function loadMappingConfiguration(): void

src/ManagerProvider.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace Nettrine\ORM;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Tools\Console\EntityManagerProvider;
+use Doctrine\Persistence\ManagerRegistry as DoctrineManagerRegistry;
+
+class ManagerProvider implements EntityManagerProvider
+{
+
+	public function __construct(
+		protected DoctrineManagerRegistry $registry
+	)
+	{
+	}
+
+	public function getDefaultManager(): EntityManagerInterface
+	{
+		return $this->registry->getManager($this->registry->getDefaultManagerName());
+	}
+
+	public function getManager(string $name): EntityManagerInterface
+	{
+		return $this->registry->getManager($name);
+	}
+
+}