From c88b98767cf274c5e90fa879ab8f216beef13986 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 2 Apr 2019 14:12:24 +0200 Subject: [PATCH 1/2] Use class constants in ContainerTest --- Tests/ContainerTest.php | 57 ++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php index 073ecb0c7..240ac815b 100644 --- a/Tests/ContainerTest.php +++ b/Tests/ContainerTest.php @@ -2,8 +2,23 @@ namespace Doctrine\Bundle\DoctrineBundle\Tests; +use Doctrine\Common\Annotations\Reader; +use Doctrine\Common\Cache\ArrayCache; +use Doctrine\Common\EventManager; +use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory; +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; +use Doctrine\DBAL\Configuration as DBALConfiguration; +use Doctrine\DBAL\Connection; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Version; +use Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer; +use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector; +use Symfony\Bridge\Doctrine\Logger\DbalLogger; +use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; +use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator; use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface; class ContainerTest extends TestCase @@ -23,25 +38,25 @@ public function testContainer() { $container = $this->createYamlBundleTestContainer(); - $this->assertInstanceOf('Symfony\Bridge\Doctrine\Logger\DbalLogger', $container->get('doctrine.dbal.logger')); - $this->assertInstanceOf('Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector', $container->get('data_collector.doctrine')); - $this->assertInstanceOf('Doctrine\DBAL\Configuration', $container->get('doctrine.dbal.default_connection.configuration')); - $this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.dbal.default_connection.event_manager')); - $this->assertInstanceOf('Doctrine\DBAL\Connection', $container->get('doctrine.dbal.default_connection')); - $this->assertInstanceOf('Doctrine\Common\Annotations\Reader', $container->get('doctrine.orm.metadata.annotation_reader')); - $this->assertInstanceOf('Doctrine\ORM\Configuration', $container->get('doctrine.orm.default_configuration')); - $this->assertInstanceOf('Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain', $container->get('doctrine.orm.default_metadata_driver')); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.orm.default_metadata_cache')); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.orm.default_query_cache')); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.orm.default_result_cache')); - $this->assertInstanceOf('Doctrine\ORM\EntityManager', $container->get('doctrine.orm.default_entity_manager')); - $this->assertInstanceOf('Doctrine\DBAL\Connection', $container->get('database_connection')); - $this->assertInstanceOf('Doctrine\ORM\EntityManager', $container->get('doctrine.orm.entity_manager')); - $this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.orm.default_entity_manager.event_manager')); - $this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.dbal.event_manager')); - $this->assertInstanceOf('Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer', $container->get('doctrine.orm.proxy_cache_warmer')); - $this->assertInstanceOf('Doctrine\Common\Persistence\ManagerRegistry', $container->get('doctrine')); - $this->assertInstanceOf('Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator', $container->get('doctrine.orm.validator.unique')); + $this->assertInstanceOf(DbalLogger::class, $container->get('doctrine.dbal.logger')); + $this->assertInstanceOf(DoctrineDataCollector::class, $container->get('data_collector.doctrine')); + $this->assertInstanceOf(DBALConfiguration::class, $container->get('doctrine.dbal.default_connection.configuration')); + $this->assertInstanceOf(EventManager::class, $container->get('doctrine.dbal.default_connection.event_manager')); + $this->assertInstanceOf(Connection::class, $container->get('doctrine.dbal.default_connection')); + $this->assertInstanceOf(Reader::class, $container->get('doctrine.orm.metadata.annotation_reader')); + $this->assertInstanceOf(Configuration::class, $container->get('doctrine.orm.default_configuration')); + $this->assertInstanceOf(MappingDriverChain::class, $container->get('doctrine.orm.default_metadata_driver')); + $this->assertInstanceOf(ArrayCache::class, $container->get('doctrine.orm.default_metadata_cache')); + $this->assertInstanceOf(ArrayCache::class, $container->get('doctrine.orm.default_query_cache')); + $this->assertInstanceOf(ArrayCache::class, $container->get('doctrine.orm.default_result_cache')); + $this->assertInstanceOf(EntityManager::class, $container->get('doctrine.orm.default_entity_manager')); + $this->assertInstanceOf(Connection::class, $container->get('database_connection')); + $this->assertInstanceOf(EntityManager::class, $container->get('doctrine.orm.entity_manager')); + $this->assertInstanceOf(EventManager::class, $container->get('doctrine.orm.default_entity_manager.event_manager')); + $this->assertInstanceOf(EventManager::class, $container->get('doctrine.dbal.event_manager')); + $this->assertInstanceOf(ProxyCacheWarmer::class, $container->get('doctrine.orm.proxy_cache_warmer')); + $this->assertInstanceOf(ManagerRegistry::class, $container->get('doctrine')); + $this->assertInstanceOf(UniqueEntityValidator::class, $container->get('doctrine.orm.validator.unique')); $this->assertSame($container->get('my.platform'), $container->get('doctrine.dbal.default_connection')->getDatabasePlatform()); @@ -50,8 +65,8 @@ public function testContainer() $this->assertFalse($container->has('doctrine.dbal.default_connection.events.mysqlsessioninit')); if (! interface_exists(PropertyInitializableExtractorInterface::class)) { - $this->assertInstanceOf('Doctrine\Common\Persistence\Mapping\ClassMetadataFactory', $container->get('doctrine.orm.default_entity_manager.metadata_factory')); + $this->assertInstanceOf(ClassMetadataFactory::class, $container->get('doctrine.orm.default_entity_manager.metadata_factory')); } - $this->assertInstanceOf('Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor', $container->get('doctrine.orm.default_entity_manager.property_info_extractor')); + $this->assertInstanceOf(DoctrineExtractor::class, $container->get('doctrine.orm.default_entity_manager.property_info_extractor')); } } From 75c249b90754c102f591225dd6136585847a7202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 31 Mar 2019 21:06:18 +0200 Subject: [PATCH 2/2] Add support for validator automapping --- DependencyInjection/DoctrineExtension.php | 18 ++++++++++++++++++ Tests/ContainerTest.php | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php index 87fe46c9d..41a3b879b 100644 --- a/DependencyInjection/DoctrineExtension.php +++ b/DependencyInjection/DoctrineExtension.php @@ -12,6 +12,7 @@ use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension; use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; +use Symfony\Bridge\Doctrine\Validator\DoctrineLoader; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ChildDefinition; @@ -22,6 +23,7 @@ use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory; +use Symfony\Component\Validator\Mapping\Loader\LoaderInterface; /** * DoctrineExtension is an extension for the Doctrine DBAL and ORM library. @@ -350,6 +352,7 @@ protected function ormLoad(array $config, ContainerBuilder $container) $this->loadOrmEntityManager($entityManager, $container); $this->loadPropertyInfoExtractor($name, $container); + $this->loadValidatorLoader($name, $container); } if ($config['resolve_target_entities']) { @@ -756,6 +759,21 @@ private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder $propertyExtractorDefinition->addTag('property_info.type_extractor', ['priority' => -999]); } + /** + * Loads a validator loader for each defined entity manager. + */ + private function loadValidatorLoader(string $entityManagerName, ContainerBuilder $container) : void + { + if (! interface_exists(LoaderInterface::class) || ! class_exists(DoctrineLoader::class)) { + return; + } + + $validatorLoaderDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.validator_loader', $entityManagerName), DoctrineLoader::class); + $validatorLoaderDefinition->addArgument(new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName))); + + $validatorLoaderDefinition->addTag('validator.auto_mapper', ['priority' => -100]); + } + /** * @param array $objectManager * @param string $cacheName diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php index 240ac815b..db669f687 100644 --- a/Tests/ContainerTest.php +++ b/Tests/ContainerTest.php @@ -19,6 +19,7 @@ use Symfony\Bridge\Doctrine\Logger\DbalLogger; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator; +use Symfony\Bridge\Doctrine\Validator\DoctrineLoader; use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface; class ContainerTest extends TestCase @@ -68,5 +69,11 @@ public function testContainer() $this->assertInstanceOf(ClassMetadataFactory::class, $container->get('doctrine.orm.default_entity_manager.metadata_factory')); } $this->assertInstanceOf(DoctrineExtractor::class, $container->get('doctrine.orm.default_entity_manager.property_info_extractor')); + + if (class_exists(DoctrineLoader::class)) { + $this->assertInstanceOf(DoctrineLoader::class, $container->get('doctrine.orm.default_entity_manager.validator_loader')); + } else { + $this->assertFalse($container->has('doctrine.orm.default_entity_manager.validator_loader')); + } } }