Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable ext/sodium in CI
  Add skipif for argon2id in test

Author: nikic

.travis.yml

@@ -27,6 +27,7 @@ addons:
       - libpspell-dev
       - libsasl2-dev
       - libsqlite3-dev
+      - libsodium-dev
       - libtidy-dev
       - libwebp-dev
       - libxml2-dev

azure/apt.yml

@@ -30,6 +30,7 @@ steps:
                        libreadline-dev \
                        libldap2-dev \
                        libsasl2-dev \
+                       libsodium-dev \
                        libargon2-0-dev \
                        postgresql \
                        postgresql-contrib \

azure/configure.yml

@@ -55,6 +55,7 @@ steps:
         --with-ldap-sasl \
         --with-password-argon2 \
         --with-mhash \
+        --with-sodium \
         --enable-werror \
         --with-config-file-path=/etc \
         --with-config-file-scan-dir=/etc/php.d

azure/i386/apt.yml

@@ -40,6 +40,7 @@ steps:
                               libreadline-dev:i386 \
                               libffi-dev:i386 \
                               libfreetype6-dev:i386 \
+                              libsodium-dev:i386 \
                               postgresql \
                               postgresql-contrib \
                               ${{ parameters.packages }}

azure/i386/job.yml

@@ -62,6 +62,7 @@ jobs:
             --with-ffi \
             --enable-zend-test \
             --with-mhash \
+            --with-sodium \
             --enable-werror \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d

azure/macos/job.yml

@@ -65,6 +65,7 @@ jobs:
             --enable-zend-test \
             --enable-intl \
             --with-mhash \
+            --with-sodium \
             --enable-werror \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d

ext/sodium/tests/bug78516.phpt

@@ -3,6 +3,7 @@ Bug #78516 (password_hash(): Memory cost is not in allowed range)
 --SKIPIF--
 <?php
 if (!extension_loaded('sodium')) die('skip sodium extension not available');
+if (!defined('PASSWORD_ARGON2ID')) die('skip PASSWORD_ARGON2ID not available');
 ?>
 --FILE--
 <?php

travis/compile.sh

@@ -75,6 +75,7 @@ $TS \
 --with-kerberos \
 --enable-sysvmsg \
 --with-ffi \
+--with-sodium \
 --enable-zend-test=shared \
 --enable-werror \
 --with-pear