Decorator: introduce SimpleEntityManagerDecorator

Author: f3l1x

src/DI/OrmExtension.php

@@ -5,14 +5,14 @@
 use Doctrine\Common\Proxy\AbstractProxyFactory;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
-use Doctrine\ORM\Decorator\EntityManagerDecorator;
 use Doctrine\ORM\EntityManager as DoctrineEntityManager;
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Nette\DI\Definitions\Statement;
 use Nette\DI\Helpers;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
+use Nettrine\ORM\Decorator\SimpleEntityManagerDecorator;
 use Nettrine\ORM\DI\Definitions\SmartStatement;
 use Nettrine\ORM\Exception\Logical\InvalidArgumentException;
 use Nettrine\ORM\Exception\Logical\InvalidStateException;
@@ -35,7 +35,7 @@ public function getConfigSchema(): Schema
 		$proxyDir = isset($parameters['tempDir']) ? $parameters['tempDir'] . '/proxies' : null;
 
 		return Expect::structure([
-			'entityManagerDecoratorClass' => Expect::string(EntityManagerDecorator::class),
+			'entityManagerDecoratorClass' => Expect::string(SimpleEntityManagerDecorator::class),
 			'configurationClass' => Expect::string(Configuration::class),
 			'configuration' => Expect::structure([
 				'proxyDir' => Expect::string($proxyDir)->nullable(),
@@ -193,15 +193,16 @@ public function loadEntityManagerConfiguration(): void
 
 		// Manager Registry
 		$builder->addDefinition($this->prefix('managerRegistry'))
-			->setType(\Doctrine\Persistence\ManagerRegistry::class)
 			->setFactory(ManagerRegistry::class, [
-				$builder->getDefinitionByType(Connection::class),
+				'@' . Connection::class,
 				$this->prefix('@entityManagerDecorator'),
 			]);
 
 		// Manager Provider
 		$builder->addDefinition($this->prefix('managerProvider'))
-			->setFactory(ManagerProvider::class, [$this->prefix('@managerRegistry')]);
+			->setFactory(ManagerProvider::class, [
+				$this->prefix('@managerRegistry'),
+			]);
 	}
 
 	public function loadMappingConfiguration(): void

src/Decorator/SimpleEntityManagerDecorator.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Nettrine\ORM\Decorator;
+
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
+
+final class SimpleEntityManagerDecorator extends EntityManagerDecorator
+{
+
+}