Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test expectations

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===

ext/imap/tests/imap_fetchbody_variation3.phpt

@@ -106,7 +106,7 @@ Create a temporary mailbox and add 1 msgs
 .. mailbox '%s.phpttest' created
 
 -- Iteration 1 --
-string(71) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1