diff --git a/.travis.yml b/.travis.yml index 7bf1a512757..597b7ee4d4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,9 @@ before_install: if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 fi + if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then + sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 + fi if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1 fi @@ -106,6 +109,9 @@ before_install: install: - | + if [ "$TRAVIS_PHP_VERSION" = '7.0' ]; then + sudo update-alternatives --set php /usr/bin/php7.0 + fi if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo update-alternatives --set php /usr/bin/php7.1 fi diff --git a/ChangeLog b/ChangeLog index 30393ca3baf..5dd29b7d23f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -677,7 +677,7 @@ Note that to find all the parameters that are encrypted into the setup database, ***** ChangeLog for 17.0.4 compared to 17.0.3 ***** -FIX: $this->newref already exists and could have been modified by trigger but we still use a local variable for the filesystem-based renaming +FIX: $this->newref already exists and could have been modified by a trigger but we still use a local variable for the filesystem-based renaming FIX: 16.0 only, backport fix for SQL error on global search product FIX: 17.0: deprecated field should only be a fallback FIX: 17.0 PHP8: supplier invoice class: