Merge branch 'PHP-7.4'

configure.ac

@@ -1090,6 +1090,12 @@ else
   AC_MSG_RESULT([using system default])
 fi
 
+PHP_ARG_ENABLE([werror],,
+  [AS_HELP_STRING([--enable-werror],
+    [Enable -Werror])],
+  [no],
+  [no])
+
 dnl Extension configuration.
 dnl -------------------------------------------------------------------------
 
@@ -1462,6 +1468,11 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
   CPPFLAGS="$CPPFLAGS -DTHREAD=1"
 fi
 
+if test "$PHP_WERROR" = "yes"; then
+  CFLAGS="$CFLAGS -Werror"
+  CPPFLAGS="$CPPFLAGS -Werror"
+fi
+
 ZEND_EXT_TYPE="zend_extension"
 PHP_SUBST(ZEND_EXT_TYPE)
 

travis/compile.sh

@@ -74,6 +74,7 @@ $TS \
 --with-kerberos \
 --enable-sysvmsg \
 --enable-zend-test=shared \
+--enable-werror \
 > "$CONFIG_LOG_FILE"
 
 make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"