Merge branch '6.4' into 7.0

fabpot · fabpot · commit 1854c09817cf · 2024-02-02T20:00:25.000+01:00
* 6.4:
  [Mailer] Fix usage of stream_set_timeout in case of microseconds
  [Security] Update InteractiveAuthenticatorInterface description
diff --git a/Authenticator/InteractiveAuthenticatorInterface.php b/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
`@@ -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`	`*/`