From 53cf9f0bf16440f7722e91dcfef365e5f1a17d3a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jul 2025 00:40:19 +0200 Subject: [PATCH 1/2] Doc --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 662cddbba6d..13fda4c97a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ English Dolibarr ChangeLog ***** 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: From 8927d1260a32d210aa32713e3ace769ab2c4e885 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 9 Jul 2025 15:27:28 +0200 Subject: [PATCH 2/2] Fix travis --- .travis.yml | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index eac04b41ab4..96aac710de6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ # from Dolibarr GitHub repository. # For syntax, see https://docs.travis-ci.com/user/languages/php/ -# We use dist: bionic = 18.04, focal = 20.04 +# We use dist: focal = 20.04, jammy = 22.04 os: linux -dist: focal +dist: jammy language: generic @@ -21,7 +21,7 @@ services: addons: - mariadb: '10.5' + mariadb: '10.6' env: @@ -36,10 +36,10 @@ jobs: include: - stage: PHP 7.0-8.1 if: type = push - php: '7.0' + php: '7.1' env: - DB=postgresql - - TRAVIS_PHP_VERSION=7.0 + - TRAVIS_PHP_VERSION=7.1 - stage: PHP 7.0-8.1 if: type = pull_request OR type = push php: '8.1' @@ -78,6 +78,9 @@ before_install: if [ "$TRAVIS_PHP_VERSION" = '7.0' ]; then sudo apt install unzip apache2 php7.0 php7.0-cli php7.0-curl php7.0-mysql php7.0-pgsql php7.0-gd php7.0-imap php7.0-intl php7.0-ldap php7.0-xml php7.0-mbstring php7.0-xml php7.0-zip libapache2-mod-php7.0 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 @@ -108,6 +111,9 @@ 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 if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo update-alternatives --set php /usr/bin/php8.1 @@ -123,7 +129,8 @@ install: sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer sudo chmod -R a+rwx /usr/local/bin/composer composer -V - composer -n config -g vendor-dir htdocs/includes + sudo composer -n config -g vendor-dir htdocs/includes + sudo chmod -R a+rwx /home/travis/.config/composer echo - | @@ -201,8 +208,8 @@ before_script: phpcs -i | head - # Check PHP Vardump check version echo "PHP Vardump check version" - which var_dump_check - var_dump_check --version + which var-dump-check + var-dump-check --version # Check PHPUnit version echo "PHPUnit version" which phpunit @@ -253,8 +260,8 @@ before_script: echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' - echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' - echo '\d llx_c_country' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' + #echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' + #echo '\d llx_c_country' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' # Create pgsql compatibility functions psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' < htdocs/install/pgsql/functions/functions.sql @@ -472,11 +479,9 @@ script: echo "Unit testing" # Ensure we catch errors with -e. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file. set -e - if [ "$TRAVIS_PHP_VERSION" != '7.0' ]; then - phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php - phpunitresult=$? - echo "Phpunit return code = $phpunitresult" - fi + phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php + phpunitresult=$? + echo "Phpunit return code = $phpunitresult" set +e after_script: