From e74ed60d0caed2662403adc0e61d358ab06fd337 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Jan 2024 13:14:52 +0100 Subject: [PATCH] Try to merge phpstan.neon and phpstan_action.neon --- build/phpstan/README | 14 ++++-- build/phpstan/bootstrap.php | 2 +- build/phpstan/bootstrap_action.php | 15 ++++-- phpstan.neon | 47 +++++++------------ test/acceptance/README.md | 2 +- .../acceptance/nightwatch.conf.js | 0 6 files changed, 39 insertions(+), 41 deletions(-) rename nightwatch.conf.js => test/acceptance/nightwatch.conf.js (100%) diff --git a/build/phpstan/README b/build/phpstan/README index 9df049e5526..8acee2767f5 100644 --- a/build/phpstan/README +++ b/build/phpstan/README @@ -5,18 +5,22 @@ PHPStan requires PHP >= 7.1 Config File is: ./phpstan.neon -In dolibarr/build/phpstan += Installation = + +cd ./build/phpstan mkdir phpstan cd phpstan composer require --dev phpstan/phpstan -Build report from CLI: + += Build report from CLI = + In dolibarr/ mv htdocs/custom /tmp/ -php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class -php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/ +php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon --memory-limit 4G --error-format=table htdocs/commande/class +php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon --memory-limit 4G --error-format=table htdocs/ mv /tmp/custom htdocs Build HTML report from Cron: Example of line to add into a cron to generate a HTML report: -0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"
" } { print $0"
" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html +0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"
" } { print $0"
" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html diff --git a/build/phpstan/bootstrap.php b/build/phpstan/bootstrap.php index b0cb9f90ef0..8538401f4aa 100644 --- a/build/phpstan/bootstrap.php +++ b/build/phpstan/bootstrap.php @@ -16,5 +16,5 @@ if (!defined("NOHTTPSREDIRECT")) { define("NOHTTPSREDIRECT", '1'); } -global $conf, $langs, $user, $db; +global $conf, $db, $langs, $user; include_once __DIR__ . '/../../htdocs/main.inc.php'; diff --git a/build/phpstan/bootstrap_action.php b/build/phpstan/bootstrap_action.php index e40a132ead3..1d39c7377f5 100644 --- a/build/phpstan/bootstrap_action.php +++ b/build/phpstan/bootstrap_action.php @@ -1,5 +1,16 @@