From 33486f10c05b9e24796aa29ced078ccf31b13d3f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:58:43 +0100
Subject: [PATCH 01/23] Fix PhanTypeMismatchReturnNullable by initialising
 return value

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c6ce7429708..f71fa705c3f 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -560,12 +560,13 @@ class Adherent extends CommonObject
 	 *	Return translated label by the nature of a adherent (physical or moral)
 	 *
 	 *	@param	string		$morphy		Nature of the adherent (physical or moral)
-	 *  @param	int			$addbadge	Add badge (1=Full label, 2=First letters only)
+	 *  @param	int<0,2>	$addbadge	Add badge (1=Full label, 2=First letters only)
 	 *	@return	string					Label
 	 */
 	public function getmorphylib($morphy = '', $addbadge = 0)
 	{
 		global $langs;
+		$s = '';
 
 		// Clean var
 		if (!$morphy) {
@@ -573,7 +574,6 @@ class Adherent extends CommonObject
 		}
 
 		if ($addbadge) {
-			$s = '';
 			$labeltoshowm = $langs->trans("Moral");
 			$labeltoshowp = $langs->trans("Physical");
 			if ($morphy == 'phy') {

From 3b93de27097f3a8926d1d9f750a952472dffde8c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:10:45 +0100
Subject: [PATCH 02/23] Fix PhanTypeMismatchReturnNullable by initialising
 return value + Some PHPdoc typing

---
 .../adherents/class/adherentstats.class.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index f99b20f86d5..612f408edd9 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -3,6 +3,7 @@
  * Copyright (c) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2023      Waël Almoman         <info@almoman.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -168,15 +169,15 @@ class AdherentStats extends Stats
 	/**
 	 *	Return count of member by status group by adh type, total and average
 	 *
-	 *  @param		int		$numberYears    Number of years to scan (0 = all)
-	 * 	@return		array 					Array with total of draft, pending, uptodate, expired, resiliated for each member type
+	 *	@param	int		$numberYears    Number of years to scan (0 = all)
+	 *	@return	array<string,array{label:string,members_draft:int,members_pending:0,members_uptodate:int,members_expired:int,members_excluded:int,members_resiliated:int,all?:float|int,total_adhtag:float|int}>		Array with total of draft, pending, uptodate, expired, resiliated for each member type
 	 */
 	public function countMembersByTypeAndStatus($numberYears = 0)
 	{
 		global $user;
 
 		$now = dol_now();
-		$endYear = date('Y');
+		$endYear = (int) date('Y');
 		$startYear = $endYear - $numberYears;
 
 		$sql = "SELECT t.rowid as fk_adherent_type, t.libelle as label";
@@ -224,7 +225,7 @@ class AdherentStats extends Stats
 					'members_resiliated' => (int) $objp->members_resiliated
 				);
 				$totalrow = 0;
-				foreach ($MembersCountArray[$objp->fk_adherent_type] as $key=>$nb) {
+				foreach ($MembersCountArray[$objp->fk_adherent_type] as $key => $nb) {
 					if ($key != 'label') {
 						$totalrow += $nb;
 						$totalstatus[$key] += $nb;
@@ -244,16 +245,17 @@ class AdherentStats extends Stats
 	/**
 	 *	Return count of member by status group by adh type, total and average
 	 *
-	 * @param		int		$numberYears    Number of years to scan (0 = all)
-	 * @return		array 					Array with total of draft, pending, uptodate, expired, resiliated for each member tag
+	 * @param	int		$numberYears    Number of years to scan (0 = all)
+	 * @return	array<string,array{label:string,members_draft:int,members_pending:0,members_uptodate:int,members_expired:int,members_excluded:int,members_resiliated:int,all?:float|int,total_adhtag:float|int}>		Array with total of draft, pending, uptodate, expired, resiliated for each member tag
 	 */
 	public function countMembersByTagAndStatus($numberYears = 0)
 	{
 		global $user;
 
 		$now = dol_now();
-		$endYear = date('Y');
+		$endYear = (int) date('Y');
 		$startYear = $endYear - $numberYears;
+		$MembersCountArray = [];
 
 		$sql = "SELECT c.rowid as fk_categorie, c.label as label";
 		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_DRAFT, "'members_draft'", 'NULL').") as members_draft";
@@ -282,7 +284,6 @@ class AdherentStats extends Stats
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			$MembersCountArray = [];
 			$totalstatus = array(
 				'label' => 'Total',
 				'members_draft' => 0,
@@ -304,7 +305,7 @@ class AdherentStats extends Stats
 					'members_resiliated' => (int) $objp->members_resiliated
 				);
 				$totalrow = 0;
-				foreach ($MembersCountArray[$objp->fk_categorie] as $key=>$nb) {
+				foreach ($MembersCountArray[$objp->fk_categorie] as $key => $nb) {
 					if ($key != 'label') {
 						$totalrow += $nb;
 						$totalstatus[$key] += $nb;

From 3a27977b46fc942eb664e9f933bbab556051f5d8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:18:37 +0100
Subject: [PATCH 03/23] Fix PhanTypeMismatchReturnNullable with typing test

---
 htdocs/comm/action/class/actioncomm.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index f4f77bcaa9d..09e73b188f8 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1393,7 +1393,7 @@ class ActionComm extends CommonObject
 	 *
 	 * @param	User	$user   			Object user
 	 * @param	int		$load_state_board	Load indicator array this->nb
-	 * @return WorkboardResponse|int 		Return integer <0 if KO, WorkboardResponse if OK
+	 * @return WorkboardResponse|int<-1,1>	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $load_state_board = 0)
 	{
@@ -1462,7 +1462,7 @@ class ActionComm extends CommonObject
 			}
 
 			$this->db->free($resql);
-			if (empty($load_state_board)) {
+			if (empty($load_state_board) && $response instanceof WorkboardResponse) {
 				return $response;
 			} else {
 				return 1;

From 0a1a663e3471360ce6a8b79e8df535ad027f6609 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:21:35 +0100
Subject: [PATCH 04/23] Fix PhanTypeMismatchReturnNullable with initialisation

---
 htdocs/comm/propal/class/api_proposals.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index aa1e3d0e980..546d40d052d 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2020       Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
  * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -410,6 +411,7 @@ class Proposals extends DolibarrApi
 		}
 
 		$errors = [];
+		$updateRes = 0;
 		$this->db->begin();
 
 		foreach ($request_data as $TData) {

From d245dab56b56dcfab7454a395b790052a094a9c3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:56:14 +0100
Subject: [PATCH 05/23] Fix PhanTypeMismatchReturnNullable by setting variable

---
 htdocs/projet/class/task.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 45dcad80025..84d78726599 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2051,9 +2051,10 @@ class Task extends CommonObjectLine
 			$this->error = $clone_task->error;
 			$error++;
 		}
-
 		// End
-		if (!$error) {
+		if ($error) {
+			$clone_task_id = 0;  // For static tool check
+		} else {
 			$clone_task_id = $clone_task->id;
 			$clone_task_ref = $clone_task->ref;
 

From 7e1bf61c0db34f4deb6308e03472444a8da63249 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 17:59:48 +0100
Subject: [PATCH 06/23] Fix PhanTypeMismatchReturnNullable with init

---
 htdocs/core/class/html.formprojet.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 9bbc5e75018..b6f50754c6b 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Marcos García  <marcosgdf@gmail.com>
  * Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -686,7 +687,7 @@ class FormProjets extends Form
 	 * @param string $morecss Add more css
 	 * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
 	 * @param int $addcombojs 1=Add a js combo
-	 * @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
+	 * @return  int<-1,-1>|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
 	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)
 	{
@@ -701,6 +702,7 @@ class FormProjets extends Form
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
+			$sellist = '';
 			if ($num > 0) {
 				$sellist = '<select class="flat oppstatus' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '">';
 				if ($showempty) {
@@ -841,7 +843,7 @@ class FormProjets extends Form
 				// Use select2 selector
 				if (!empty($conf->use_javascript_ajax)) {
 					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-					$comboenhancement = ajax_combobox($htmlNameInvoice, array(array('method'=>'getLines', 'url'=>dol_buildpath('/core/ajax/ajaxinvoiceline.php', 1), 'htmlname'=>$htmlNameInvoiceLine)), 0, 0);
+					$comboenhancement = ajax_combobox($htmlNameInvoice, array(array('method' => 'getLines', 'url' => dol_buildpath('/core/ajax/ajaxinvoiceline.php', 1), 'htmlname' => $htmlNameInvoiceLine)), 0, 0);
 					$out .= $comboenhancement;
 					$morecss = 'minwidth200imp maxwidth500';
 				}
@@ -957,9 +959,9 @@ class FormProjets extends Form
 				$out .= $langs->trans("OppStatus".$code);
 
 				// Opportunity percent
-				$out.= ' / <span title="'.$langs->trans("OpportunityProbability").'"> ';
-				$out.= price($percent_value, 0, $langs, 1, 0).' %';
-				$out.= '</span>';
+				$out .= ' / <span title="'.$langs->trans("OpportunityProbability").'"> ';
+				$out .= price($percent_value, 0, $langs, 1, 0).' %';
+				$out .= '</span>';
 			} else {
 				$out .= "&nbsp;";
 			}

From 9f7b0fb326abeb3d4e5ef5898405e9eadd91eb47 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:05:40 +0100
Subject: [PATCH 07/23] Fix PhanTypeMismatchReturnNullable by adding die() in
 final else condition as well

---
 htdocs/core/class/smtps.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 8d8d95369e5..bca65ed5d84 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1686,6 +1686,8 @@ class SMTPs
 			}
 
 			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
+		} else {
+			die("Sorry, no content");
 		}
 
 		return $content;

From e105b577ee813679ea2a593797796da02ee8cc7d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:46:04 +0100
Subject: [PATCH 08/23] Fix PhanTypeMismatchReturn by changing return and
 logging error

---
 htdocs/core/modules/societe/modules_societe.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 4e1bd2e5865..f5ac07fb2ff 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -255,13 +255,14 @@ abstract class ModeleAccountancyCode extends CommonNumRefGenerator
 	 *  @param	DoliDB	$db             Database handler
 	 *  @param  Societe	$societe        Third party object
 	 *  @param  string	$type			'customer' or 'supplier'
-	 *  @return	int						>=0 if OK, <0 if KO
+	 *  @return	int<-1,1>				>=0 if success, -1 if failure
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
 		// phpcs:enable
 		global $langs;
 
-		return $langs->trans("NotAvailable");
+		dol_syslog(get_class($this)."::get_code".$langs->trans("NotAvailable"), LOG_ERR);
+		return -1;
 	}
 }

From 90e1674e55dcdfe27a843334c923c64b26cf46b6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:52:25 +0100
Subject: [PATCH 09/23] Cast to string rather than quote var

---
 htdocs/product/class/product.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index cca1aa2b4bd..ab072b4cda1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1898,13 +1898,13 @@ class Product extends CommonObject
 			while ($obj = $this->db->fetch_object($result)) {
 				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
 				if ($obj->lang == $current_lang) {  // si on a les traduct. dans la langue courante on les charge en infos principales.
-					$this->label        = $obj->label;
+					$this->label       = $obj->label;
 					$this->description = $obj->description;
-					$this->other        = $obj->other;
+					$this->other       = $obj->other;
 				}
-				$this->multilangs["$obj->lang"]["label"]        = $obj->label;
-				$this->multilangs["$obj->lang"]["description"] = $obj->description;
-				$this->multilangs["$obj->lang"]["other"]        = $obj->other;
+				$this->multilangs[(string) $obj->lang]["label"]       = $obj->label;
+				$this->multilangs[(string) $obj->lang]["description"] = $obj->description;
+				$this->multilangs[(string) $obj->lang]["other"]       = $obj->other;
 			}
 			return 1;
 		} else {

From ba4a482c9608aa09a5b295b94bc3ba36722f00d0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:12:15 +0100
Subject: [PATCH 10/23] Fix PhanTypeMismatchReturnNullable by forcing type for
 phan

---
 htdocs/projet/class/projectstats.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index b671f147636..4a789b17d8b 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Lead
  * Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -289,7 +290,7 @@ class ProjectStats extends Stats
 	 * @param	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @param   int     $wonlostfilter  Add a filter on status won/lost
-	 * @return 	array|int				Array of values or <0 if error
+	 * @return 	array|int<-1,-1>		Array of values or <0 if error
 	 */
 	public function getWeightedAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $wonlostfilter = 1)
 	{
@@ -328,6 +329,7 @@ class ProjectStats extends Stats
 		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
+			'@phan-var-force array $data';  // Phan can not interpret json_decode
 		} else {
 			$year = $startyear;
 			while ($year <= $endyear) {
@@ -438,6 +440,7 @@ class ProjectStats extends Stats
 		if ($foundintocache) { // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
+			'@phan-var-force array $data';  // Phan can not interpret json_decode
 		} else {
 			$year = $startyear;
 			while ($year <= $endyear) {

From 6dc3fc94f7d39b25a1de56ecbb4c757b672b3c73 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:16:13 +0100
Subject: [PATCH 11/23] Fix PhanTypeMismatchReturnNullable by setting return
 variable in 'else' case

---
 htdocs/website/class/website.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index bd5e25f1932..e8d198f61b3 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1868,6 +1868,8 @@ class Website extends CommonObject
 				$numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
 				$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
 				$differences['file_destination'] = $fileNeeded;
+			} else {
+				$differences = array();
 			}
 			return $differences;
 		}

From 6bfdc4655fae3d362123a7809c348879a21c40bc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:53:22 +0100
Subject: [PATCH 12/23] Disable ignores phan's baseline.txt (fixed)

---
 dev/tools/phan/baseline.txt       | 30 ++---------
 htdocs/core/class/stats.class.php | 83 +++++++++++++++----------------
 2 files changed, 45 insertions(+), 68 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 8c6c44e90f3..f39b1262064 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -10,25 +10,20 @@
 return [
     // # Issue statistics:
     // PhanParamSignatureMismatch : 25+ occurrences
-    // PhanTypeMismatchReturnNullable : 20+ occurrences
     // PhanPluginSuspiciousParamPosition : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
-    // PhanTypeArraySuspiciousNull : 10+ occurrences
-    // PhanTypeMismatchReturn : 10+ occurrences
+    // PhanTypeMismatchReturn : 8 occurrences
     // PhanRedefineFunctionInternal : 6 occurrences
+    // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 4 occurrences
-    // PhanTypeMismatchPropertyProbablyReal : 2 occurrences
+    // PhanTypeMismatchReturnNullable : 3 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
     // PhanNoopStringLiteral : 1 occurrence
-    // PhanPluginAlwaysReturnFunction : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/adherents/class/adherentstats.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
         'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
@@ -36,10 +31,7 @@ return [
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
         'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
-        'htdocs/comm/action/class/actioncomm.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/comm/action/index.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/propal/class/api_proposals.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
@@ -47,24 +39,15 @@ return [
         'htdocs/core/class/commonobject.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/extrafields.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/class/smtps.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/class/stats.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch', 'PhanTypeMismatchReturnNullable'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/date.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanRedefineFunctionInternal'],
-        'htdocs/core/lib/functions2.lib.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanRedefineFunctionInternal'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/website.lib.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/modules/DolibarrModules.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
@@ -76,17 +59,12 @@ return [
         'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
         'htdocs/product/class/product.class.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/projet/class/project.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/projet/class/projectstats.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/projet/class/task.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/stripe/admin/stripe.php' => ['PhanDeprecatedFunction'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/website/class/website.class.php' => ['PhanTypeMismatchReturnNullable'],
         'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index fd8ab10a3b5..14b636dd2ab 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -3,6 +3,7 @@
  * Copyright (c) 2008-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -75,21 +76,21 @@ abstract class Stats
 	public $month;
 
 	/**
-	 *  @param	int		$year 			number
-	 * 	@param	int 	$format 		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 * 	@return array					array of values by month
+	 *	@param	int		$year 			number
+	 *	@param	int 	$format 		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int}>	Array of nb each month
 	 */
 	abstract protected function getNbByMonth($year, $format = 0);
 
 	/**
 	 * Return nb of elements by month for several years
 	 *
-	 * @param 	int		$endyear		Start year
-	 * @param 	int		$startyear		End year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
-	 * @return 	array					Array of values
+	 *	@param 	int		$endyear		Start year
+	 *	@param 	int		$startyear		End year
+	 *	@param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 *	@param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
+	 * @return	array<int<0,11>,array{0:int<1,12>,1:int}>	Array of values
 	 */
 	public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
@@ -99,7 +100,8 @@ abstract class Stats
 			return array();
 		}
 
-		$datay = array();
+		$data  = array();  // This is the return value
+		$datay = array();  // This is a work value
 
 		// Search into cache
 		if (!empty($cachedelay)) {
@@ -138,19 +140,18 @@ abstract class Stats
 				$year++;
 			}
 
-			$data = array();
-
 			for ($i = 0; $i < 12; $i++) {
 				$data[$i][] = $datay[$endyear][($i + $sm) % 12][0];
 				$year = $startyear;
 				while ($year <= $endyear) {
 					// floor(($i + $sm) / 12)) is 0 if we are after the month start $sm and same year, become 1 when we reach january of next year
-					$data[$i][] = $datay[$year - (1 - floor(($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];
+					$data[$i][] = $datay[$year - (1 - (int) floor(($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];
 					$year++;
 				}
 			}
 		}
 
+
 		// Save cache file
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
@@ -170,9 +171,9 @@ abstract class Stats
 	}
 
 	/**
-	 * @param	int		$year			year number
-	 * @param	int 	$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 * @return array					array of values by month
+	 *	@param	int		$year			year number
+	 *	@param	int 	$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of values by month
 	 */
 	abstract protected function getAmountByMonth($year, $format = 0);
 
@@ -187,7 +188,7 @@ abstract class Stats
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
-	 * @return 	array					Array of values
+	 * @return 	array 					Array of values
 	 */
 	public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
@@ -279,9 +280,9 @@ abstract class Stats
 	/**
 	 * Return average of entity by month for several years
 	 *
-	 * @param	int		$endyear		Start year
-	 * @param	int		$startyear		End year
-	 * @return 	array					Array of values
+	 *	@param	int		$endyear		Start year
+	 *	@param	int		$startyear		End year
+	 *	@return array{int<0,11>,array<int|float>}	Array of values
 	 */
 	public function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
@@ -312,12 +313,12 @@ abstract class Stats
 	}
 
 	/**
-	 * Return count, and sum of products
+	 *	Return count, and sum of products
 	 *
-	 * @param	int		$year			Year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @param  	int     $limit      	Limit
-	 * @return 	array					Array of values
+	 *	@param	int		$year			Year
+	 *	@param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 *	@param 	int     $limit      	Limit
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of values
 	 */
 	public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
 	{
@@ -325,7 +326,7 @@ abstract class Stats
 
 		$data = array();
 
-		// Search into cache
+		// Search in cache
 		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
@@ -465,13 +466,13 @@ abstract class Stats
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *     Renvoie le nombre de documents par mois pour une annee donnee
-	 *     Return number of documents per month for a given year
+	 *	Renvoie le nombre de documents par mois pour une annee donnee
+	 *	Return number of documents per month for a given year
 	 *
-	 *     @param   int		$year       Year
-	 *     @param   string	$sql        SQL
-	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 *     @return	array				Array of nb each month
+	 *	@param	int		$year       Year
+	 *	@param	string	$sql        SQL
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int}>	Array of nb each month
 	 */
 	protected function _getNbByMonth($year, $sql, $format = 0)
 	{
@@ -523,12 +524,12 @@ abstract class Stats
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *     Return the amount per month for a given year
+	 *	Return the amount per month for a given year
 	 *
-	 *     @param	int		$year       Year
-	 *     @param   string	$sql		SQL
-	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 *     @return	array
+	 *	@param	int		$year       Year
+	 *	@param   string	$sql		SQL
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of nb each month
 	 */
 	protected function _getAmountByMonth($year, $sql, $format = 0)
 	{
@@ -580,13 +581,12 @@ abstract class Stats
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *  Renvoie le montant moyen par mois pour une annee donnee
 	 *  Return the amount average par month for a given year
 	 *
 	 *  @param  int     $year       Year
 	 *  @param  string  $sql        SQL
 	 *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-	 *  @return array
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of average each month
 	 */
 	protected function _getAverageByMonth($year, $sql, $format = 0)
 	{
@@ -643,7 +643,7 @@ abstract class Stats
 	 *
 	 *  @param  string  $sql        SQL
 	 *  @param  int     $limit      Limit
-	 *  @return array
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of total of product refs each month
 	 */
 	protected function _getAllByProduct($sql, $limit = 10)
 	{
@@ -682,7 +682,7 @@ abstract class Stats
 	/**
 	 *  Returns the summed amounts per year for a given number of past years ending now
 	 *  @param  string  $sql    SQL
-	 *  @return array
+	 *	@return	array<int,array{0:int,1:int}>	Array of sum of amounts
 	 */
 	protected function _getAmountByYear($sql)
 	{
@@ -693,7 +693,6 @@ abstract class Stats
 			$i = 0;
 			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
-				$j = (int) $row[0];
 				$result[] = [
 					0 => (int) $row[0],
 					1 => (int) $row[1],

From d591d258f1326b5dbdbf22d36d962ccbd7bee65c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:57:41 +0100
Subject: [PATCH 13/23] Fix null return by returning 0

---
 htdocs/core/lib/date.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index c7d70249b9b..30431f10f27 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -1005,7 +1005,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
  *	@param	   int			$timestampEnd       Timestamp end UTC
  *	@param     int			$lastday            Last day is included, 0: no, 1:yes
  *	@return    int								Number of days
- *  @seealso num_public_holiday(), num_open_day()
+ *  @see also num_public_holiday(), num_open_day()
  */
 function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 {
@@ -1016,6 +1016,8 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 			$bit = 1;
 		}
 		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
+	} else {
+		$nbjours = 0;
 	}
 	//print ($timestampEnd - $timestampStart) - $lastday;
 	return $nbjours;

From f824bbdc23014b69049c769d69710a31f8ddee25 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:58:44 +0100
Subject: [PATCH 14/23] Fix null return by returning and logging error

---
 htdocs/core/lib/functions2.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index b290bb713eb..52c35c3fabe 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1424,6 +1424,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$maskuser_maskafter = $maskuser_value;
 			$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
 		}
+	} else {
+		$numFinal = "ErrorBadMode";
+		dol_syslog("functions2::get_next_value ErrorBadMode '$mode'", LOG_ERR);
 	}
 
 	dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);

From 23b7d63850bb4692fb10e56a2ac263c4661046ec Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:59:51 +0100
Subject: [PATCH 15/23] Fix null return by initialising return value to 0

---
 htdocs/core/lib/pdf.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 62131255b72..44578fd88f6 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1018,6 +1018,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$outputlangs->load("dict");
 	$line = '';
 	$reg = array();
+	$marginwithfooter = 0;  // Return value
 
 	$dims = $pdf->getPageDimensions();
 
@@ -1356,9 +1357,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 	if (getDolGlobalString('PDF_USE_GETALIASNBPAGE_FOR_TOTAL')) {
 		// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); 	// works with $pdf->Cell
-		$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();	// seems to not works with all fonts like ru_UK
+		$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();	// seems to not work with all fonts like ru_UK
 	} else {
-		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();		// seems to always work even with $pdf->Cell. But some users has reported wrong nb (no way to reproduce)
+		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();		// seems to always work even with $pdf->Cell. But some users have reported wrong nb (no way to reproduce)
 	}
 
 	$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);

From 4f9ad83222f4b2d1f9eef7bb0d78c060423d483d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:01:00 +0100
Subject: [PATCH 16/23] Fix null return by returning empty string

---
 htdocs/core/lib/website.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index bee8322ab69..4a0e9a8458b 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -837,6 +837,8 @@ function getStructuredData($type, $data = array())
 				}
 			}'."\n";
 		$ret .= '</script>'."\n";
+	} else {
+		$ret = '';
 	}
 	return $ret;
 }

From 9ecb4bd639641ab93a5c72acead4d5a2c1f09ebd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:02:09 +0100
Subject: [PATCH 17/23] Fix null return by returning empty string in else case

---
 htdocs/core/modules/DolibarrModules.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index e0603034fbe..0e0eb57ca22 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -806,6 +806,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			} else {
 				$content = nl2br($content);
 			}
+		} else {
+			$content = '';
 		}
 
 		return $content;

From 351c1531028db648ad8771f67b4decf3a0d399d0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:03:48 +0100
Subject: [PATCH 18/23] Fix null return by initialising return value and
 generate error on 0

---
 htdocs/projet/class/project.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f1355fc7a85..779f4995f51 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1697,6 +1697,7 @@ class Project extends CommonObject
 		global $langs, $conf;
 
 		$error = 0;
+		$clone_project_id = 0;   // For static toolcheck
 
 		dol_syslog("createFromClone clone_contact=".json_encode($clone_contact)." clone_task=".json_encode($clone_task)." clone_project_file=".json_encode($clone_project_file)." clone_note=".json_encode($clone_note)." move_date=".json_encode($move_date), LOG_DEBUG);
 
@@ -1900,7 +1901,7 @@ class Project extends CommonObject
 
 		unset($clone_project->context['createfromclone']);
 
-		if (!$error) {
+		if (!$error && $clone_project_id != 0) {
 			$this->db->commit();
 			return $clone_project_id;
 		} else {

From 44ef0de1ef1a8440bb666a32bf77990426fba2bb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:05:35 +0100
Subject: [PATCH 19/23] Fix null return by initialising return value, forcing
 type

---
 htdocs/core/class/stats.class.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 14b636dd2ab..135c9118e03 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -129,6 +129,7 @@ abstract class Stats
 		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
+			'@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int}> $data';
 		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
@@ -188,7 +189,7 @@ abstract class Stats
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
-	 * @return 	array 					Array of values
+	 * @return	array<int<0,11>,array<string|int|float>>	Array of values
 	 */
 	public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
@@ -199,6 +200,7 @@ abstract class Stats
 		}
 
 		$datay = array();
+		$data = array();  // Return value
 
 		// Search into cache
 		if (!empty($cachedelay)) {
@@ -238,7 +240,6 @@ abstract class Stats
 				$year++;
 			}
 
-			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
 			for ($i = 0; $i < 12; $i++) {
 				$data[$i][] = isset($datay[$endyear][($i + $sm) % 12]['label']) ? $datay[$endyear][($i + $sm) % 12]['label'] : $datay[$endyear][($i + $sm) % 12][0]; // set label
@@ -272,17 +273,17 @@ abstract class Stats
 	}
 
 	/**
-	 * @param	int     $year           year number
-	 * @return 	array					array of values
+	 *	@param	int     $year           year number
+	 *	@return	array<int<0,11>,array{0:int<1,12>,1:int|float}>	Array of values
 	 */
 	abstract protected function getAverageByMonth($year);
 
 	/**
-	 * Return average of entity by month for several years
+	 *	Return average of entity by month for several years
 	 *
 	 *	@param	int		$endyear		Start year
 	 *	@param	int		$startyear		End year
-	 *	@return array{int<0,11>,array<int|float>}	Array of values
+	 *	@return array<array<int|float>>	Array of values
 	 */
 	public function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
@@ -291,6 +292,7 @@ abstract class Stats
 		}
 
 		$datay = array();
+		$data = array();
 
 		$year = $startyear;
 		while ($year <= $endyear) {
@@ -298,8 +300,6 @@ abstract class Stats
 			$year++;
 		}
 
-		$data = array();
-
 		for ($i = 0; $i < 12; $i++) {
 			$data[$i][] = $datay[$endyear][$i][0];
 			$year = $startyear;
@@ -353,6 +353,7 @@ abstract class Stats
 		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
+			'@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data';  // Phan can't decode json_decode's return value
 		} else {
 			// This method is defined in parent object only, not into abstract, so we disable phpstan warning
 			/** @phpstan-ignore-next-line */

From 5ee5a4ac2c705b8225a4eff1ee0068b1b197462d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:49:03 +0100
Subject: [PATCH 20/23] Suppress PhanDeprecatedFunction message for stripe

---
 htdocs/stripe/admin/stripe.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index d5a27ba20fb..919e80088c6 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  * Copyright (C) 2018-2022  Thibault FOUCART		<support@ptibogxiv.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -256,6 +257,7 @@ if (empty($conf->stripeconnect->enabled)) {
 						}
 					}
 					$endpoint->url = $url;
+					// @phan-suppress-next-line PhanDeprecatedFunction
 					$endpoint->save();
 
 					if ($endpoint->status == 'enabled') {
@@ -328,6 +330,7 @@ if (empty($conf->stripeconnect->enabled)) {
 						}
 					}
 					$endpoint->url = $url;
+					// @phan-suppress-next-line PhanDeprecatedFunction
 					$endpoint->save();
 					if ($endpoint->status == 'enabled') {
 						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';

From 942239b5d633be96558b2ac59c3f6543a2d52a81 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:56:20 +0100
Subject: [PATCH 21/23] Update PHPdoc to show nullable return

---
 htdocs/core/db/sqlite3.class.php              | 12 ++++++------
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 060e7318b65..1c28d1d71a8 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -389,14 +389,14 @@ class DoliDBSqlite3 extends DoliDB
 	}
 
 	/**
-	 *  Execute a SQL request and return the resultset
+	 *	Execute a SQL request and return the resultset
 	 *
-	 * 	@param	string	$query			SQL query string
-	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
+	 *	@param	string	$query			SQL query string
+	 *	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
 	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @param	int		$result_mode	Result mode (not used with sqlite)
-	 *	@return	bool|SQLite3Result		Resultset of answer
+	 *	@param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *	@param	int		$result_mode	Result mode (not used with sqlite)
+	 *	@return	bool|SQLite3Result|null	Resultset of answer
 	 */
 	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
 	{
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0e0eb57ca22..850ec739d06 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1295,7 +1295,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		}
 
 		if (!$dirfound) {
-			dol_syslog("A module ask to load sql files into ".$reldir." but this directory was not found.", LOG_WARNING);
+			dol_syslog("A module wants to load sql files from ".$reldir." but this directory was not found.", LOG_WARNING);
 		}
 		return $ok;
 	}

From 53c628f2197d1177e53e9420380de8ac12010f84 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 20:06:46 +0100
Subject: [PATCH 22/23] Cast DolEditor::Create to string to avoid mistyping as
 void

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b826ea69205..41a9a69114d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7269,7 +7269,7 @@ abstract class CommonObject
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
-				$out = $doleditor->Create(1, '', true, '', '', '', $morecss);
+				$out = (string) $doleditor->Create(1, '', true, '', '', '', $morecss);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
@@ -7277,7 +7277,7 @@ abstract class CommonObject
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, isModEnabled('fckeditor') && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out = $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);
+				$out = (string) $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}

From 2496d20d4fe19067463e67fe3a615e52c792d80a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 23:38:28 +0100
Subject: [PATCH 23/23] Fix nullable return with if($ok == 1) in stead of
 if($ok)

# Fix nullable return with if($ok == 1) in stead of if($ok)

This seems to be a bug in Phan where if($ok) changes the type of $ok.
Testing with '$ok == 1' instead fixes the issue.

This has been reported to the phan team.
---
 htdocs/core/modules/DolibarrModules.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 850ec739d06..41d2b20efd1 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1126,7 +1126,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 *
 	 * @param  	string 	$reldir 			Relative directory where to scan files. Example: '/install/mysql/' or '/module/sql/'
 	 * @param	string	$onlywithsuffix		Only with the defined suffix
-	 * @return 	int             			Return integer <=0 if KO, >0 if OK
+	 * @return 	int<0,1>             			Return integer <=0 if KO, >0 if OK
 	 */
 	protected function _load_tables($reldir, $onlywithsuffix = '')
 	{
@@ -1135,6 +1135,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		$error = 0;
 		$dirfound = 0;
+		$ok = 1;
 
 		if (empty($reldir)) {
 			return 1;
@@ -1142,9 +1143,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-		$ok = 1;
 		foreach ($conf->file->dol_document_root as $dirroot) {
-			if ($ok) {
+			if ($ok == 1) {
 				$dirsql = $dirroot.$reldir;
 				$ok = 0;