Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 47cfaeba096e · 2023-05-29T14:46:33.000+02:00
* 5.4:
  Fix Typos
  Bump Symfony version to 5.4.25
  Update CONTRIBUTORS for 5.4.24
  Update VERSION for 5.4.24
  Update CHANGELOG for 5.4.24
diff --git a/Transport/Smtp/Stream/SocketStream.php b/Transport/Smtp/Stream/SocketStream.php
@@ -145,7 +145,7 @@ public function initialize(): void
         if ($this->streamContextOptions) {
             $options = array_merge($options, $this->streamContextOptions);
         }
-        // do it unconditionnally as it will be used by STARTTLS as well if supported
+        // do it unconditionally as it will be used by STARTTLS as well if supported
         $options['ssl']['crypto_method'] ??= \STREAM_CRYPTO_METHOD_TLS_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         $streamContext = stream_context_create($options);
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function initialize(): void`
`145`	`145`	`if ($this->streamContextOptions) {`
`146`	`146`	`$options = array_merge($options, $this->streamContextOptions);`
`147`	`147`	`}`
`148`		`- // do it unconditionnally as it will be used by STARTTLS as well if supported`
	`148`	`+ // do it unconditionally as it will be used by STARTTLS as well if supported`
`149`	`149`	`$options['ssl']['crypto_method'] ??= \STREAM_CRYPTO_METHOD_TLS_CLIENT \| \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT \| \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;`
`150`	`150`	`$streamContext = stream_context_create($options);`
`151`	`151`