Skip to content

Commit 0ce77f6

Browse files
Merge branch '4.4' into 5.0
* 4.4: (34 commits) Add test for tagged iterator with numeric index Fix container lint command when a synthetic service is used in combination with the expression language [Validator][Range] Fix typos [SecurityBundle] Minor fix in LDAP config tree builder [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle [FrameworkBundle] remove redundant PHPDoc in console Descriptor and subclass [Mime] remove phpdoc mentioning Utf8AddressEncoder Add missing phpdoc Remove int return type from FlattenException::getCode [Yaml] fix dumping strings containing CRs [DI] Fix XmlFileLoader bad error message [Form] Handle false as empty value on expanded choices [Messenger] Add ext-redis min version req to tests Tweak message improve PlaintextPasswordEncoder docBlock summary [Validator] Add two missing translations for the Arabic (ar) locale Use some PHP 5.4 constants unconditionally Add new packages on the link script [DI] fix dumping errored definitions [DI] ignore extra tags added by autoconfiguration in PriorityTaggedServiceTrait ...
2 parents bbf735c + 3abf82c commit 0ce77f6

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

DependencyInjection/Security/Factory/RememberMeFactory.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function addConfiguration(NodeDefinition $node)
141141
->end()
142142
->prototype('scalar')->end()
143143
->end()
144-
->scalarNode('catch_exceptions')->defaultTrue()->end()
144+
->booleanNode('catch_exceptions')->defaultTrue()->end()
145145
;
146146

147147
foreach ($this->options as $name => $value) {
@@ -151,6 +151,8 @@ public function addConfiguration(NodeDefinition $node)
151151
$builder->enumNode($name)->values([null, Cookie::SAMESITE_LAX, Cookie::SAMESITE_STRICT, Cookie::SAMESITE_NONE])->defaultValue($value);
152152
} elseif (\is_bool($value)) {
153153
$builder->booleanNode($name)->defaultValue($value);
154+
} elseif (\is_int($value)) {
155+
$builder->integerNode($name)->defaultValue($value);
154156
} else {
155157
$builder->scalarNode($name)->defaultValue($value);
156158
}

DependencyInjection/Security/UserProvider/LdapFactory.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ public function getKey()
4848
public function addConfiguration(NodeDefinition $node)
4949
{
5050
$node
51+
->fixXmlConfig('extra_field')
52+
->fixXmlConfig('default_role')
5153
->children()
5254
->scalarNode('service')->isRequired()->cannotBeEmpty()->defaultValue('ldap')->end()
5355
->scalarNode('base_dn')->isRequired()->cannotBeEmpty()->end()
54-
->scalarNode('search_dn')->end()
55-
->scalarNode('search_password')->end()
56+
->scalarNode('search_dn')->defaultNull()->end()
57+
->scalarNode('search_password')->defaultNull()->end()
5658
->arrayNode('extra_fields')
5759
->prototype('scalar')->end()
5860
->end()

0 commit comments

Comments
 (0)