Skip to content

Commit f664344

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Bump Symfony version to 5.2.6 Update VERSION for 5.2.5 Update CHANGELOG for 5.2.5 Update translations for Norwegian Nynorsk (nn) #38756 Fix eventListener initialization when eventSubscriber constructor dispatch an event [FrameworkBundle] fix XSD clear unchecked choice radio boxes even if clear missing is set to false Fix `ConstraintViolation#getPropertyPath()` to always return `string` [ErrorHandler] Added missing type annotations to FlattenException [TwigBridge] Allow version 3 of the Twig extra packages Fix FrameworkBundle PropertyAccess definition when not in debug
2 parents 63854e0 + 854bc9b commit f664344

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,7 +2095,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
20952095

20962096
if (!$container->getParameter('kernel.debug')) {
20972097
$propertyAccessDefinition->setFactory([PropertyAccessor::class, 'createCache']);
2098-
$propertyAccessDefinition->setArguments([null, 0, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
2098+
$propertyAccessDefinition->setArguments(['', 0, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
20992099
$propertyAccessDefinition->addTag('cache.pool', ['clearer' => 'cache.system_clearer']);
21002100
$propertyAccessDefinition->addTag('monolog.logger', ['channel' => 'cache']);
21012101
} else {

Resources/config/schema/symfony-1.0.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
174174
<xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
175175
<xsd:element name="enabled-locale" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
176-
<xsd:element name="pseudo_localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
176+
<xsd:element name="pseudo-localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
177177
</xsd:sequence>
178178
<xsd:attribute name="enabled" type="xsd:boolean" />
179179
<xsd:attribute name="fallback" type="xsd:string" />
@@ -184,7 +184,7 @@
184184

185185
<xsd:complexType name="pseudo_localization">
186186
<xsd:sequence>
187-
<xsd:element name="localizable_html_attribute" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
187+
<xsd:element name="localizable-html-attribute" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
188188
</xsd:sequence>
189189
<xsd:attribute name="enabled" type="xsd:boolean" />
190190
<xsd:attribute name="accents" type="xsd:boolean" />

0 commit comments

Comments
 (0)