Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Register the Validator auto-mapping loader #831

Closed
wants to merge 3 commits into from
Closed

Register the Validator auto-mapping loader #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36d76d2
Register the Validator auto-mapping loader
dunglas Jul 3, 2018
62ef5f7
Inject the entity Manager directly
dunglas Jul 3, 2018
b00f810
Simplify
dunglas Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 21 additions & 3 deletions DependencyInjection/DoctrineExtension.php
View file
Open in desktop
Expand Up @@ -6,9 +6,11 @@
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface;
use Doctrine\Bundle\DoctrineCacheBundle\DependencyInjection\CacheProviderLoader;
use Doctrine\Bundle\DoctrineCacheBundle\DependencyInjection\SymfonyBridgeAdapter;
use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
use Doctrine\ORM\Version;
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\ChildDefinition;
Expand Down Expand Up @@ -352,15 +354,19 @@ protected function ormLoad(array $config, ContainerBuilder $container)
$loadPropertyInfoExtractor = interface_exists('Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface')
&& class_exists('Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor');

$loadValidatorAutoMappingLoader = class_exists(DoctrineLoader::class);

foreach ($config['entity_managers'] as $name => $entityManager) {
$entityManager['name'] = $name;
$this->loadOrmEntityManager($entityManager, $container);

if (! $loadPropertyInfoExtractor) {
continue;
if ($loadPropertyInfoExtractor) {
$this->loadPropertyInfoExtractor($name, $container);
}

$this->loadPropertyInfoExtractor($name, $container);
if ($loadValidatorAutoMappingLoader) {
$this->loadValidatorAutoMappingLoader($name, $container);
}
}

if ($config['resolve_target_entities']) {
Expand Down Expand Up @@ -803,6 +809,18 @@ private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder
$propertyExtractorDefinition->addTag('property_info.type_extractor', ['priority' => -999]);
}

/**
* Loads a validator loader for each defined entity manager.
*
* @param string $entityManagerName
*/
private function loadValidatorAutoMappingLoader($entityManagerName, ContainerBuilder $container)
{
$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_mapping');
}

/**
* @param array $objectManager
* @param string $cacheName
Expand Down
7 changes: 7 additions & 0 deletions Tests/ContainerTest.php
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
namespace Doctrine\Bundle\DoctrineBundle\Tests;

use Doctrine\DBAL\Types\Type;
use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;

class ContainerTest extends TestCase
{
Expand Down Expand Up @@ -54,5 +55,11 @@ public function testContainer()
$this->assertFalse($container->has('doctrine.orm.default_entity_manager.metadata_factory'));
$this->assertFalse($container->has('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'));
}
}
}