Adding support to PHP 8.1, fixing argon2 for bionic and xenial

Author: cesar-cs

.travis.yml

@@ -12,7 +12,8 @@ jobs:
       before_install:
         - sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
         - sudo apt-get update
-        - sudo apt-get -y install libcurl4-openssl-dev argon2 libargon2-0 libargon2-0-dev
+        - sudo apt-get -y install libcurl4-openssl-dev
+        - if [[ $VERSION =~ ^8.1 ]]; then sudo apt-get -y argon2 libargon2-0 libargon2-0-dev; fi
         - sudo ln -s /usr/include/x86_64-linux-gnu/curl/ /usr/local/include
         - command -v expect || sudo apt-get install expect
         - |
@@ -38,6 +39,7 @@ jobs:
         - sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
         - sudo apt-get update
         - sudo apt-get -y install libcurl4-openssl-dev
+        - if [[ $VERSION =~ ^8.1 ]]; then sudo apt-get -y argon2 libargon2-0 libargon2-0-dev; fi
         - sudo ln -s /usr/include/x86_64-linux-gnu/curl/ /usr/local/include
         - command -v expect || sudo apt-get install expect
         - |
@@ -60,6 +62,7 @@ jobs:
       before_install:
         - sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
         - sudo apt-get update
+        - if [[ $VERSION =~ ^8.1 ]]; then sudo apt-get -y argon2 libargon2-0 libargon2-0-dev; fi
         - command -v expect || sudo apt-get install expect
         - |
           if ! command -v phpenv; then

bin/install-password-argon2

@@ -19,6 +19,10 @@ make test
 make install PREFIX=$LIBARGON2_INSTALL_DIR
 popd
 
+
 # add the option in custom_configure_options
-#echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
-echo "--with-password-argon2" >> $TRAVIS_BUILD_DIR/custom_configure_options
+if [[ ! $VERSION =~ ^master$ ]] && [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
+	echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+else
+	echo "--with-password-argon2" >> $TRAVIS_BUILD_DIR/custom_configure_options
+fi