Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix too strict imap test expectations

Author: cmb69

ext/imap/tests/imap_fetchbody_variation6.phpt

@@ -48,5 +48,5 @@ Warning: imap_fetchbody(): Bad message number in %s on line %d
 bool(false)
 
 -- $msg_no is 1 --
-string(42) "1: this is a test message, please ignore
-"
+string(%s) "1: this is a test message, please ignore
+%S"

ext/imap/tests/imap_fetchheader_variation5.phpt

@@ -51,7 +51,7 @@ bool(false)
 -- $msg_no is 1 --
 string(%d) "From: [email protected]
 Subject: Test msg 1
-To: [email protected]
+To: %s
 MIME-Version: 1.0
 Content-Type: MULTIPART/mixed; BOUNDARY="%s=:%d"