Skip to content

Commit 1f51694

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Workflow] Re-add InvalidTokenConfigurationException for BC Fix PHP 8.1 null values [Console] Fix PHP 8.1 null error for preg_match flag Fix: Article Definition::removeMethodCall should remove all matching calls [HttpFoundation] Fix typo in exception message mark the LazyIterator class as internal fix extracting mixed type-hinted property types [Worflow] Fixed GuardListener when using the new Security system keep valid submitted choices when additional choices are submitted
2 parents 5b3d8fe + 6baac52 commit 1f51694

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

DependencyInjection/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
14721472
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
14731473
->end()
14741474
->booleanNode('verify_peer')
1475-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1475+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
14761476
->end()
14771477
->booleanNode('verify_host')
14781478
->info('Indicates if the host should exist as a certificate common name.')
@@ -1615,7 +1615,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
16151615
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
16161616
->end()
16171617
->booleanNode('verify_peer')
1618-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1618+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
16191619
->end()
16201620
->booleanNode('verify_host')
16211621
->info('Indicates if the host should exist as a certificate common name.')

Resources/config/form.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@
9797
->tag('form.type')
9898

9999
->set('form.type.choice', ChoiceType::class)
100-
->args([service('form.choice_list_factory')])
100+
->args([
101+
service('form.choice_list_factory'),
102+
service('translator')->ignoreOnInvalid(),
103+
])
101104
->tag('form.type')
102105

103106
->set('form.type.file', FileType::class)

0 commit comments

Comments
 (0)