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

Fix phpunit

Browse Source
This commit is contained in:
Laurent Destailleur 2022-04-28 22:28:32 +02:00
parent 40d0c3b996
commit 822a0a37f3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/admin.lang
View File

@ -2143,7 +2143,7 @@ DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector? ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access. RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
IPListExample=127.0.0.1 192.168.0.2 [::1] IPListExample=127.0.0.1 192.168.0.2 [::1]
BaseOnSabeDavVersion=Based on the library SabreDAV version BaseOnSabeDavVersion=Based on the library SabreDAV version
NotAPublicIp=Not a public IP NotAPublicIp=Not a public IP

4
htdocs/user/class/user.class.php
View File

@ -437,6 +437,8 @@ class User extends CommonObject
$sql .= " u.tms as datem,"; $sql .= " u.tms as datem,";
$sql .= " u.datelastlogin as datel,"; $sql .= " u.datelastlogin as datel,";
$sql .= " u.datepreviouslogin as datep,"; $sql .= " u.datepreviouslogin as datep,";
$sql .= " u.iplastlogin,";
$sql .= " u.ippreviouslogin,";
$sql .= " u.datelastpassvalidation,"; $sql .= " u.datelastpassvalidation,";
$sql .= " u.datestartvalidity,"; $sql .= " u.datestartvalidity,";
$sql .= " u.dateendvalidity,"; $sql .= " u.dateendvalidity,";
@ -564,6 +566,8 @@ class User extends CommonObject
$this->datem = $this->db->jdate($obj->datem); $this->datem = $this->db->jdate($obj->datem);
$this->datelastlogin = $this->db->jdate($obj->datel); $this->datelastlogin = $this->db->jdate($obj->datel);
$this->datepreviouslogin = $this->db->jdate($obj->datep); $this->datepreviouslogin = $this->db->jdate($obj->datep);
$this->iplastlogin = $obj->iplastlogin;
$this->ippreviouslogin = $obj->ippreviouslogin;
$this->datestartvalidity = $this->db->jdate($obj->datestartvalidity); $this->datestartvalidity = $this->db->jdate($obj->datestartvalidity);
$this->dateendvalidity = $this->db->jdate($obj->dateendvalidity); $this->dateendvalidity = $this->db->jdate($obj->dateendvalidity);

2
test/phpunit/UserTest.php
View File

@ -204,7 +204,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$newlocalobject=new User($this->savdb); $newlocalobject=new User($this->savdb);
$newlocalobject->initAsSpecimen(); $newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject); $this->changeProperties($newlocalobject);
$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','trackid')), array()); // Actual, Expected $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','iplastlogin','ippreviouslogin','trackid')), array()); // Actual, Expected
return $localobject; return $localobject;
} }