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

Fix exception when generating changeRequest XML where the oldProperty is null and newProperty is a DateTime #380

Open
wants to merge 2 commits into
base: v7
Choose a base branch
from
Open

Fix exception when generating changeRequest XML where the oldProperty is null and newProperty is a DateTime #380

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4febf2
Fix exception when oldProperty is null
siwa-tkapplmueller Jul 19, 2021
baf2cb0
use type safe comparisons, use instanceof instead of get_class
siwa-tkapplmueller Jul 19, 2021
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
14 changes: 9 additions & 5 deletions Classes/Utility/UserUtility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,18 +246,22 @@ public static function getDirtyPropertiesFromUser(User $changedObject)
&& !in_array($propertyName, $ignoreProperties)
) {
$newPropertyValue = $changedObject->{'get' . ucfirst($propertyName)}();
if (!is_object($oldPropertyValue) || !is_object($newPropertyValue)) {
if (!is_object($oldPropertyValue) && !is_object($newPropertyValue)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can move the condition of the next line into this condition.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That condition should probably stay as is, otherwise the else part starting in line 267 is entered when it shouldn't be.

if ($oldPropertyValue !== $newPropertyValue) {
$dirtyProperties[$propertyName]['old'] = $oldPropertyValue;
$dirtyProperties[$propertyName]['new'] = $newPropertyValue;
}
} else {
if (get_class($oldPropertyValue) === 'DateTime') {
if (($oldPropertyValue != null && get_class($oldPropertyValue) === 'DateTime') || ($newPropertyValue != null && get_class($newPropertyValue) === 'DateTime')) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use type safe comparisons (!==)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, use $oldPropertyValue instanceof \DateTime::class instead of get_class.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added your suggestions, but i left out the ::class since \DateTime is already the fully qualified class name.

/** @var $oldPropertyValue \DateTime */
/** @var $newPropertyValue \DateTime */
if ($oldPropertyValue->getTimestamp() !== $newPropertyValue->getTimestamp()) {
$dirtyProperties[$propertyName]['old'] = $oldPropertyValue->getTimestamp();
$dirtyProperties[$propertyName]['new'] = $newPropertyValue->getTimestamp();

$oldTimestamp = $oldPropertyValue != null ? $oldPropertyValue->getTimestamp() : 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$oldPropertyValue cannot be null and must therefore be a DateTime object, it's checked in the condition before.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition in line 255 only checks if at least one of the two propertyValues is a DateTime. Therefore either one of them could still be null inside the condition and has to checked again,

$newTimestamp = $newPropertyValue != null ? $newPropertyValue->getTimestamp() : 0;

if ($oldTimestamp !== $newTimestamp) {
$dirtyProperties[$propertyName]['old'] = $oldTimestamp;
$dirtyProperties[$propertyName]['new'] = $newTimestamp;
}
} else {
$titlesOld = ObjectUtility::implodeObjectStorageOnProperty($oldPropertyValue);
Expand Down