diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index ea35c641c945a..8b0ca51253786 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -39,21 +39,21 @@ * 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', 'banque' => 'bank', 'categorie' => 'category', 'commande' => 'order', 'contrat' => 'contract', - 'entrepot' => 'stock', + // 'entrepot' => 'stock', // Not aliased, unsupported 'expedition' => 'shipping', 'facture' => 'invoice', 'ficheinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', 'product_price' => 'productprice', 'projet' => 'project', - 'propale' => 'propal', + // 'propale' => 'propal', // Not aliased, unsupported 'socpeople' => 'contact', ); diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php index ee5db8c46d49b..8133eb0bd52c0 100644 --- a/test/phpunit/CommonClassTest.class.php +++ b/test/phpunit/CommonClassTest.class.php @@ -302,21 +302,21 @@ 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', 'banque' => 'bank', 'categorie' => 'category', 'commande' => 'order', 'contrat' => 'contract', - 'entrepot' => 'stock', + // 'entrepot' => 'stock', // Not supported 'expedition' => 'shipping', 'facture' => 'invoice', 'fichinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', 'product_price' => 'productprice', 'projet' => 'project', - 'propale' => 'propal', + // 'propale' => 'propal', // Not supported 'socpeople' => 'contact', ); diff --git a/test/phpunit/ConfTest.php b/test/phpunit/ConfTest.php index 9b83d413c590e..c6a9e8f8685df 100644 --- a/test/phpunit/ConfTest.php +++ b/test/phpunit/ConfTest.php @@ -86,6 +86,5 @@ public function testModulePaths($old, $new) 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"); } }