Skip to content

IBX-11818: added fallback to null value when key 'timestamp' not exists in $value->data array #757

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

Open
papcio122 wants to merge 5 commits into
base: 5.0
Choose a base branch
from
Open

IBX-11818: added fallback to null value when key 'timestamp' not exists in $value->data array #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e95881c
IBX-11818: added fallback to null value when key 'timestamp' not exis…
papcio122 May 29, 2026
589981f
IBX-11818: adjust php-stan baseline
papcio122 Jun 2, 2026
eef490c
IBX-11818: after review fix; cover $value->data being null
papcio122 Jun 9, 2026
f08a3f5
IBX-11818: add test for $value->data being null and no timestamp key
papcio122 Jun 9, 2026
b95c1c6
IBX-11818: used data provider for testToStorageValueMissingData
papcio122 Jun 9, 2026
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
6 changes: 0 additions & 6 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10860,12 +10860,6 @@ parameters:
count: 1
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/CountryConverter.php

-
message: '#^Cannot access offset ''timestamp'' on array\|bool\|float\|int\|string\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 1
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php

-
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\FieldValue\\Converter\\DateAndTimeConverter\:\:getDateIntervalFromXML\(\) should return DateInterval but empty return statement found\.$#'
identifier: return.empty
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function toStorageValue(FieldValue $value, StorageFieldValue $storageFiel
{
// @todo: One should additionally store the timezone here. This could

@ViniTou ViniTou Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If we are SO CLOSE to this. Can we drop that comment? ;)

@papcio122 papcio122 Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Should I just remove it?
Or somehow store the timezone here? 😅

@konradoboza konradoboza Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Remove it.

// be done in a backwards compatible way, I think…
$storageFieldValue->dataInt = ($value->data !== null ? $value->data['timestamp'] : null);
$storageFieldValue->dataInt = is_array($value->data) ? ($value->data['timestamp'] ?? null) : null;
$storageFieldValue->sortKeyInt = (int)$value->sortKey;
}

Expand Down
39 changes: 39 additions & 0 deletions tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check warning on line 1 in tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: single_blank_line_before_namespace

Check warning on line 1 in tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: header_comment

Check warning on line 1 in tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: trailing_comma_in_multiline

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
Expand Down Expand Up @@ -84,6 +84,45 @@
self::assertSame($storageFieldValue->sortKeyInt, $fieldValue->sortKey);
}

/**
* @return mixed[]
*/
public function providerForTestToStorageValueMissingData(): array
{
return [
[
[
'current_time' => 1048633200,
'rfc850' => 'Thu, 01 Jan 2003 00:00:00 GMT',
],
Comment on lines +94 to +97

@konradoboza konradoboza Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we need to wrap it in several arrays?

],
[
null,
]
];
}

/**
* @group fieldType
* @group dateTime
*
* @dataProvider providerForTestToStorageValueMissingData
*
* @param mixed[]|null $data
*/
public function testToStorageValueNoTimestampKey(?array $data): void
{
$value = new FieldValue();
$value->data = $data;
$value->sortKey = $this->date->getTimestamp();
$storageFieldValue = new StorageFieldValue();

$this->converter->toStorageValue($value, $storageFieldValue);
self::assertNull($storageFieldValue->dataInt);
self::assertSame($value->sortKey, $storageFieldValue->sortKeyInt);
self::assertSame('', $storageFieldValue->sortKeyString);
}

/**
* @group fieldType
* @group dateTime
Expand Down
Loading