Skip to content

Commit 6baac52

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: 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 mark the LazyIterator class as internal fix extracting mixed type-hinted property types keep valid submitted choices when additional choices are submitted
2 parents 4dae8f5 + c8e4a78 commit 6baac52

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
@@ -1446,7 +1446,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
14461446
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
14471447
->end()
14481448
->booleanNode('verify_peer')
1449-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1449+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
14501450
->end()
14511451
->booleanNode('verify_host')
14521452
->info('Indicates if the host should exist as a certificate common name.')
@@ -1589,7 +1589,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
15891589
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
15901590
->end()
15911591
->booleanNode('verify_peer')
1592-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1592+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
15931593
->end()
15941594
->booleanNode('verify_host')
15951595
->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)