Skip to content

Commit 8861d96

Browse files
Merge branch '2.3' into 2.7
* 2.3: Fix security-acl deps Fix doctrine mapping validation type error Remove skipping of tests based on ICU data version whenever possible Fix the handling of null as locale in the stub intl classes do not dump leading backslashes in class names Skip ::class constant [Config] type specific check for emptiness Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php src/Symfony/Component/Locale/Tests/LocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
2 parents ebb229c + a508e9d commit 8861d96

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
252252
throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
253253
'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
254254
'You can register them by adding a new driver to the '.
255-
'"%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'.metadata_driver')
255+
'"%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')
256256
));
257257
}
258258
}

0 commit comments

Comments
 (0)