Skip to content

Commit fbff912

Browse files
Merge branch '4.3' into 4.4
* 4.3: fix merge CS [Serializer] Skip uninitialized (PHP 7.4) properties in PropertyNormalizer and ObjectNormalizer stop using deprecated Doctrine persistence classes [Cache] Fix wrong classname in deprecation message Fix regex lookahead syntax in ApplicationTest Fixed syntax in comment [SecurityBundle][FirewallMap] Remove unused property [Messenger][AMQP] Use delivery_mode=2 by default [DI] Improve performance of processDefinition Fix invalid Windows path normalization [Validator][ConstraintValidator] Safe fail on invalid timezones [DoctrineBridge] Fixed submitting invalid ids when using queries with limit [FrameworkBundle] Add info & example to auto_mapping config fix comparisons with null values at property paths
2 parents bd143d5 + 043bdd8 commit fbff912

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

DependencyInjection/Configuration.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,11 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
861861
->end()
862862
->end()
863863
->arrayNode('auto_mapping')
864+
->info('A collection of namespaces for which auto-mapping will be enabled.')
865+
->example([
866+
'App\\Entity\\' => [],
867+
'App\\WithSpecificLoaders\\' => ['validator.property_info_loader'],
868+
])
864869
->useAttributeAsKey('namespace')
865870
->normalizeKeys(false)
866871
->beforeNormalization()

Templating/TemplateNameParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function parse($name)
4848
}
4949

5050
// normalize name
51-
$name = str_replace(':/', ':', preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name)));
51+
$name = preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));
5252

5353
if (false !== strpos($name, '..')) {
5454
throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));

0 commit comments

Comments
 (0)