Merge remote-tracking branch 'upstream/develop' into 20230619

This commit is contained in:
Frédéric France 2023-06-19 20:25:42 +02:00
commit 7ce079a2fe
2 changed files with 20 additions and 18 deletions

View file

@ -54,7 +54,7 @@ if (empty($user->id)) {
$user->getrights();
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
$conf->global->MAIN_UMASK='666';
/**

View file

@ -176,22 +176,22 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname', SORT_ASC, 0, 1, '', 1);
foreach ($filesarray as $key => $file) {
if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/includes\//', $file['fullname'])) {
continue;
}
if (preg_match('/\/htdocs\/install\/doctemplates\/websites\//', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/install\/doctemplates\/websites\//', $file['fullname'])) {
continue;
}
if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/custom\//', $file['fullname'])) {
continue;
}
if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/dolimed/', $file['fullname'])) {
continue;
}
if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/nltechno/', $file['fullname'])) {
continue;
}
if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) {
if (preg_match('/\/(htdocs|html)\/teclib/', $file['fullname'])) {
continue;
}
@ -268,20 +268,22 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
// Check if a var_dump has been forgotten
if (!preg_match('/test\/phpunit/', $file['fullname'])) {
$ok=true;
$matches=array();
preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
//var_dump($matches);
foreach ($matches as $key => $val) {
if ($val[1] != '/' && $val[1] != '*') {
$ok=false;
if (! in_array($file['name'], array('class.nusoap_base.php'))) {
$ok=true;
$matches=array();
preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
//var_dump($matches);
foreach ($matches as $key => $val) {
if ($val[1] != '/' && $val[1] != '*') {
$ok=false;
break;
}
break;
}
break;
//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
//exit;
}
//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
//exit;
}
// Check get_class followed by __METHOD__