lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix phpunit

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-01 14:00:08 +01:00
parent 9aeb1b0f86
commit e0a4070da3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1881,7 +1881,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$obj2 = $this->db->fetch_object($resqlseladmin); $obj2 = $this->db->fetch_object($resqlseladmin);
dol_syslog(get_class($this)."::insert_permissions Add permission id '.$r_id.' to user id=".$obj2->rowid); dol_syslog(get_class($this)."::insert_permissions Add permission id ".$r_id." to user id=".$obj2->rowid);
$tmpuser = new User($this->db); $tmpuser = new User($this->db);
$result = $tmpuser->fetch($obj2->rowid); $result = $tmpuser->fetch($obj2->rowid);
@ -1968,13 +1968,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$menu->menu_handler = 'all'; $menu->menu_handler = 'all';
//$menu->module=strtolower($this->name); TODO When right_class will be same than module name //$menu->module=strtolower($this->name); TODO When right_class will be same than module name
$menu->module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class; $menu->module = (empty($this->rights_class) ? strtolower($this->name) : $this->rights_class);
if (!$this->menu[$key]['fk_menu']) { if (!$this->menu[$key]['fk_menu']) {
$menu->fk_menu = 0; $menu->fk_menu = 0;
} else { } else {
$foundparent = 0; $foundparent = 0;
$fk_parent = $this->menu[$key]['fk_menu']; $fk_parent = $this->menu[$key]['fk_menu'];
$reg = array();
if (preg_match('/^r=/', $fk_parent)) { // old deprecated method if (preg_match('/^r=/', $fk_parent)) { // old deprecated method
$fk_parent = str_replace('r=', '', $fk_parent); $fk_parent = str_replace('r=', '', $fk_parent);
if (isset($this->menu[$fk_parent]['rowid'])) { if (isset($this->menu[$fk_parent]['rowid'])) {

6
test/phpunit/AdminLibTest.php
View File

@ -165,6 +165,9 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
print "Enable module modExpenseReport"; print "Enable module modExpenseReport";
$moduledescriptor=new modExpenseReport($db); $moduledescriptor=new modExpenseReport($db);
$result = $moduledescriptor->remove();
$result = $moduledescriptor->init(); $result = $moduledescriptor->init();
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertEquals(1, $result); $this->assertEquals(1, $result);
@ -173,6 +176,9 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
print "Enable module modAPI"; print "Enable module modAPI";
$moduledescriptor=new modApi($db); $moduledescriptor=new modApi($db);
$result = $moduledescriptor->remove();
$result = $moduledescriptor->init(); $result = $moduledescriptor->init();
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertEquals(1, $result); $this->assertEquals(1, $result);