10000 [DoctrineBridge][Validator] do not enable validator auto mapping by default by xabbuh · Pull Request #31749 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DoctrineBridge][Validator] do not enable validator auto mapping by default #31749

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

Merged
merged 1 commit into from
May 31, 2019
Merged

[DoctrineBridge][Validator] do not enable validator auto mapping by default #31749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function testLoadClassMetadata()

$validator = Validation::createValidatorBuilder()
->enableAnnotationMapping()
->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager()))
->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoaderEntity$}'))
->getValidator()
;

Expand Down Expand Up @@ -111,7 +111,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
public function regexpProvider()
{
return [
[true, null],
[false, null],
[true, '{^'.preg_quote(DoctrineLoaderEntity::class).'$|^'.preg_quote(Entity::class).'$}'],
[false, '{^'.preg_quote(Entity::class).'$}'],
];
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function __construct(EntityManagerInterface $entityManager, string $class
public function loadClassMetadata(ClassMetadata $metadata): bool
{
$className = $metadata->getClassName();
if (null !== $this->classValidatorRegexp && !preg_match($this->classValidatorRegexp, $className)) {
if (null === $this->classValidatorRegexp || !preg_match($this->classValidatorRegexp, $className)) {
return false;
}

Expand Down
6 changes: 5 additions & 1 deletion src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ public function process(ContainerBuilder $container)
/**
* Builds a regexp to check if a class is auto-mapped.
*/
private function getRegexp(array $patterns): string
private function getRegexp(array $patterns): ?string
{
if (!$patterns) {
return null;
}

$regexps = [];
foreach ($patterns as $pattern) {
// Escape namespace
Expand Down
13 changes: 13 additions & 0 deletions ...ony/Component/Validator/Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,17 @@ public function mappingProvider(): array
['Symfony\Component\Validator\Tests\Fixtures\\**', ['trailing_double_star'], '{^App\\\\|^Symfony\\\\Component\\\\Validator\\\\Tests\\\\Fixtures\\\\.*?$}'],
];
}

public function testDoNotMapAllClassesWhenConfigIsEmpty()
{
$container = new ContainerBuilder();
$container->setParameter('validator.auto_mapping', []);

$container->register('validator.builder', ValidatorBuilder::class);
$container->register('loader')->addTag('validator.auto_mapper');

(new AddAutoMappingConfigurationPass())->process($container);

$this->assertNull($container->getDefinition('loader')->getArgument('$classValidatorRegexp'));
}
}
0