Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 29718: (QA follow-up) ISO 8601 allows +02 and +0200

Browse source 
The UTC offset is appended to the time in the form:
    ±[hh]:[mm], ±[hh][mm], or ±[hh]

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2022-01-14 09:07:58 +00:00 committed by Fridolin Somers
parent 5a8535c642
commit d8431acd77
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Koha/DateUtils.pm
View file

@ -142,7 +142,7 @@ sub dt_from_string {
die "Invalid dateformat parameter ($date_format)"; die "Invalid dateformat parameter ($date_format)";
} }
# Add the faculative time part [hh:mm[:ss]] # Add the facultative time part including time zone offset; ISO8601 allows +02 or +0200 too
my $time_re .= qr{ my $time_re .= qr{
( (
[Tt]? [Tt]?
@ -159,7 +159,7 @@ sub dt_from_string {
(?<ampm>\w{2}) (?<ampm>\w{2})
)? )?
( (
(?<utc>[Zz]$)|((?<offset>[\+|\-])(?<hours>[01][0-9]|2[0-3]):(?<minutes>[0-5][0-9])) (?<utc>[Zz]$)|((?<offset>[\+|\-])(?<hours>[01][0-9]|2[0-3]):?(?<minutes>[0-5][0-9])?)
)? )?
)? )?
}xms; }xms;
@ -183,7 +183,7 @@ sub dt_from_string {
} }
if ( $+{offset} ) { if ( $+{offset} ) {
# If offset given, set inbound timezone using it. # If offset given, set inbound timezone using it.
$tz = DateTime::TimeZone->new( name => $+{offset} . $+{hours} . $+{minutes} ); $tz = DateTime::TimeZone->new( name => $+{offset} . $+{hours} . ( $+{minutes} || '00' ) );
} }
} elsif ( $do_fallback && $date_string =~ $fallback_re ) { } elsif ( $do_fallback && $date_string =~ $fallback_re ) {
%dt_params = ( %dt_params = (

10
t/DateUtils.t
View file

@ -144,7 +144,7 @@ like( $@, qr/.*does not match the date format \(rfc3339\).*/, 'dt_from_string sh
# ISO string tests # ISO string tests
subtest 'dt_from_string - iso format' => sub { subtest 'dt_from_string - iso format' => sub {
plan tests => 5; plan tests => 7;
my $module_context = Test::MockModule->new('C4::Context'); my $module_context = Test::MockModule->new('C4::Context');
$module_context->mock( $module_context->mock(
@ -175,8 +175,14 @@ subtest 'dt_from_string - iso format' => sub {
# Sunday January 01, 2012 23:59:59 (UTC) # Sunday January 01, 2012 23:59:59 (UTC)
$dt_iso = dt_from_string( '2012-01-01T23:59:59+02:00', 'iso' ); $dt_iso = dt_from_string( '2012-01-01T23:59:59+02:00', 'iso' );
cmp_ok( $dt_iso->epoch(), 'eq', '1325455199', 'dt_from_string with offset' ); cmp_ok( $dt_iso->epoch(), 'eq', '1325455199', 'dt_from_string with offset +02:00' );
# Sunday January 01, 2012 21:59:59 (UTC) == Sunday January 01, 2012 23:59:59 Europe/Athens (EET/+02:00) # Sunday January 01, 2012 21:59:59 (UTC) == Sunday January 01, 2012 23:59:59 Europe/Athens (EET/+02:00)
# Allow +02 or +0200 too
$dt_iso = dt_from_string( '2012-01-01T23:59:59+02', 'iso' );
cmp_ok( $dt_iso->epoch(), 'eq', '1325455199', 'dt_from_string with offset +02' );
$dt_iso = dt_from_string( '2012-01-01T23:59:59+0200', 'iso' );
cmp_ok( $dt_iso->epoch(), 'eq', '1325455199', 'dt_from_string with offset +0200' );
}; };
# Return undef if passed mysql 0 dates # Return undef if passed mysql 0 dates