Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 2.6.1 under development

- Bug #819: Preserve microsecond precision when comparing date values in `UniqueIterable` (@samdark)
- Bug #817: Fix `UniqueIterable` comparing the whole iterable instead of its items (@CorvusSharp)

## 2.6.0 June 02, 2026
Expand Down
3 changes: 2 additions & 1 deletion src/Rule/UniqueIterableHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public function validate(mixed $value, RuleInterface $rule, ValidationContext $c
if ($item instanceof Stringable) {
$stack[] = (string) $item;
} elseif ($item instanceof DateTimeInterface) {
$stack[] = $item->getTimestamp();
// Use a non-numeric separator to preserve microseconds during comparison.
$stack[] = $item->format('U:u');
} else {
$stack[] = $item;
}
Expand Down
23 changes: 23 additions & 0 deletions tests/Rule/UniqueIterableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Yiisoft\Validator\Tests\Rule;

use DateTime;
use DateTimeImmutable;
use stdClass;
use Stringable;
use Yiisoft\Validator\PropertyTranslator\ArrayPropertyTranslator;
Expand Down Expand Up @@ -120,6 +121,20 @@ public function __toString()
[new DateTime('2024-04-10 14:05:01'), new DateTime('2024-04-10 14:05:02')],
new UniqueIterable(),
],
'datetime values with different microseconds' => [
[
new DateTime('2024-04-10 14:05:01.000001 UTC'),
new DateTime('2024-04-10 14:05:01.000002 UTC'),
],
new UniqueIterable(),
],
'distant datetime values with different microseconds' => [
[
new DateTimeImmutable('9999-04-10 14:05:01.000001 UTC'),
new DateTimeImmutable('9999-04-10 14:05:01.000002 UTC'),
],
new UniqueIterable(),
],
'more than two unique strings' => [['a', 'b', 'c'], new UniqueIterable()],
'more than two unique integers' => [[1, 2, 3, 4], new UniqueIterable()],
'more than two unique floats' => [[1.5, 2.5, 3.5], new UniqueIterable()],
Expand Down Expand Up @@ -284,6 +299,14 @@ public function __toString()
new UniqueIterable(),
['' => [$message]],
],
'equal datetime values with microseconds in different timezones' => [
[
new DateTime('2024-04-10 14:05:01.123456 +00:00'),
new DateTime('2024-04-10 17:05:01.123456 +03:00'),
],
new UniqueIterable(),
['' => [$message]],
],
'strings' => [['a', 'b', 'a', 'c'], new UniqueIterable(), ['' => [$message]]],
'integers' => [[1, 2, 1, 3], new UniqueIterable(), ['' => [$message]]],
'floats' => [[1.5, 2.5, 1.5, 3.5], new UniqueIterable(), ['' => [$message]]],
Expand Down
Loading