composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-16 22:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retrofit from trunk

Browse Source 
DBObject->GetOriginal() hardening (now support attributes not set: for example sla_tto_passed for UserRequest until it is closed)
[from revision 5932]

SVN:2.5[5942]
This commit is contained in:
Eric Espié
2018-07-17 12:19:26 +00:00
parent 6e9fcb81f0
commit e184eb6aae
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/dbobject.class.php
View File

@@ -568,7 +568,8 @@ abstract class DBObject implements iDisplay
{
throw new CoreException("Unknown attribute code '$sAttCode' for the class ".get_class($this));
}
return $this->m_aOrigValues[$sAttCode];
$aOrigValues = $this->m_aOrigValues;
return isset($aOrigValues[$sAttCode]) ? $aOrigValues[$sAttCode] : null;
}
/**

20
test/ItopDataTestCase.php
View File

@@ -112,6 +112,26 @@ class ItopDataTestCase extends ItopTestCase
return $oMyObj;
}
/**
* @param string $sClass
* @param $iKey
* @param array $aParams
*
* @return DBObject
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue
*/
protected static function updateObject($sClass, $iKey, $aParams)
{
$oMyObj = MetaModel::GetObject($sClass, $iKey);
foreach($aParams as $sAttCode => $oValue)
{
$oMyObj->Set($sAttCode, $oValue);
}
$oMyObj->DBUpdate();
return $oMyObj;
}
/**
* Create an Organization in database

16
test/core/DBObjectTest.php
View File

@@ -26,9 +26,8 @@
namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DBObject;
use PHPUnit\Framework\TestCase;
/**
@@ -36,7 +35,7 @@ use PHPUnit\Framework\TestCase;
* @preserveGlobalState disabled
* @backupGlobals disabled
*/
class DBObjectTest extends ItopTestCase
class DBObjectTest extends ItopDataTestCase
{
protected function setUp()
{
@@ -50,7 +49,7 @@ class DBObjectTest extends ItopTestCase
*/
public function testGetUIPage()
{
$this->assertEquals('UI.php', DBObject::GetUIPage());
static::assertEquals('UI.php', DBObject::GetUIPage());
}
/**
@@ -61,7 +60,7 @@ class DBObjectTest extends ItopTestCase
*/
public function testIsValidPKeyOK($key, $res)
{
$this->assertEquals(DBObject::IsValidPKey($key), $res);
static::assertEquals(DBObject::IsValidPKey($key), $res);
}
public function keyProviderOK()
@@ -80,4 +79,11 @@ class DBObjectTest extends ItopTestCase
array('PHP_INT_MIN', false));
}
public function testGetOriginal()
{
$oObject = $this->CreateUserRequest(190664);
static::assertNull($oObject->GetOriginal('sla_tto_passed'));
}
}