From 866753d87ef5ab80937a1f70ce0ddff5b7d1a112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 14 Jan 2024 20:53:22 +0100
Subject: [PATCH 1/5] fix phpstan

---
 htdocs/core/class/html.formcontract.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index f71f1736a33..fc869901f01 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -63,7 +63,7 @@ class FormContract
 	 *  @param	string	$morecss	More CSS
 	 *	@return int         		Nbr of contract if OK, <0 if KO
 	 */
-	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')
+	public function select_contract($socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')
 	{
 		// phpcs:enable
 		global $user, $conf, $langs;
@@ -190,7 +190,7 @@ class FormContract
 	 *  @param	int		$noouput	1=Return the output instead of display
 	 *  @return string|void         html string
 	 */
-	public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)
+	public function formSelectContract($page, $socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)
 	{
 		global $langs;
 

From 08bc6996c9b442834e7c821bcb26ff940c80ca50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 14 Jan 2024 20:57:26 +0100
Subject: [PATCH 2/5] fix phpstan

---
 htdocs/core/class/html.formexpensereport.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index 4eb12e64d2f..a94e076a3ba 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -59,7 +59,7 @@ class FormExpenseReport
 	 *    @param    int     $useshortlabel  Use short labels
 	 *    @return   string                  HTML select with status
 	 */
-	public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
+	public function selectExpensereportStatus($selected = 0, $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
 	{
 		global $langs;
 
@@ -74,7 +74,7 @@ class FormExpenseReport
 			$arrayoflabels = $tmpep->labelStatusShort;
 		}
 		foreach ($arrayoflabels as $key => $val) {
-			if ($selected != '' && $selected == $key) {
+			if (!empty($selected) && $selected == $key) {
 				$html .= '<option value="'.$key.'" selected>';
 			} else {
 				$html .=  '<option value="'.$key.'">';
@@ -97,7 +97,7 @@ class FormExpenseReport
 	 *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
 	 *  @return     string                  Select html
 	 */
-	public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
+	public function selectTypeExpenseReport($selected = 0, $htmlname = 'type', $showempty = 0, $active = 1)
 	{
 		// phpcs:enable
 		global $langs, $user;

From edf3b996de6e1d47e109eb03573d1cbcb9330be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 14 Jan 2024 21:00:18 +0100
Subject: [PATCH 3/5] fix phpstan

---
 htdocs/core/class/utils_diff.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/utils_diff.class.php b/htdocs/core/class/utils_diff.class.php
index 9e09fc06879..e9ce4838a08 100644
--- a/htdocs/core/class/utils_diff.class.php
+++ b/htdocs/core/class/utils_diff.class.php
@@ -31,7 +31,7 @@ class Diff
 	 *
 	 * @param	string	$string1            First string
 	 * @param	string	$string2            Second string
-	 * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
 	 * @return	array						Array of diff
 	 */
 	public static function compare($string1, $string2, $compareCharacters = false)

From 8a5d40b749c8d0fc106dba71e0012aa19e70de0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 14 Jan 2024 21:12:52 +0100
Subject: [PATCH 4/5] fix phpstan

---
 htdocs/expensereport/class/expensereport_rule.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index b2c18740307..5966ba2399a 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -214,11 +214,11 @@ class ExpenseReportRule extends CommonObject
 	 * Return all rules or filtered by something
 	 *
 	 * @param int	     $fk_c_type_fees	type of expense
-	 * @param integer	 $date			    date of expense
+	 * @param int|string $date			    date of expense
 	 * @param int        $fk_user		    user of expense
 	 * @return array                        Array with ExpenseReportRule
 	 */
-	public function getAllRule($fk_c_type_fees = '', $date = '', $fk_user = '')
+	public function getAllRule($fk_c_type_fees = 0, $date = '', $fk_user = 0)
 	{
 		$rules = array();
 

From dfc263ced547bb5814614a68cbabfb147dfd3858 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 14 Jan 2024 21:16:52 +0100
Subject: [PATCH 5/5] Fix: github_lines_byuser.sh - resolve issue with iconv

# Fix: github_lines_byuser.sh - resolve issue with iconv

iconv could not convert certain characters and truncated the output.
That is fixed.
The script was improved by adding a variable, cleaning up and hence
also fixing shellcheck warnings.
---
 dev/tools/github_lines_byuser.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev/tools/github_lines_byuser.sh b/dev/tools/github_lines_byuser.sh
index fc5bd0597bd..591d74688d4 100755
--- a/dev/tools/github_lines_byuser.sh
+++ b/dev/tools/github_lines_byuser.sh
@@ -3,7 +3,6 @@
 # Count number of lines modified per user for a given branch
 #
 
-# shellcheck disable=2002,2086,2268
 DEBUG=${DEBUG:=0}
 
 if [ "$2" = "" ]; then
@@ -21,9 +20,13 @@ if [ "$START" = "START.." ]; then
 	START=""
 fi
 
-[ "$DEBUG" ] && echo "git log '${START}${END}' --shortstat | grep ... | perl ... > /tmp/github_lines_perusers.tmp"
-git log "${START}${END}" --shortstat --use-mailmap | iconv -f UTF-8 -t ASCII//TRANSLIT | grep -e 'Author:' -e 'Date:' -e ' changed' -e ' insertion' -e ' deletion' | perl -n -e '/^(.*)$/; $line = $1; if ($line =~ /(changed|insertion|deletion)/) { $line =~ s/[^0-9\s]//g; my @arr=split /\s+/, $line; $tot=0; for (1..@arr) { $tot += $arr[$_]; }; print $tot."\n"; } else { print $line."\n"; };' > /tmp/github_lines_perusers.tmp
+TMPFILE=/tmp/github_lines_perusers.tmp
+
+[ "$DEBUG" ] && echo "git log '${START}${END}' --shortstat --use-mailmap | grep ... | perl ... > '${TMPFILE}'"
+git log "${START}${END}" --shortstat --use-mailmap | iconv -f UTF-8 -t ASCII//TRANSLIT --byte-subst='?' -c | grep -e 'Author:' -e 'Date:' -e ' changed' -e ' insertion' -e ' deletion' | perl -n -e '/^(.*)$/; $line = $1; if ($line =~ /(changed|insertion|deletion)/) { $line =~ s/[^0-9\s]//g; my @arr=split /\s+/, $line; $tot=0; for (1..@arr) { $tot += $arr[$_]; }; print $tot."\n"; } else { print $line."\n"; };' > "${TMPFILE}"
 
 echo "Users and nb of lines";
-cat /tmp/github_lines_perusers.tmp | awk 'BEGIN { FS="\n"; lastuser=""; } { if ($1 ~ /^Author:/) { sub(/<.*/, ""); lastuser=tolower($1) }; if ($1 ~ /^[0-9]+$/) { aaa[lastuser]+=$1; } } END { for (var in aaa) print var," ",aaa[var]; } ' | sort
+awk < "${TMPFILE}" 'BEGIN { FS="\n"; lastuser=""; } { if ($1 ~ /^Author:/) { sub(/<.*/, ""); lastuser=tolower($1) }; if ($1 ~ /^[0-9]+$/) { aaa[lastuser]+=$1; } } END { for (var in aaa) print var," ",aaa[var]; } ' | sort
 
+# Clean up
+rm "${TMPFILE}"