tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8775 from kinglozzer/8774-null-changes

Browse Source 
FIX: Prevent null->null being flagged as a value change (fixes #8774)
This commit is contained in:
Robbie Averill 2019-02-06 23:55:39 +03:00 committed by GitHub
commit 81f90f277d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ORM/DataObject.php
View File

@ -2650,14 +2650,14 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
// if a field is not existing or has strictly changed // if a field is not existing or has strictly changed
if (!isset($this->original[$fieldName]) || $this->original[$fieldName] !== $val) { if (!array_key_exists($fieldName, $this->original) || $this->original[$fieldName] !== $val) {
// TODO Add check for php-level defaults which are not set in the db // TODO Add check for php-level defaults which are not set in the db
// TODO Add check for hidden input-fields (readonly) which are not set in the db // TODO Add check for hidden input-fields (readonly) which are not set in the db
// At the very least, the type has changed // At the very least, the type has changed
$this->changed[$fieldName] = self::CHANGE_STRICT; $this->changed[$fieldName] = self::CHANGE_STRICT;
if ((!isset($this->original[$fieldName]) && $val) if ((!array_key_exists($fieldName, $this->original) && $val)
|| (isset($this->original[$fieldName]) && $this->original[$fieldName] != $val) || (array_key_exists($fieldName, $this->original) && $this->original[$fieldName] != $val)
) { ) {
// Value has changed as well, not just the type // Value has changed as well, not just the type
$this->changed[$fieldName] = self::CHANGE_VALUE; $this->changed[$fieldName] = self::CHANGE_VALUE;

7
tests/php/ORM/DataObjectTest.php
View File

@ -918,6 +918,13 @@ class DataObjectTest extends SapphireTest
$this->assertTrue($obj->isChanged('FirstName', DataObject::CHANGE_STRICT)); $this->assertTrue($obj->isChanged('FirstName', DataObject::CHANGE_STRICT));
$this->assertTrue($obj->isChanged('FirstName', DataObject::CHANGE_VALUE)); $this->assertTrue($obj->isChanged('FirstName', DataObject::CHANGE_VALUE));
$obj->write();
$obj->FirstName = null;
$this->assertFalse($obj->isChanged('FirstName', DataObject::CHANGE_STRICT), 'Unchanged property was marked as changed');
$obj->FirstName = 0;
$this->assertTrue($obj->isChanged('FirstName', DataObject::CHANGE_STRICT), 'Strict (type) change was not detected');
$this->assertFalse($obj->isChanged('FirstName', DataObject::CHANGE_VALUE), 'Type-only change was marked as a value change');
/* Test when there's not field provided */ /* Test when there's not field provided */
$obj = $this->objFromFixture(DataObjectTest\Player::class, 'captain2'); $obj = $this->objFromFixture(DataObjectTest\Player::class, 'captain2');
$this->assertFalse($obj->isChanged()); $this->assertFalse($obj->isChanged());