Update qodana rules

This commit is contained in:
Laurent Destailleur
2023-04-30 03:57:10 +02:00
parent 382f45ec14
commit fd3ec20f36
8 changed files with 99 additions and 71 deletions

View File

@@ -149,7 +149,7 @@ if (GETPOST('addfilter', 'alpha')) {
if ($result > 0) { if ($result > 0) {
$object->fetchFilters(); $object->fetchFilters();
} else { } else {
setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors'); setEventMessages($emailcollectorfilter->error, $emailcollectorfilter->errors, 'errors');
} }
} }
@@ -161,7 +161,7 @@ if ($action == 'deletefilter') {
if ($result > 0) { if ($result > 0) {
$object->fetchFilters(); $object->fetchFilters();
} else { } else {
setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors'); setEventMessages($emailcollectorfilter->error, $emailcollectorfilter->errors, 'errors');
} }
} }
} }
@@ -192,7 +192,7 @@ if (GETPOST('addoperation', 'alpha')) {
$object->fetchActions(); $object->fetchActions();
} else { } else {
$error++; $error++;
setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors');
} }
} }
} }
@@ -216,7 +216,7 @@ if ($action == 'updateoperation') {
$object->fetchActions(); $object->fetchActions();
} else { } else {
$error++; $error++;
setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors');
} }
} }
} }
@@ -228,7 +228,7 @@ if ($action == 'deleteoperation') {
if ($result > 0) { if ($result > 0) {
$object->fetchActions(); $object->fetchActions();
} else { } else {
setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors');
} }
} }
} }
@@ -242,7 +242,7 @@ if ($action == 'collecttest') {
setEventMessages($object->lastresult, null, 'mesgs'); setEventMessages($object->lastresult, null, 'mesgs');
} else { } else {
$debuginfo = $object->debuginfo; $debuginfo = $object->debuginfo;
setEventMessages($object->error, null, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
$action = ''; $action = '';
@@ -257,7 +257,7 @@ if ($action == 'confirm_collect') {
setEventMessages($object->lastresult, null, 'mesgs'); setEventMessages($object->lastresult, null, 'mesgs');
} else { } else {
$debuginfo = $object->debuginfo; $debuginfo = $object->debuginfo;
setEventMessages($object->error, null, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
$action = ''; $action = '';

View File

@@ -5651,7 +5651,7 @@ class Form
* @param int $page Page * @param int $page Page
* @param string $selected Id condition pre-selectionne * @param string $selected Id condition pre-selectionne
* @param string $htmlname Name of select html field * @param string $htmlname Name of select html field
* @param int $addempty Ajoute entree vide * @param int $addempty Add an empty entry
* @return void * @return void
*/ */
public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0) public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)

View File

@@ -1104,7 +1104,7 @@ class FormFile
* This also sync database if $upload_dir is defined. * This also sync database if $upload_dir is defined.
* *
* @param array $filearray Array of files loaded by dol_dir_list('files') function before calling this. * @param array $filearray Array of files loaded by dol_dir_list('files') function before calling this.
* @param Object $object Object on which document is linked to. * @param Object|null $object Object on which document is linked to.
* @param string $modulepart Value for modulepart used by download or viewimage wrapper. * @param string $modulepart Value for modulepart used by download or viewimage wrapper.
* @param string $param Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd) * @param string $param Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
* @param int $forcedownload Force to open dialog box "Save As" when clicking on file. * @param int $forcedownload Force to open dialog box "Save As" when clicking on file.

View File

@@ -69,6 +69,9 @@ class Ldap
* Server DN * Server DN
*/ */
public $domain; public $domain;
public $domainFQDN;
/** /**
* User administrateur Ldap * User administrateur Ldap
* Active Directory ne supporte pas les connexions anonymes * Active Directory ne supporte pas les connexions anonymes

View File

@@ -1147,9 +1147,9 @@ function dolroundjs(number, decimals) { return +(Math.round(number + "e+" + deci
* *
*/ */
function pricejs(amount, mode = 'MT', currency_code = '', force_locale = '') { function pricejs(amount, mode = 'MT', currency_code = '', force_locale = '') {
var main_max_dec_shown = <?php echo (int) str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>; var main_max_dec_shown = <?php echo (int) str_replace('.', '', getDolGlobalInt('MAIN_MAX_DECIMALS_SHOWN')); ?>;
var main_rounding_unit = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_UNIT; ?>; var main_rounding_unit = <?php echo (int) getDolGlobalInt('MAIN_MAX_DECIMALS_UNIT'); ?>;
var main_rounding_tot = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_TOT; ?>; var main_rounding_tot = <?php echo (int) getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'); ?>;
var main_decimal_separator = <?php echo json_encode($dec) ?>; var main_decimal_separator = <?php echo json_encode($dec) ?>;
var main_thousand_separator = <?php echo json_encode($thousand) ?>; var main_thousand_separator = <?php echo json_encode($thousand) ?>;
var locale_code = force_locale || <?php echo json_encode($langs->defaultlang) ?>; var locale_code = force_locale || <?php echo json_encode($langs->defaultlang) ?>;
@@ -1225,9 +1225,9 @@ function price2numjs(amount) {
var dec = <?php echo json_encode($dec) ?>; var dec = <?php echo json_encode($dec) ?>;
var thousand = <?php echo json_encode($thousand) ?>; var thousand = <?php echo json_encode($thousand) ?>;
var main_max_dec_shown = <?php echo (int) str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>; var main_max_dec_shown = <?php echo (int) str_replace('.', '', getDolGlobalInt('MAIN_MAX_DECIMALS_SHOWN')); ?>;
var main_rounding_unit = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_UNIT; ?>; var main_rounding_unit = <?php echo (int) getDolGlobalInt('MAIN_MAX_DECIMALS_UNIT'); ?>;
var main_rounding_tot = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_TOT; ?>; var main_rounding_tot = <?php echo (int) getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'); ?>;
var amount = amount.toString(); var amount = amount.toString();

View File

@@ -68,6 +68,9 @@ class Don extends CommonObject
*/ */
public $date; public $date;
public $datec;
public $datem;
/** /**
* amount of donation * amount of donation
* @var double * @var double
@@ -104,6 +107,9 @@ class Don extends CommonObject
*/ */
public $email; public $email;
public $phone;
public $phone_mobile;
/** /**
* @var int 0 or 1 * @var int 0 or 1
*/ */
@@ -127,6 +133,9 @@ class Don extends CommonObject
*/ */
public $modepaymentid = 0; public $modepaymentid = 0;
public $paid;
/** /**
* @var array Array of status label * @var array Array of status label
*/ */

View File

@@ -3494,6 +3494,12 @@ class SupplierInvoiceLine extends CommonObjectLine
*/ */
public $remise_percent; public $remise_percent;
/**
* Buying price value
* @var float
*/
public $pa_ht;
/** /**
* Total amount without taxes * Total amount without taxes
* @var float * @var float

View File

@@ -93,4 +93,14 @@ exclude:
- name: PhpRedundantVariableDocTypeInspection - name: PhpRedundantVariableDocTypeInspection
- name: PhpUnhandledExceptionInspection - name: PhpUnhandledExceptionInspection
- name: JSIgnoredPromiseFromCall - name: JSIgnoredPromiseFromCall
- name: DuplicatedCode
- name: BadExpressionStatementJS
- name: PhpRedundantCatchClauseInspection
- name: PhpIssetCanCheckNestedAccessDirectlyInspection
- name: JSEqualityComparisonWithCoercion
- name: JSUnusedAssignment
- name: JSHint
- name: ReservedWordUsedAsNameJS
- name: JSUnusedLocalSymbols