Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 553f50487389 · 2022-01-26T17:28:35.000+01:00
* 5.3:
  Fix Choice constraint with associative choices array
  [Form] UrlType should not add protocol to emails
  Silence isatty warnings during tty detection
  [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false
  [Notifier] Fix encoding of messages with FreeMobileTransport
  [Cache] workaround PHP crash
  [Console] Fix PHP 8.1 deprecation in ChoiceQuestion
  [Notifier] smsapi-notifier - correct encoding
  Replaced full CoC text with link to documentation
  Making the parser stateless
  [Console] fix restoring stty mode on CTRL+C
  fix merge (bis)
  fix merge
  [Process] Avoid calling fclose on an already closed resource
  [GHA] test tty group
  [DI] Fix tests on PHP 7.1
diff --git a/Pipes/AbstractPipes.php b/Pipes/AbstractPipes.php
@@ -47,7 +47,9 @@ public function __construct($input)
     public function close()
     {
         foreach ($this->pipes as $pipe) {
-            fclose($pipe);
+            if (\is_resource($pipe)) {
+                fclose($pipe);
+            }
         }
         $this->pipes = [];
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,9 @@ public function __construct($input)`
`47`	`47`	`public function close()`
`48`	`48`	`{`
`49`	`49`	`foreach ($this->pipes as $pipe) {`
`50`		`- fclose($pipe);`
	`50`	`+ if (\is_resource($pipe)) {`
	`51`	`+ fclose($pipe);`
	`52`	`+ }`
`51`	`53`	`}`
`52`	`54`	`$this->pipes = [];`
`53`	`55`	`}`