Merge branch 'PHP-7.4'

* PHP-7.4:
  set -ex on travis/compile.sh

diff --cc travis/compile.sh
index 7966ea5b6b419751052fee945227c08ba3c26961,3669643f9d04fad6d24e94887520d08aadf2a94b..dc278c2e15868a03b47a5ce329272914b2c6809d
--- 1/travis/compile.sh
--- 2/travis/compile.sh
+++ b/travis/compile.sh
@@@ -1,6 -1,7 +1,7 @@@
  #!/bin/bash
 -if [[ "$ENABLE_MAINTAINER_ZTS" == 1 ]]; then
 -      TS="--enable-maintainer-zts";
+ set -ex
 +if [[ "$ENABLE_ZTS" == 1 ]]; then
 +      TS="--enable-zts";
  else
        TS="";
  fi