diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt index 047de65a4a87b..ad8c0ecf6173f 100644 --- a/dev/tools/codespell/codespell-dict.txt +++ b/dev/tools/codespell/codespell-dict.txt @@ -15,6 +15,7 @@ dolibar->dolibarr dolibarrr->dolibarr dollibar->dolibarr dollibarr->dolibarr +extrafeild->extrafield thoose->those # fiche->card mot de passe->password diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index 5de8de7375475..0d14ae43f2d50 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -270,7 +270,7 @@ 'langs' => '\Translate', 'leftmenu' => 'string', 'mainmenu' => 'string', - 'menumanager' => 'string', + 'menumanager' => '\MenuManager', 'mysoc' => '\Societe', 'nblines' => '\int', 'obj' => '\CommonObject', // Deprecated @@ -483,7 +483,7 @@ // 'PhanTypeInvalidRightOperandOfAdd', // 'PhanPluginDescriptionlessCommentOnPrivateProperty', // 'PhanUndeclaredVariableDim', // Array initialisation on undeclared var: $abc['x']='ab' - 'PhanTypeInvalidPropertyName', + // 'PhanTypeInvalidPropertyName', 'PhanPluginDuplicateCatchStatementBody', 'PhanPluginUndeclaredVariableIsset', // 'PhanTypeInvalidUnaryOperandIncOrDec', diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php index 6fdb39c0621f3..f5ed4df6b2cce 100644 --- a/dev/tools/phan/config_extended.php +++ b/dev/tools/phan/config_extended.php @@ -210,7 +210,7 @@ 'dolibarr_main_data_root' => 'string', 'dolibarr_main_authentication' => 'string', 'dolibarr_main_demo' => 'string', - 'menumanager' => 'string', + 'menumanager' => '\MenuManager', 'errormsg' => 'string', 'form' => '\Form', 'object_rights' => 'int|stdClass', diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php index 266a2396d1ef1..6a6e00b65edc6 100644 --- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php +++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2019 Frédéric France + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -278,11 +279,11 @@ public function multiselectselectLanguage($htmlname = '', $selected_array = arra } /** - * Return multiselect list of entities for extrafeild type sellist + * Return multiselect list of entities for extrafield type sellist * * @param string $htmlname control name - * @param array $sqlqueryparam array - * @param array $selected_array array + * @param array $sqlqueryparam array + * @param string[] $selected_array array * * @return string HTML combo */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8baf4c7c86a11..d0ec228705667 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8786,8 +8786,8 @@ public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam * Show a multiselect form from an array. WARNING: Use this only for short lists. * * @param string $htmlname Name of select - * @param array $array Array(key=>value) or Array(key=>array('id'=>key, 'label'=>value, 'color'=> , 'picto'=> , 'labelhtml'=> )) - * @param array $selected Array of keys preselected + * @param array $array Array(key=>value) or Array(key=>array('id'=>key, 'label'=>value, 'color'=> , 'picto'=> , 'labelhtml'=> )) + * @param string[] $selected Array of keys preselected * @param int $key_in_label 1 to show key like in "[key] value" * @param int $value_as_key 1 to use value as key * @param string $morecss Add more css style diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index d4daa58f943a7..68cbd675b321d 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -2778,9 +2778,9 @@ function migrate_project_task_actors($db, $langs, $conf) * @param Translate $langs Object langs * @param Conf $conf Object conf * @param string $table Table name - * @param int $fk_source Id of element source + * @param string $fk_source Id of element source (name of field) * @param string $sourcetype Type of element source - * @param int $fk_target Id of element target + * @param string $fk_target Id of element target * @param string $targettype Type of element target * @return void */ diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php index a91f2b97e1c8c..e67a1434cba10 100644 --- a/htdocs/reception/contact.php +++ b/htdocs/reception/contact.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php index 594eb588288fa..c3a549bf52032 100644 --- a/htdocs/reception/dispatch.php +++ b/htdocs/reception/dispatch.php @@ -94,7 +94,7 @@ if ($origin == 'order_supplier' && $object->origin_object->id && (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') || isModEnabled("supplier_order"))) { $origin_id = $object->origin_object->id; $objectsrc = new CommandeFournisseur($db); - $objectsrc->fetch($object->origin_object->id); + $objectsrc->fetch($origin_id); } } diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php index 6f8637113f9e8..f27cd7d668798 100644 --- a/htdocs/reception/document.php +++ b/htdocs/reception/document.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2017 Ferran Marcet + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php index 4514847180acb..b86e05c369f77 100644 --- a/htdocs/reception/note.php +++ b/htdocs/reception/note.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by