fix phpstan (Dolibarr#31075)

* fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan * fix phpstan --------- Co-authored-by: Laurent Destailleur <[email protected]>
Delthair · Sep 22, 2024 · 000173c · 000173c
1 parent ffeb471
commit 000173c
Show file tree

Hide file tree

Showing 83 changed files with 190 additions and 208 deletions.
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2015-2017 Laurent Destailleur  <[email protected]>
+ * Copyright (C) 2024		Frédéric France			<[email protected]>
  *
  * 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
@@ -199,7 +200,7 @@
 fputs($fp, '</dolibarr_htdocs_dir>'."\n");
 
 asort($checksumconcat); // Sort list of checksum
-//var_dump($checksumconcat);
+
 fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
 fputs($fp, md5(join(',', $checksumconcat))."\n");
 fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");

diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
@@ -2,6 +2,7 @@
 <?php
 /* Copyright (C) 2016 Laurent Destailleur  <[email protected]>
  * Copyright (C) 2016 Juanjo Menent        <[email protected]>
+ * Copyright (C) 2024		Frédéric France			<[email protected]>
  * 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
  * the Free Software Foundation; either version 3 of the License, or
@@ -225,7 +226,6 @@
 	$user=new User($db);
 }
 
-//var_dump($user->db->database_name);
 $ret=$user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'An admin user with login "admin" must exists to use this script.'."\n";

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
@@ -623,13 +623,6 @@
 	dol_print_error($db);
 }
 
-
-//var_dump($tabpay);
-//var_dump($tabcompany);
-//var_dump($tabbq);
-//var_dump($tabtp);
-//var_dump($tabtype);
-
 // Write bookkeeping
 if (!$error && $action == 'writebookkeeping' && $user->hasRight('accounting', 'bind', 'write')) {
 	$now = dol_now();
@@ -663,9 +656,6 @@
 		$db->begin();
 
 		// Introduce a protection. Total of tabtp must be total of tabbq
-		//var_dump($tabpay);
-		//var_dump($tabtp);
-		//var_dump($tabbq);exit;
 
 		// Bank
 		if (!$errorforline && is_array($tabbq[$key])) {
@@ -1388,9 +1378,6 @@ function writebookkeeping() {
 						$accounttoshowsubledger = length_accounta($k);
 						if ($accounttoshow != $accounttoshowsubledger) {
 							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
-								//var_dump($tabpay[$key]);
-								//var_dump($tabtype[$key]);
-								//var_dump($tabbq[$key]);
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 								if (!empty($tabcompany[$key]['code_compta'])) {
 									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
@@ -211,7 +211,6 @@
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
-//var_dump($arrayfields);exit;
 
 // Security check
 $result = restrictedArea($user, 'adherent');

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004		Rodolphe Quiedeville		<[email protected]>
  * Copyright (C) 2004-2014	Laurent Destailleur			<[email protected]>
- * Copyright (C) 2015		Frederic France				<[email protected]>
+ * Copyright (C) 2015-2024	Frédéric France				<[email protected]>
  * Copyright (C) 2024		Alexandre Spangaro			<[email protected]>
  * Copyright (C) 2024		MDW							<[email protected]>
  *

diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011-2017	Philippe Grand			<[email protected]>
  * Copyright (C) 2015		Alexandre Spangaro		<[email protected]>
  * Copyright (C) 2017       Rui Strecht			    <[email protected]>
- * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024	Frédéric France         <frederic.france@free.fr>
  *
  * 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
@@ -119,7 +119,7 @@
 print "</tr>\n";
 
 $listofnetworks = dol_sort_array($listofnetworks, 'label');
-//var_dump($listofnetworks);
+
 foreach ($listofnetworks as $key => $value) {
 	if (!empty($value['active'])) {
 		print '<tr class="oddeven">';

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
@@ -1385,7 +1385,6 @@
 	} elseif ($search_active == 'no') {
 		$sql .= " AND ".$db->sanitize($tableprefix)."active = 0";
 	}
-	//var_dump($sql);
 
 	// Count total nb of records
 	$nbtotalofrecords = '';

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015-2018  Frederic France     <frederic.france@netlogic.fr>
+/* Copyright (C) 2015-2024	Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2016       Raphaël Doursenaud  <[email protected]>
  * Copyright (C) 2022       Laurent Destailleur <[email protected]>
  *

diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016  Laurent Destailleur  <[email protected]>
- * Copyright (C) 2014-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2014-2024	Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020		Nicolas ZABOURI      <[email protected]>
  * Copyright (C) 2024		MDW							<[email protected]>
  *

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005-2020  Laurent Destailleur     <[email protected]>
  * Copyright (C) 2007       Rodolphe Quiedeville    <[email protected]>
  * Copyright (C) 2007-2012  Regis Houssin           <[email protected]>
- * Copyright (C) 2015-2019  Frederic France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2017       Nicolas ZABOURI         <[email protected]>
  * Copyright (C) 2024		MDW							<[email protected]>
  *

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
@@ -1563,7 +1563,7 @@
 	}
 	echo ' </tr>'."\n";
 
-	$todayarray = dol_getdate($now, 'fast');
+	$todayarray = dol_getdate($now, true);
 	$todaytms = dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);
 
 	// In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
@@ -1679,7 +1679,7 @@
 		}
 
 		$today = 0;
-		$todayarray = dol_getdate($now, 'fast');
+		$todayarray = dol_getdate($now, true);
 		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
 			$today = 1;
 		}
@@ -1709,7 +1709,7 @@
 	// Code to show just one day
 	$style = 'cal_current_month cal_current_month_oneday';
 	$today = 0;
-	$todayarray = dol_getdate($now, 'fast');
+	$todayarray = dol_getdate($now, true);
 	if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) {
 		$today = 1;
 	}

diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
@@ -832,7 +832,7 @@
 }
 
 // Loop on each user to show calendar
-$todayarray = dol_getdate($now, 'fast');
+$todayarray = dol_getdate($now, true);
 $sav = $tmpday;
 $showheader = true;
 $var = false;

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
@@ -999,7 +999,7 @@
 	}
 
 	// Loop on each user to show calendar
-	$todayarray = dol_getdate($now, 'fast');
+	$todayarray = dol_getdate($now, true);
 	$sav = $tmpday;
 	$showheader = true;
 	$var = false;

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
@@ -1276,7 +1276,7 @@
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
+					$desc = dol_concatdesc($desc, $product_desc, false, getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION') ? true : false);
 				}
 
 				// Add custom code and origin country into description

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
@@ -974,7 +974,7 @@
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
+					$desc = dol_concatdesc($desc, $product_desc, false, getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION') ? true : false);
 				}
 
 				// Add custom code and origin country into description

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
@@ -2346,7 +2346,7 @@
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
+					$desc = dol_concatdesc($desc, $product_desc, false, getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION') ? true : false);
 				}
 
 				// Add custom code and origin country into description

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -61,7 +61,9 @@ class ChargeSociales extends CommonObject
 	 */
 	public $date_ech;
 
-
+	/**
+	 * @var string label
+	 */
 	public $label;
 	public $type;
 	public $type_label;
@@ -96,6 +98,9 @@ class ChargeSociales extends CommonObject
 	 */
 	public $paiementtype;
 
+	/**
+	 * @var int ID
+	 */
 	public $mode_reglement_id;
 	public $mode_reglement_code;
 	public $mode_reglement;
@@ -115,6 +120,9 @@ class ChargeSociales extends CommonObject
 	 */
 	public $total;
 
+	/**
+	 * @var float total paid
+	 */
 	public $totalpaid;
 
 
@@ -406,6 +414,7 @@ public function update($user, $notrigger = 0)
 	public function solde($year = 0)
 	{
 		global $conf;
+
 		$sql = "SELECT SUM(f.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
 		$sql .= " WHERE f.entity = ".((int) $conf->entity);

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
@@ -588,7 +588,7 @@
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
+					$desc = dol_concatdesc($desc, $product_desc, false, getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION') ? true : false);
 				}
 
 				$fk_unit = $prod->fk_unit;
@@ -1680,7 +1680,7 @@
 					}
 					// VAT
 					print '<td class="center">';
-					print vatrate($objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), '%', $objp->info_bits);
+					print vatrate($objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), true, $objp->info_bits);
 					print '</td>';
 					// Price
 					print '<td class="right">'.($objp->subprice != '' ? price($objp->subprice) : '')."</td>\n";

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -23,7 +23,7 @@
  * Copyright (C) 2018       Josep Lluis Amador      <[email protected]>
  * Copyright (C) 2023		Joachim Kueter			<[email protected]>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		MDW							<[email protected]>
+ * Copyright (C) 2024		MDW						<[email protected]>
  * Copyright (C) 2024		William Mead			<[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
@@ -854,8 +854,8 @@ public function generateDoc($module)
 				}
 
 				// Copy some files into temp directory, so instruction include::ChangeLog.md[] will works inside the asciidoc file.
-				dol_copy($dirofmodule.'/README.md', $dirofmoduletmp.'/README.md', 0, 1);
-				dol_copy($dirofmodule.'/ChangeLog.md', $dirofmoduletmp.'/ChangeLog.md', 0, 1);
+				dol_copy($dirofmodule.'/README.md', $dirofmoduletmp.'/README.md', '0', 1);
+				dol_copy($dirofmodule.'/ChangeLog.md', $dirofmoduletmp.'/ChangeLog.md', '0', 1);
 
 				// Replace into README.md and ChangeLog.md (in case they are included into documentation with tag __README__ or __CHANGELOG__)
 				$arrayreplacement = array();

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
@@ -1925,9 +1925,9 @@ function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
  *	Return line vat rate
  *
  *	@param	SupplierProposal|CommandeFournisseur|FactureFournisseur|Propal|Facture|Commande|ExpenseReport|StockTransfer	$object	Object
- *	@param	int			$i					Current line number
- *  @param  Translate	$outputlangs		Object langs for output
- *  @param	int<0,2>	$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
+ *	@param	int				$i					Current line number
+ *  @param  Translate		$outputlangs		Object langs for output
+ *  @param	int<0,2>		$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
  * 	@return	string
  */
 function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
@@ -1962,7 +1962,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 					} else {
 						$tmpresult = '';
 					}
-					$tmpresult .= vatrate(abs($object->lines[$i]->localtax1_tx), 0);
+					$tmpresult .= vatrate((string) abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
 			if (!getDolGlobalString('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) {
@@ -1972,7 +1972,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 					} else {
 						$tmpresult = '';
 					}
-					$tmpresult .= vatrate(abs($object->lines[$i]->localtax2_tx), 0);
+					$tmpresult .= vatrate((string) abs($object->lines[$i]->localtax2_tx), 0);
 				}
 			}
 			$tmpresult .= '%';

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -947,7 +947,7 @@ protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs
 							if (getDolGlobalString('PDF_LOCALTAX1_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -983,7 +983,7 @@ protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs
 							if (getDolGlobalString('PDF_LOCALTAX2_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1053,7 +1053,7 @@ protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs
 							if (getDolGlobalString('PDF_LOCALTAX1_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1093,7 +1093,7 @@ protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs
 							if (getDolGlobalString('PDF_LOCALTAX2_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1153,7 +1153,7 @@ protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlan
 							if (getDolGlobalString('PDF_LOCALTAX1_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1189,7 +1189,7 @@ protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlan
 							if (getDolGlobalString('PDF_LOCALTAX2_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1257,7 +1257,7 @@ protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlan
 							if (getDolGlobalString('PDF_LOCALTAX1_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1295,7 +1295,7 @@ protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlan
 							if (getDolGlobalString('PDF_LOCALTAX2_LABEL_IS_CODE_OR_RATE') == 'nocodenorate') {
 								$totalvat .= $tvacompl;
 							} else {
-								$totalvat .= vatrate(abs((float) $tvakey), 1).$tvacompl;
+								$totalvat .= vatrate((string) abs((float) $tvakey), 1).$tvacompl;
 							}
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);