From d37e1f61ba7b35afea5281458359f5cb0a9b416d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Sep 2022 18:42:43 +0200
Subject: [PATCH] Prepare for php 7.0

---
 .travis.yml | 67 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 637ba35995b..167b88cdebd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,8 @@
 
 # We use dist: xenial to have php 5.6+ available
 os: linux
-dist: xenial
-#dist: bionic
+#dist: xenial
+dist: bionic
 
 language: php
 
@@ -18,19 +18,34 @@ services:
 - mysql
 - postgresql
 
+
+before_install:
+- |
+  echo "Add ondrej PPA"
+  sudo add-apt-repository -y ppa:ondrej/php
+  sudo apt-get update
+  echo "Disabling Xdebug for composer"
+  export PHP_VERSION_NAME=$(phpenv version-name)
+  echo $PHP_VERSION_NAME
+  ls ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
+  phpenv config-rm xdebug.ini
+  phpenv rehash
+  phpenv config-add mysqli
+  echo
+
 addons:
-  # Force postgresql to 9.4 (the oldest availablable on xenial)
-  postgresql: '9.4'
+  # Force postgresql version
+  postgresql: '10'
   apt:
     sources:
     # To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/
     - pgdg-xenial
+    - sourceline: 'ppa:ondrej/php'
     packages:
     # We need a webserver to test the webservices
     # Let's install Apache with.
     - apache2
-    # mod_php is not supported by Travis. Add fcgi. We install FPM later on.
-    - libapache2-mod-fastcgi
     # We need pgloader for import mysql database into pgsql
     - pgloader
 
@@ -44,11 +59,11 @@ jobs:
   #allow_failures:
   #- php: nightly
   include:
-    - stage: PHP 5.6-7.4
+    - stage: PHP 7.0-7.4
       if: type = push
-      php: '5.6'
+      php: '7.0'
       env: DB=postgresql
-    - stage: PHP 5.6-7.4
+    - stage: PHP 7.0-7.4
       if: type = pull_request OR type = push
       php: '7.4.22'
       env: DB=mysql
@@ -57,7 +72,7 @@ jobs:
       php: nightly
       env: DB=mysql
     - stage: PHP Dev
-      if: type = push AND branch = 15.0
+      if: type = push AND branch = 17.0
       php: nightly
       env: DB=mysql
 
@@ -72,13 +87,6 @@ notifications:
     on_failure: always
     use_notice: true
 
-before_install:
-- |
-  echo "Disabling Xdebug for composer"
-  export PHP_VERSION_NAME=$(phpenv version-name)
-  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
-  phpenv config-rm xdebug.ini
-  echo
 
 install:
 - |
@@ -94,13 +102,6 @@ install:
 
 - |
   echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
-    composer -n require phpunit/phpunit ^5 \
-                        php-parallel-lint/php-parallel-lint ^1 \
-                        php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
-                        squizlabs/php_codesniffer ^3
-  fi
   if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
     composer -n require phpunit/phpunit ^6 \
                         php-parallel-lint/php-parallel-lint ^1 \
@@ -246,6 +247,10 @@ before_script:
 
 
   - echo "Setting up Apache + FPM"
+  # setup link for php legacy
+  - sudo ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/php /bin/php
+  # install apache web server
+  - sudo apt-get install apache2 php-fpm php-mysql php-pgsql php-gd php-ldap php-xml php-mbstring libapache2-mod-php
   # enable php-fpm
   - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
   - |
@@ -253,10 +258,11 @@ before_script:
       # Copy the included pool
       sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
     fi
-  - sudo a2enmod rewrite actions fastcgi alias
+  - sudo a2enmod proxy_fcgi rewrite setenvif cgi alias
   - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
-  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
+  #- sudo chown -R travis:travis /var/lib/apache2/fastcgi
+  # start php-fpm
   - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
   # configure apache virtual hosts
   - sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
@@ -471,6 +477,9 @@ after_script:
   ls $TRAVIS_BUILD_DIR/documents
   #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
   sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
+  echo "After script - Output last lines of apache error.log"
+  ls /var/log/apache2
+  sudo tail -n 50 /var/log/apache2/travis_error_log
 
 after_success:
 - |
@@ -479,14 +488,14 @@ after_success:
 after_failure:
 - |
   echo Failure detected, so we show samples of log to help diagnose
-  # This part of code is executed only if previous command that fails are enclosed with set +e
-  # Upgrade log files
+  # This part of code is executed only if the command that fails are enclosed with set +e
+  # Show upgrade log files
   for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
   do
     echo "Debugging informations for file $ficlog"
     #cat $ficlog
   done
-  # Apache log file
+  # Show Apache log file
   echo "Debugging informations for file apache error.log"
   sudo cat /var/log/apache2/travis_error_log
   if [ "$DEBUG" = true ]; then