Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-31681: Fixed Image Value comparison via FT Comparable contract #3060

Merged
merged 19 commits into from
Nov 18, 2020
Merged

EZP-31681: Fixed Image Value comparison via FT Comparable contract #3060

Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a8ed57a
EZEE-3159: comparing fieldType's hash and additional verification for…
Aug 26, 2020
46e6087
EZP-31681: changed function name
Aug 26, 2020
2118cd6
EZP-31681: changed function name
Aug 26, 2020
f4d7976
Added typehint
Sep 7, 2020
4752121
Added typehint, and moved to first check if fieldType is imageType
Sep 7, 2020
41ea756
Added new interface for Comparable values for fieldType and added new…
Sep 10, 2020
54659b1
Changed test and interface to generate a hash to compare in isEqual f…
Sep 14, 2020
e049ce3
Merge remote-tracking branch 'origin/7.5' into EZP-31681
Sep 25, 2020
b3a7981
changed after CR
Oct 15, 2020
e051063
corrected CS
Oct 15, 2020
056ac8e
Merge remote-tracking branch 'origin/7.5' into EZP-31681
Oct 21, 2020
aae5699
corrected CS and moved valuesEqual test to FiledTypeTest
Oct 21, 2020
a862c7a
corrected test valuesEqual
Oct 22, 2020
2bdb949
corrected CS
Oct 22, 2020
f8654d6
corrected provideInputForValuesEqual to use provideInputForFromHash i…
Oct 26, 2020
efcbb9c
Corrected CS, added throws in PHPDoc
Oct 29, 2020
f75eb08
Corrected CS
Oct 30, 2020
489f8fe
Merge remote-tracking branch 'origin/7.5' into EZP-31681
Nov 16, 2020
28c932a
Changed var name and added docblock
Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion eZ/Publish/Core/Repository/ContentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ protected function copyTranslationsFromPublishedVersion(APIVersionInfo $versionI

if ($newValue !== null
&& $field->value !== null
&& $fieldType->toHash($newValue) === $fieldType->toHash($field->value)) {
&& $this->isHashEqual($fieldType, $newValue, $field->value)) {
mateuszdebinski marked this conversation as resolved.
Show resolved Hide resolved
continue;
}

Expand All @@ -1742,6 +1742,21 @@ protected function copyTranslationsFromPublishedVersion(APIVersionInfo $versionI
$this->internalUpdateContent($versionInfo, $updateStruct);
}

protected function isHashEqual($fieldType, $newValue, $fieldValue): bool
mateuszdebinski marked this conversation as resolved.
Show resolved Hide resolved
{
$newHash = $fieldType->toHash($newValue);
$currentHash = $fieldType->toHash($fieldValue);
if ($newHash === $currentHash) {
mateuszdebinski marked this conversation as resolved.
Show resolved Hide resolved
return true;
} elseif ($fieldType instanceof \eZ\Publish\Core\FieldType\Image\Type) {
$imageHashDiff = array_diff($newHash, $currentHash);

return count($imageHashDiff) === 1 && !empty($imageHashDiff['imageId']);
}
mateuszdebinski marked this conversation as resolved.
Show resolved Hide resolved

return false;
}

/**
* Publishes a content version.
*
Expand Down