composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6903 - Fix crash when emptying file attribute (eg. picture of a contact)

Browse Source
This commit is contained in:
Molkobain
2023-11-09 18:17:35 +01:00
parent 34ba4fa0ce
commit 2d8ecd465b
2 changed files with 143 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/attributedef.class.inc.php
View File

@@ -8599,7 +8599,7 @@ class AttributeBlob extends AttributeDefinition
public function RecordAttChange(DBObject $oObject, $original, $value): void
{
// N°6502 Don't record history if only the download count has changed
if ($original->EqualsExceptDownloadsCount($value)) {
if ((null !== $original) && (null !== $value) && $original->EqualsExceptDownloadsCount($value)) {
return;
}

142
tests/php-unit-tests/unitary-tests/core/ormDocumentTest.php Normal file
View File

@@ -0,0 +1,142 @@
<?php
/*!
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use ormDocument;
/**
* Tests of the ormDocument class
*/
class ormDocumentTest extends ItopDataTestCase
{
/**
* @inheritDoc
*/
protected function LoadRequiredItopFiles(): void
{
parent::LoadRequiredItopFiles();
$this->RequireOnceItopFile('core/ormdocument.class.inc.php');
}
/**
* @param array $aDocAData
* @param array $aDocBData
* @param bool $bExpectedResult
*
* @dataProvider EqualsExceptDownloadsCountProvider
*/
public function testEqualsExceptDownloadsCount(array $aDocAData, array $aDocBData, bool $bExpectedResult)
{
$oDocA = new ormDocument(base64_decode($aDocAData[0]), $aDocAData[1], $aDocAData[2], $aDocAData[3]);
$oDocB = new ormDocument(base64_decode($aDocBData[0]), $aDocBData[1], $aDocBData[2], $aDocBData[3]);
$bTestedResult = $oDocA->EqualsExceptDownloadsCount($oDocB);
$this->assertSame($bExpectedResult, $bTestedResult);
}
public function EqualsExceptDownloadsCountProvider(): array
{
$sFirstDummyTextFileContentBase64 = "Rmlyc3Q=";
$sSecondDummyTextFileContentBase64 = "U2Vjb25k";
return [
'Total different files' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sSecondDummyTextFileContentBase64,
"image/png",
"b.png",
1
],
false,
],
'Different data only' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sSecondDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
false,
],
'Different mime types only' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sFirstDummyTextFileContentBase64,
"image/png",
"a.txt",
0
],
false,
],
'Different file names only' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"b.txt",
0
],
false,
],
'Different download counts only' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
1
],
true,
],
'Identical files, different object instances' => [
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
[
$sFirstDummyTextFileContentBase64,
"text/plain",
"a.txt",
0
],
false,
],
];
}
}