Fix class name in typing of htdocs/modulebuilder/index.php

Dolibarr · Nov 10, 2024 · 0ec3a57 · 0ec3a57
1 parent 9fe6cd9
commit 0ec3a57
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
@@ -453,7 +453,6 @@ return [
         'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/hrm/skill_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/imports/emptyexample.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/imports/import.php' => ['PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchDimFetch'],
         'htdocs/install/check.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/install/fileconf.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/install/inc.php' => ['PhanPluginUndeclaredVariableIsset'],

diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
@@ -68,7 +68,7 @@ public static function liste_modeles($db, $maxfilenamelength = 0)
  *	Cree un fichier de cartes de visites en fonction du modele de ADHERENT_CARDS_ADDON_PDF
  *
  *	@param	DoliDB		$db				Database handler
- *	@param	array<string,mixed>		$arrayofmembers	Array of members
+ *	@param	array<array{textleft:string,textheader:string,textfooter:string,textright:string,id:int,ref:string,photo:string}>		$arrayofmembers	Array of members
  *	@param	string		$modele			Force modele to use ('' to not force)
  *	@param	Translate	$outputlangs	Object langs to use for translation
  *	@param	string		$outputdir		Output directory

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
@@ -2407,7 +2407,7 @@
 /**
  * Function to put the movable box of a source field
  *
- * @param	array<int,array{label:string,example1:string,required:bool,bool|int<0,1>,position:int}>		$fieldssource	List of source fields
+ * @param	array<int|string,array{label?:string,example1?:string,required?:bool,imported?:bool|int<0,1>,position?:int}>		$fieldssource	List of source fields
  * @param	int		$pos			Pos
  * @param	string	$key			Key
  * @return	void
@@ -2517,10 +2517,10 @@ function getnewkey(&$fieldssource, &$listofkey)
 /**
  * Return array with element inserted in it at position $position
  *
- * @param 	array<int,array{label:string,example1:string,required:bool,bool,position:int}>	$array			Array of field source
+ * @param	array<int|string,array{label?:string,example1?:string,required?:bool,imported?:bool|int<0,1>,position?:int}>		$array			Array of field source
  * @param	int		$position		key of position to insert to
- * @param	array{label:string,example1:string,required:bool,bool,position:int}	$insertArray	Array to insert
- * @return	array<int,array{label:string,example1:string,required:bool,bool,position:int}>
+ * @param	array{label?:string,example1?:string,required?:bool,imported?:bool|int<0,1>,position?:int}		$insertArray	Array to insert
+ * @return	array<int|string,array{label?:string,example1?:string,required?:bool,imported?:bool|int<0,1>,position?:int}>
  */
 function arrayInsert($array, $position, $insertArray)
 {

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
@@ -151,6 +151,7 @@
 // Search modules to edit
 $textforlistofdirs = '<!-- Directory scanned -->'."\n";
 $listofmodules = array();
+'@phan-var-force array<string,array{modulenamewithcase:string,moduledescriptorrelpath:string,moduledescriptorfullpath:string,moduledescriptorrootpath,moduletype?:string}> $listofmodules';
 $i = 0;
 foreach ($dirsrootforscan as $tmpdirread) {
 	$moduletype = 'external';
@@ -1981,7 +1982,7 @@ function getLicenceHeader($user, $langs, $now)
 		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($db);
-				'@phan-var-force DolibarrMOdules $moduleobj';
+				'@phan-var-force DolibarrModules $moduleobj';
 				/** @var DolibarrModules $moduleobj */
 			} catch (Exception $e) {
 				$error++;
@@ -2065,12 +2066,17 @@ function getLicenceHeader($user, $langs, $now)
 		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($db);
-				'@phan-var-force DolibarrMOdules $moduleobj';
+				'@phan-var-force DolibarrModules $moduleobj';
 				/** @var DolibarrModules $moduleobj */
 			} catch (Exception $e) {
 				$error++;
 				dol_print_error($db, $e->getMessage());
 			}
+		} else {
+			$error++;
+			$langs->load("errors");
+			dol_print_error($db, $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+			exit;
 		}
 		$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 
@@ -2249,7 +2255,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -2319,7 +2325,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -2597,7 +2603,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -2772,7 +2778,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -2837,7 +2843,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -2996,7 +3002,7 @@ function getLicenceHeader($user, $langs, $now)
 		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($db);
-				'@phan-var-force DolibarrMOdules $moduleobj';
+				'@phan-var-force DolibarrModules $moduleobj';
 				/** @var DolibarrModules $moduleobj */
 			} catch (Exception $e) {
 				$error++;
@@ -3101,7 +3107,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -3265,7 +3271,7 @@ function getLicenceHeader($user, $langs, $now)
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
-			'@phan-var-force DolibarrMOdules $moduleobj';
+			'@phan-var-force DolibarrModules $moduleobj';
 			/** @var DolibarrModules $moduleobj */
 		} catch (Exception $e) {
 			$error++;
@@ -6626,13 +6632,14 @@ function updateInputField() {
 			if (class_exists($class)) {
 				try {
 					$moduleobj = new $class($db);
-					'@phan-var-force DolibarrMOdules $moduleobj';
+					'@phan-var-force DolibarrModules $moduleobj';
 					/** @var DolibarrModules $moduleobj */
 				} catch (Exception $e) {
 					$error++;
 					dol_print_error($db, $e->getMessage());
 				}
-			} else {
+			}
+			if ($moduleobj === null) {
 				$error++;
 				$langs->load("errors");
 				dol_print_error($db, $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));