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

Support up to microsecond precision input timestamps #37

Merged
merged 4 commits into from
Dec 15, 2021
Merged

Support up to microsecond precision input timestamps #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc15654
Support up to microsecond precision input timestamps
GrahamCampbell Dec 10, 2021
a1e994f
Prefix global functions with slash
GrahamCampbell Dec 10, 2021
0d1ec62
Upgraded psalm to fix false positives
GrahamCampbell Dec 10, 2021
f384c25
Added test coverage with a non-UTC timezone
GrahamCampbell Dec 10, 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
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.0'
tools: composer:v2
coverage: none

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"guzzlehttp/psr7": "^2.0",
"php-http/discovery": "^1.14",
"phpunit/phpunit": "^9.5 || ^10.0",
"psalm/phar": "4.8.1",
"psalm/phar": "4.15.0",
"psr/http-factory": "^1.0.1",
"psr/http-message": "^1.0.1",
"squizlabs/php_codesniffer": "3.6.0"
Expand Down
9 changes: 8 additions & 1 deletion src/Utilities/TimeFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ final class TimeFormatter
private const TIME_FORMAT = 'Y-m-d\TH:i:s\Z';
private const TIME_ZONE = 'UTC';

private const RFC3339_FORMAT = 'Y-m-d\TH:i:sP';
private const RFC3339_EXTENDED_FORMAT = 'Y-m-d\TH:i:s.uP';

public static function encode(?DateTimeImmutable $time): ?string
{
if ($time === null) {
Expand All @@ -31,7 +34,11 @@ public static function decode(?string $time): ?DateTimeImmutable
return null;
}

$decoded = DateTimeImmutable::createFromFormat(self::TIME_FORMAT, $time, new DateTimeZone(self::TIME_ZONE));
$decoded = DateTimeImmutable::createFromFormat(
\str_contains($time, '.') ? self::RFC3339_EXTENDED_FORMAT : self::RFC3339_FORMAT,
\strtoupper($time),
new DateTimeZone(self::TIME_ZONE)
);

if ($decoded === false) {
throw new ValueError(
Expand Down
4 changes: 0 additions & 4 deletions src/V1/CloudEventTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,6 @@ private function setExtension(string $attribute, $value): self
);
}

/**
* @psalm-suppress UndefinedFunction
* @var string
*/
$type = \get_debug_type($value);
$types = ['bool', 'int', 'string', 'null'];

Expand Down
44 changes: 41 additions & 3 deletions tests/Unit/Utilities/TimeFormatterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,49 @@ public function testEncode(): void
);
}

public function testDecode(): void
public function providesDecodeCases(): array
{
return [
// UTC
['2018-04-05T17:31:00Z', '2018-04-05T17:31:00Z'],
['1985-04-12T23:20:50.100000Z', '1985-04-12T23:20:50.1Z'],
['1985-04-12T23:20:50.100000Z', '1985-04-12T23:20:50.10Z'],
['1985-04-12T23:20:50.100000Z', '1985-04-12T23:20:50.100Z'],
['1985-04-12T23:20:50.120000Z', '1985-04-12T23:20:50.12Z'],
['1985-04-12T23:20:50.120000Z', '1985-04-12T23:20:50.120Z'],
['1985-04-12T23:20:50.123000Z', '1985-04-12T23:20:50.123Z'],
['1985-04-12T23:20:50.123000Z', '1985-04-12T23:20:50.12300Z'],
['1985-04-12T23:20:50.123400Z', '1985-04-12T23:20:50.1234Z'],
['1985-04-12T23:20:50.123400Z', '1985-04-12T23:20:50.123400Z'],
['1985-04-12T23:20:50.123450Z', '1985-04-12T23:20:50.12345Z'],
['1985-04-12T23:20:50.123450Z', '1985-04-12T23:20:50.123450Z'],
['1985-04-12T23:20:50.123456Z', '1985-04-12T23:20:50.123456Z'],

// +01:00
['2018-04-05T16:31:00Z', '2018-04-05T17:31:00+01:00'],
['1985-04-12T22:20:50.100000Z', '1985-04-12T23:20:50.1+01:00'],
['1985-04-12T22:20:50.100000Z', '1985-04-12T23:20:50.10+01:00'],
['1985-04-12T22:20:50.100000Z', '1985-04-12T23:20:50.100+01:00'],
['1985-04-12T22:20:50.120000Z', '1985-04-12T23:20:50.12+01:00'],
['1985-04-12T22:20:50.120000Z', '1985-04-12T23:20:50.120+01:00'],
['1985-04-12T22:20:50.123000Z', '1985-04-12T23:20:50.123+01:00'],
['1985-04-12T22:20:50.123000Z', '1985-04-12T23:20:50.12300+01:00'],
['1985-04-12T22:20:50.123400Z', '1985-04-12T23:20:50.1234+01:00'],
['1985-04-12T22:20:50.123400Z', '1985-04-12T23:20:50.123400+01:00'],
['1985-04-12T22:20:50.123450Z', '1985-04-12T23:20:50.12345+01:00'],
['1985-04-12T22:20:50.123450Z', '1985-04-12T23:20:50.123450+01:00'],
['1985-04-12T22:20:50.123456Z', '1985-04-12T23:20:50.123456+01:00'],
];
}

/**
* @dataProvider providesDecodeCases
*/
public function testDecode(string $expected, string $input): void
{
self::assertEquals(
new DateTimeImmutable('2018-04-05T17:31:00Z'),
TimeFormatter::decode('2018-04-05T17:31:00Z')
new DateTimeImmutable($expected),
TimeFormatter::decode($input)
);
}

Expand Down