Merge branch '7.0' into 7.1

fabpot · fabpot · commit 272f021c2f19 · 2024-02-02T20:01:36.000+01:00
* 7.0:
  [Mailer] Fix usage of stream_set_timeout in case of microseconds
  [Security] Update InteractiveAuthenticatorInterface description
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php
@@ -160,7 +160,7 @@ public function initialize(): void
         }
 
         stream_set_blocking($this->stream, true);
-        stream_set_timeout($this->stream, $timeout);
+        stream_set_timeout($this->stream, (int) $timeout, (int) (($timeout - (int) $timeout) * 1000000));
         $this->in = &$this->stream;
         $this->out = &$this->stream;
     }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/InteractiveAuthenticatorInterface.php b/src/Symfony/Component/Security/Http/Authenticator/InteractiveAuthenticatorInterface.php
@@ -16,8 +16,8 @@
  * be used by interactive authenticators.
  *
  * Interactive login requires explicit user action (e.g. a login
- * form or HTTP basic authentication). Implementing this interface
- * will dispatch the InteractiveLoginEvent upon successful login.
+ * form). Implementing this interface will dispatch the InteractiveLoginEvent
+ * upon successful login.
  *
  * @author Wouter de Jong <wouter@wouterj.nl>
  */

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function initialize(): void`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`stream_set_blocking($this->stream, true);`
`163`		`- stream_set_timeout($this->stream, $timeout);`
	`163`	`+ stream_set_timeout($this->stream, (int) $timeout, (int) (($timeout - (int) $timeout) * 1000000));`
`164`	`164`	`$this->in = &$this->stream;`
`165`	`165`	`$this->out = &$this->stream;`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`* be used by interactive authenticators.`
`17`	`17`	`*`
`18`	`18`	`* Interactive login requires explicit user action (e.g. a login`
`19`		`- * form or HTTP basic authentication). Implementing this interface`
`20`		`- * will dispatch the InteractiveLoginEvent upon successful login.`
	`19`	`+ * form). Implementing this interface will dispatch the InteractiveLoginEvent`
	`20`	`+ * upon successful login.`
`21`	`21`	`*`
`22`	`22`	`* @author Wouter de Jong <[email protected]>`
`23`	`23`	`*/`