Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 788a28d79238 · 2022-06-27T19:24:16.000+02:00
* 6.0:
  CS fixes
  Bump Symfony version to 6.0.11
  Update VERSION for 6.0.10
  Update CHANGELOG for 6.0.10
  Bump Symfony version to 5.4.11
  Update VERSION for 5.4.10
  Update CHANGELOG for 5.4.10
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/Adapter/ExtLdap/Connection.php b/Adapter/ExtLdap/Connection.php
@@ -133,7 +133,7 @@ protected function configureOptions(OptionsResolver $resolver)
             }
 
             if (!isset($parent['network_timeout'])) {
-                $options->setDefault('network_timeout', ini_get('default_socket_timeout'));
+                $options->setDefault('network_timeout', \ini_get('default_socket_timeout'));
             }
 
             $options->setDefaults([

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ protected function configureOptions(OptionsResolver $resolver)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`if (!isset($parent['network_timeout'])) {`
`136`		`- $options->setDefault('network_timeout', ini_get('default_socket_timeout'));`
	`136`	`+ $options->setDefault('network_timeout', \ini_get('default_socket_timeout'));`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$options->setDefaults([`