Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix too strict imap test expectations

Author: cmb69

ext/imap/tests/bug77020.phpt

@@ -11,5 +11,5 @@ imap_mail('1', 1, NULL);
 ===DONE===
 --EXPECTF--
 Warning: imap_mail(): No message string in mail command in %s on line %d
-%s
+%A
 ===DONE===