Merge branch 'PHP-7.4'

Author: nikic

azure/macos/brew.yml

@@ -2,6 +2,8 @@ parameters:
   packages: ''
 
 steps:
+  - script: brew update
+    displayName: 'Update Homebrew'
   - script: |
       brew install pkg-config \
                    autoconf \
@@ -23,11 +25,12 @@ steps:
                    zlib \
                    t1lib \
                    gd \
-                   libzip \
                    gmp \
                    tidyp \
                    libxml2 \
                    libxslt \
                    postgresql
+      # Make sure we don't get broken libzip 1.7.0
+      brew upgrade libzip
       brew link icu4c gettext --force
     displayName: 'Install Build Dependencies'

ext/zip/config.m4

@@ -4,7 +4,7 @@ PHP_ARG_WITH([zip],
     [Include Zip read/write support])])
 
 if test "$PHP_ZIP" != "no"; then
-  PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11])
+  PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0])
 
   PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
   PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)