Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit 136bde3a52ff · 2024-11-27T13:22:38.000+01:00
* 7.2:
  [HttpClient] Fix primary_ip info when using amphp/http-client v5
  [Form] Allow integer for the `calendar` option of `DateType`
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -313,7 +313,7 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setAllowedTypes('months', 'array');
         $resolver->setAllowedTypes('days', 'array');
         $resolver->setAllowedTypes('input_format', 'string');
-        $resolver->setAllowedTypes('calendar', ['null', \IntlCalendar::class]);
+        $resolver->setAllowedTypes('calendar', ['null', 'int', \IntlCalendar::class]);
 
         $resolver->setInfo('calendar', 'The calendar to use for formatting and parsing the date. The value should be an instance of \IntlCalendar. By default, the Gregorian calendar with the default locale is used.');
 
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpListenerV5.php b/src/Symfony/Component/HttpClient/Internal/AmpListenerV5.php
@@ -66,7 +66,7 @@ public function connectionAcquired(Request $request, Connection $connection, int
 
     public function requestHeaderStart(Request $request, Stream $stream): void
     {
-        $host = $stream->getRemoteAddress()->toString();
+        $host = $stream->getRemoteAddress()->getAddress();
         $this->info['primary_ip'] = $host;
 
         if (str_contains($host, ':')) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function connectionAcquired(Request $request, Connection $connection, int`
`66`	`66`
`67`	`67`	`public function requestHeaderStart(Request $request, Stream $stream): void`
`68`	`68`	`{`
`69`		`- $host = $stream->getRemoteAddress()->toString();`
	`69`	`+ $host = $stream->getRemoteAddress()->getAddress();`
`70`	`70`	`$this->info['primary_ip'] = $host;`
`71`	`71`
`72`	`72`	`if (str_contains($host, ':')) {`