From abff27d281e8396a27b29ae53c75ce27a619ebc7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 10 Sep 2020 10:17:23 +0200
Subject: [PATCH] Internal: Fix travis

---
 .travis.yml                   | 12 ++++++------
 tests/travis/setup-php-fpm.sh | 10 +++++-----
 tests/travis/travis-apache    |  7 -------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b8b33a8c6..013c50b371 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,10 @@ addons:
   apt:
     packages:
       - apache2
+      - php
+      - libapache2-mod-php
       - postfix
       - libappindicator1
-      - fonts-liberation
 
 services:
   - mysql
@@ -39,7 +40,7 @@ before_install:
   - php -m
   - php -ini | grep memory_limit
   # Fix travis error https://github.com/travis-ci/travis-ci/issues/8607
-  - rm -vf /etc/apt/sources.list.d/*riak*
+  - sudo rm -vf /etc/apt/sources.list.d/*riak*
   - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
   # Get Chrome driver
   - wget https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip && unzip chromedriver_linux64.zip
@@ -54,10 +55,9 @@ before_install:
   - java -jar selenium-server-standalone-3.141.59.jar -log selenium.log  > /dev/null &
 
   # Use default config
-  #- apt-get update
-  #- apt-get install php php-mysql php-xml php-gd php-intl php-soap php-bcmath
-  #- sudo apt-get install php7.3 php7.3-mysql php7.3-xml php7.3-gd php7.3-intl php7.3-soap php7.3-bcmath
-  #- sudo a2enmod rewrite actions fastcgi alias
+  #- sudo apt-get update
+  #- sudo apt-get install php php-mysql php-xml php-gd php-intl php-soap php-bcmath
+  - sudo a2enmod rewrite actions alias setenvif
 
   # Apache & php-fpm configuration
   - bash tests/travis/setup-php-fpm.sh
diff --git a/tests/travis/setup-php-fpm.sh b/tests/travis/setup-php-fpm.sh
index dcb11e147e..8202dc7785 100644
--- a/tests/travis/setup-php-fpm.sh
+++ b/tests/travis/setup-php-fpm.sh
@@ -5,10 +5,10 @@ echo "* Preparing PHP-FPM ...";
 phpenv config-rm xdebug.ini
 
 # Using default configs
-cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ]; then
-    cp -n ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf;
-fi
+#cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+#if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ]; then
+#    cp -n ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf;
+#fi
 
 # Logging
 sudo touch /var/log/php-fpm.log && sudo chmod 777 /var/log/php-fpm.log
@@ -21,4 +21,4 @@ echo "error_log = /var/log/php-fpm.log" >> ~/.phpenv/versions/$(phpenv version-n
 echo "memory_limit = 4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 # Starting PHP FPM
-~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+#~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
diff --git a/tests/travis/travis-apache b/tests/travis/travis-apache
index aa5aa8e371..e3555e8d75 100644
--- a/tests/travis/travis-apache
+++ b/tests/travis/travis-apache
@@ -8,13 +8,6 @@
         Require all granted
     </Directory>
 
-    <IfModule mod_fastcgi.c>
-        AddHandler php5-fcgi .php
-        Action php5-fcgi /php5-fcgi
-        Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-        FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-    </IfModule>
-
     <Directory /usr/lib/cgi-bin>
         Require all granted
     </Directory>