diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-24 12:41:49 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-24 12:41:49 +0100 |
| commit | 7fc29c992407c7e5868e5389bd98815e0ee52f67 (patch) | |
| tree | 0a60e49f11a33d196c7066f07f8f5be593f87f8e | |
| parent | f69bad872a0a82482b668169e41d545d1493d583 (diff) | |
| parent | 2d15845ae11cfcbf14debcb1f7b480499de66185 (diff) | |
| download | php-git-7fc29c992407c7e5868e5389bd98815e0ee52f67.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable ext/sodium in CI
Add skipif for argon2id in test
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | azure/apt.yml | 1 | ||||
| -rw-r--r-- | azure/configure.yml | 1 | ||||
| -rw-r--r-- | azure/i386/apt.yml | 1 | ||||
| -rw-r--r-- | azure/i386/job.yml | 1 | ||||
| -rw-r--r-- | azure/macos/job.yml | 1 | ||||
| -rw-r--r-- | ext/sodium/tests/bug78516.phpt | 1 | ||||
| -rwxr-xr-x | travis/compile.sh | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 5d3f4c0e6d..a3dd87ca00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ addons: - libpspell-dev - libsasl2-dev - libsqlite3-dev + - libsodium-dev - libtidy-dev - libwebp-dev - libxml2-dev diff --git a/azure/apt.yml b/azure/apt.yml index 3019d82379..2beb625f62 100644 --- a/azure/apt.yml +++ b/azure/apt.yml @@ -30,6 +30,7 @@ steps: libreadline-dev \ libldap2-dev \ libsasl2-dev \ + libsodium-dev \ libargon2-0-dev \ postgresql \ postgresql-contrib \ diff --git a/azure/configure.yml b/azure/configure.yml index 9de67ae13f..1d3374bfa0 100644 --- a/azure/configure.yml +++ b/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 diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml index 9342df35e4..022bf96f30 100644 --- a/azure/i386/apt.yml +++ b/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 }} diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 6845a50b45..354d213aa4 100644 --- a/azure/i386/job.yml +++ b/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 diff --git a/azure/macos/job.yml b/azure/macos/job.yml index 7fa9de5188..258e7e7068 100644 --- a/azure/macos/job.yml +++ b/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 diff --git a/ext/sodium/tests/bug78516.phpt b/ext/sodium/tests/bug78516.phpt index 524b233518..0347d33273 100644 --- a/ext/sodium/tests/bug78516.phpt +++ b/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 diff --git a/travis/compile.sh b/travis/compile.sh index a3d3e62578..c1cc3aa04e 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -75,6 +75,7 @@ $TS \ --with-kerberos \ --enable-sysvmsg \ --with-ffi \ +--with-sodium \ --enable-zend-test=shared \ --enable-werror \ --with-pear |