Skip to content

Minus prefix should also remove leading space #13

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

Merged
alphp merged 3 commits into from
Jan 26, 2024
Merged

Minus prefix should also remove leading space #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
474096c
Minus prefix should also remove space
maqc1 Jan 11, 2023
c440c48
Merge branch 'master' into pull_13
alphp Jan 26, 2024
8f5aa95
Add asserts for test '%#e' and '%-e'
alphp Jan 26, 2024
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 src/php-8.1-strftime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function strftime (string $format, $timestamp = null, ?string $locale = null) :
case '#':
case '-':
// remove leading zeros but keep last char if also zero
return preg_replace('/^0+(?=.)/', '', $result);
return preg_replace('/^[0\s]+(?=.)/', '', $result);
}

return $result;
Expand Down
6 changes: 6 additions & 0 deletions tests/strftimeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ public function testDayFormats () {
$result = strftime('%e', '20220306 13:02:03');
$this->assertEquals(' 6', $result, '%e: Day of the month, with a space preceding single digits');

$result = strftime('%#e', '20220306 13:02:03');
$this->assertEquals('6', $result, '%#e: Day of the month, without leading space');

$result = strftime('%-e', '20220306 13:02:03');
$this->assertEquals('6', $result, '%-e: Day of the month, without leading space');

$result = strftime('%j', '20220306 13:02:03');
$this->assertEquals('065', $result, '%j: Day of the year, 3 digits with leading zeros');

Expand Down