From 92f81059dddf01d7adad00a6bb0dc9f506a1c6b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2023 02:51:59 +0200
Subject: [PATCH] Test CI

---
 .github/workflows/php-cs.yml    |  6 +++---
 .github/workflows/php-mysql.yml | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php-cs.yml b/.github/workflows/php-cs.yml
index df68582fd70..6cfb2d6cee6 100644
--- a/.github/workflows/php-cs.yml
+++ b/.github/workflows/php-cs.yml
@@ -80,7 +80,7 @@ jobs:
         
     - name: lint
       run: |
-        parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+        htdocs/includes/bin/parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
           --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
           --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
           --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
@@ -88,9 +88,9 @@ jobs:
 
     - name: phpcs
       run: |
-         phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;     
+         htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;     
 
     - name: var-dump-check
       run: |
-        var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
+        htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
 
diff --git a/.github/workflows/php-mysql.yml b/.github/workflows/php-mysql.yml
index 5c616e85773..badc69bc832 100644
--- a/.github/workflows/php-mysql.yml
+++ b/.github/workflows/php-mysql.yml
@@ -107,19 +107,20 @@ jobs:
       run: |
         echo "Setting up Apache + FPM"
         # setup link for php legacy
-        sudo ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/php /bin/php
+        #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 php-intl 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
-        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
+        #sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+        #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
         sudo a2enmod proxy_fcgi rewrite setenvif cgi alias
-        echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+        #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
         # start php-fpm
-        ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+        #~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
         # configure apache virtual hosts
+        ls /etc/apache2/sites-available
         sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
         sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
         sudo cat /etc/apache2/sites-available/000-default.conf