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

Fix test on verifCond for value 0

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-18 13:17:48 +01:00
parent 0c9fb16a36
commit e609622f2b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@ -8082,7 +8082,7 @@ function verifCond($strRights)
//print $strRights."<br>\n"; //print $strRights."<br>\n";
$rights = true; $rights = true;
if ($strRights != '') { if ($strRights !== '') {
$str = 'if(!('.$strRights.')) { $rights = false; }'; $str = 'if(!('.$strRights.')) { $rights = false; }';
dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition
} }

12
test/phpunit/FunctionsLibTest.php
View File

@ -1048,13 +1048,19 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
$this->assertFalse($verifcond, 'Test a false comparison'); $this->assertFalse($verifcond, 'Test a false comparison');
$verifcond=verifCond('$conf->facture->enabled'); $verifcond=verifCond('$conf->facture->enabled');
$this->assertTrue($verifcond, 'Test that conf property of a module report true when enabled'); $this->assertTrue($verifcond, 'Test that the conf property of a module reports true when enabled');
$verifcond=verifCond('$conf->moduledummy->enabled'); $verifcond=verifCond('$conf->moduledummy->enabled');
$this->assertFalse($verifcond, 'Test that conf property of a module report false when disabled'); $this->assertFalse($verifcond, 'Test that the conf property of a module reports false when disabled');
$verifcond=verifCond(0);
$this->assertFalse($verifcond, 'Test that verifConf(0) return False');
$verifcond=verifCond("0");
$this->assertFalse($verifcond, 'Test that verifConf("0") return False');
$verifcond=verifCond(''); $verifcond=verifCond('');
$this->assertTrue($verifcond); $this->assertTrue($verifcond, 'Test that verifConf("") return False (special case)');
} }
/** /**