fix phan

htdocs/core/db/Database.interface.php

@@ -6,6 +6,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 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
@@ -49,7 +50,7 @@ public function stddevpop($nameoffield);
 	 * Return datas as an array
 	 * @TODO deprecate this. Use fetch_object() so you can access a field with its name instead of using an index of position of field.
 	 *
-	 * @param   mysqli_result|resource $resultset 	Resultset of request
+	 * @param   mysqli_result|resource|SQLite3Result $resultset 	Resultset of request
 	 * @return  array                   			Array
 	 */
 	public function fetch_row($resultset);
@@ -114,7 +115,7 @@ public function convertSQLFromMysql($line, $type = 'ddl');
 	/**
 	 * Return the number of lines in the result of a request INSERT, DELETE or UPDATE
 	 *
-	 * @param   mysqli_result|resource $resultset 	Cursor of the desired request
+	 * @param   mysqli_result|resource|SQLite3Result $resultset 	Cursor of the desired request
 	 * @return 	int            						Number of lines
 	 * @see    	num_rows()
 	 */
@@ -413,7 +414,7 @@ public function getListOfCollation();
 	 *
 	 * @param    string 	$table 			Name of table
 	 * @param    string 	$field 			Optional : Name of field if we want description of field
-	 * @return   resource            		Resource
+	 * @return   bool|resource|mysqli_result|SQLite3Result            Resource
 	 */
 	public function DDLDescTable($table, $field = "");
 	// phpcs:enable

htdocs/product/admin/product_lot.php

@@ -395,7 +395,9 @@
 	$num_rows = $db->num_rows($resql);
 	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
+		if (is_array($array)) {
+			array_push($def, $array[0]);
+		}
 		$i++;
 	}
 } else {

htdocs/product/class/product.class.php

@@ -2883,9 +2883,10 @@ public function fetch($id = 0, $ref = '', $ref_ext = '', $barcode = '', $ignore_
 						$sql .= " ORDER BY date_price DESC, rowid DESC";
 						$sql .= " LIMIT 1";
 						$resql = $this->db->query($sql);
-						if ($resql) {
-							$result = $this->db->fetch_array($resql);
-
+						if (!$resql) {
+							$this->error = $this->db->lasterror;
+							return -1;
+						} elseif ($result = $this->db->fetch_array($resql)) {
 							$this->multiprices[$i] = (!empty($result["price"]) ? $result["price"] : 0);
 							$this->multiprices_ttc[$i] = (!empty($result["price_ttc"]) ? $result["price_ttc"] : 0);
 							$this->multiprices_min[$i] = (!empty($result["price_min"]) ? $result["price_min"] : 0);
@@ -2926,9 +2927,6 @@ public function fetch($id = 0, $ref = '', $ref_ext = '', $barcode = '', $ignore_
 									return -1;
 								}
 							}
-						} else {
-							$this->error = $this->db->lasterror;
-							return -1;
 						}
 					}
 				}
@@ -5663,23 +5661,22 @@ public function getLibFinished()
 	{
 		global $langs;
 		$langs->load('products');
+		$label = '';
 
 		if (isset($this->finished) && $this->finished >= 0) {
 			$sql = "SELECT label, code FROM ".$this->db->prefix()."c_product_nature where code = ".((int) $this->finished)." AND active=1";
 			$resql = $this->db->query($sql);
-			if ($resql && $this->db->num_rows($resql) > 0) {
-				$res = $this->db->fetch_array($resql);
-				$label = $langs->trans($res['label']);
-				$this->db->free($resql);
-				return $label;
-			} else {
+			if (!$resql) {
 				$this->error = $this->db->error().' sql='.$sql;
 				dol_syslog(__METHOD__.' Error '.$this->error, LOG_ERR);
 				return -1;
+			} elseif ($this->db->num_rows($resql) > 0 && $res = $this->db->fetch_array($resql)) {
+				$label = $langs->trans($res['label']);
 			}
+			$this->db->free($resql);
 		}
 
-		return '';
+		return $label;
 	}
 
 
@@ -6445,7 +6442,7 @@ public function getLabelOfUnit($type = 'long')
 		}
 
 		$langs->load('products');
-
+		$label = '';
 		$label_type = 'label';
 		if ($type == 'short') {
 			$label_type = 'short_label';
@@ -6454,16 +6451,16 @@ public function getLabelOfUnit($type = 'long')
 		$sql = "SELECT ".$label_type.", code from ".$this->db->prefix()."c_units where rowid = ".((int) $this->fk_unit);
 
 		$resql = $this->db->query($sql);
-		if ($resql && $this->db->num_rows($resql) > 0) {
-			$res = $this->db->fetch_array($resql);
-			$label = ($label_type == 'short_label' ? $res[$label_type] : 'unit'.$res['code']);
-			$this->db->free($resql);
-			return $label;
-		} else {
+		if (!$resql) {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
+		} elseif ($this->db->num_rows($resql) > 0 && $res = $this->db->fetch_array($resql)) {
+			$label = ($label_type == 'short_label' ? $res[$label_type] : 'unit'.$res['code']);
 		}
+		$this->db->free($resql);
+
+		return $label;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

htdocs/product/stock/lib/replenishment.lib.php

@@ -132,8 +132,7 @@ function ordered($product_id)
 	$resql = $db->query($sql);
 	if ($resql) {
 		$exists = $db->num_rows($resql);
-		if ($exists) {
-			$obj = $db->fetch_array($resql);
+		if ($exists && $obj = $db->fetch_array($resql)) {
 			return $obj['qty']; //. ' ' . img_picto('','tick');
 		} else {
 			return null; //img_picto('', 'stcomm-1');