Merge branch 'PHP-7.4'

diff --cc ext/zlib/tests/gzopen_variation4.phpt
Simple merge

diff --cc scripts/dev/bless_tests.php
index 6885d1782c518c89ab8639b462ada154b6c4fafc,190ebfb86a6ac5a4fcc120c58c0928e40bf567d0..25a4843c073651ed5ebe332a4949926094685ced
--- 1/scripts/dev/bless_tests.php
--- 2/scripts/dev/bless_tests.php
+++ b/scripts/dev/bless_tests.php
@@@ -53,7 -53,7 +53,8 @@@ function normalizeOutput(string $out): 
      $out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out);
      $out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out);
      $out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out);
 +    $out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out);
+     $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out);
      return $out;
  }