From dba4ea1c36d4932ff75885ca110430a9a844b820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 19 Sep 2018 16:34:12 +0200 Subject: [PATCH] fix error when interval is hours only --- CHANGELOG.md | 5 +++++ Doctrine/Type/NativeDateIntervalType.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0b0641be..6278f42a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,3 +13,8 @@ Version 1.5.2 - allow to filters users shown by `UserPickerType` based on flags. This flags do an additional filter based on the flags assigned in permissions groups; - add a method to filters users by permissions groups flags in `UserRepository` +Master branch +============= + +- fix error when interval is hour only + diff --git a/Doctrine/Type/NativeDateIntervalType.php b/Doctrine/Type/NativeDateIntervalType.php index bc4938e97..38c704a2d 100644 --- a/Doctrine/Type/NativeDateIntervalType.php +++ b/Doctrine/Type/NativeDateIntervalType.php @@ -92,8 +92,8 @@ class NativeDateIntervalType extends DateIntervalType return $current.$unit; - } elseif (\preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $v) === 1) { - $tExploded = explode(':', $v); + } elseif (\preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $current) === 1) { + $tExploded = explode(':', $current); $intervalSpec = 'T'; $intervalSpec.= $tExploded[0].'H'; $intervalSpec.= $tExploded[1].'M';