Comment out unsupported module mappings

Dolibarr · Aug 20, 2024 · 7d3dc69 · 7d3dc69
1 parent 26d0873
commit 7d3dc69
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
@@ -39,14 +39,14 @@
  * Map deprecated module names to new module names
  */
 $DEPRECATED_MODULE_MAPPING = array(
-	'actioncomm' => 'agenda',
+	// 'actioncomm' => 'agenda',  // Not aliased, unsupported
 	'adherent' => 'member',
-	'adherent_type' => 'member_type',
+	// 'adherent_type' => 'member_type',  // Not aliased, unsupported
 	'banque' => 'bank',
 	'categorie' => 'category',
 	'commande' => 'order',
 	'contrat' => 'contract',
-	'entrepot' => 'stock',
+	// 'entrepot' => 'stock',  // Not aliased, unsupported
 	'expedition' => 'shipping',
 	'facture' => 'invoice',
 	'ficheinter' => 'intervention',

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
@@ -302,14 +302,14 @@ public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray =
 	 * Map deprecated module names to new module names
 	 */
 	const DEPRECATED_MODULE_MAPPING = array(
-		'actioncomm' => 'agenda',
+		// 'actioncomm' => 'agenda', // Not supported
 		'adherent' => 'member',
-		'adherent_type' => 'member_type',
+		// 'adherent_type' => 'member_type',  // Not supported  (Undefined property: Conf::$adherent_type)
 		'banque' => 'bank',
 		'categorie' => 'category',
 		'commande' => 'order',
 		'contrat' => 'contract',
-		'entrepot' => 'stock',
+		// 'entrepot' => 'stock',  // Not supported
 		'expedition' => 'shipping',
 		'facture' => 'invoice',
 		'fichinter' => 'intervention',
@@ -322,7 +322,7 @@ public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray =
 
 	const EFFECTIVE_DEPRECATED_MODULE_MAPPING = array(
 		'adherent' => 'member',
-		'adherent_type' => 'member_type',
+		// 'adherent_type' => 'member_type',  // Not supported (Undefined property: Conf::$adherent_type)
 		'banque' => 'bank',
 		'contrat' => 'contract',
 		'entrepot' => 'stock',

diff --git a/test/phpunit/ConfTest.php b/test/phpunit/ConfTest.php
@@ -83,9 +83,8 @@ public function testModulePaths($old, $new)
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		print "DIR_OUTPUT for $old is {$conf->$old->dir_output}".PHP_EOL;
-		print "DIR_OUTPUT for $new is {$conf->$new->dir_output}".PHP_EOL;
-		$this->assertEquals($conf->$old->dir_output, $conf->$new->dir_output, "Old and new dir_output must be equal");
-		$this->assertEquals($conf->$old->dir_output, $conf->$new->dir_output, "Old and new dir_output must be equal");
+		// print "DIR_OUTPUT for $old is {$conf->$old->dir_output}".PHP_EOL;
+		// print "DIR_OUTPUT for $new is {$conf->$new->dir_output}".PHP_EOL;
+		$this->assertEquals($conf->$new->dir_output, $conf->$old->dir_output, "Old ($old/expected) and new dir_output ($new/result) must be equal");
 	}
 }