Minus prefix should also remove leading space (#13)

maqc1 · alphp · web-flow · commit 2ee69eb33926 · 2024-01-26T22:20:33.000+01:00
* Minus prefix should also remove space

Standard PHP strftime() also remove leading space when using the minus prefix.

* Add asserts for test '%#e' and '%-e'

---------

Co-authored-by: Fernando Herrero &lt;ininflamable@gmail.com&gt;
diff --git a/src/php-8.1-strftime.php b/src/php-8.1-strftime.php
@@ -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;
diff --git a/tests/strftimeTest.php b/tests/strftimeTest.php
@@ -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');
 

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ function strftime (string $format, $timestamp = null, ?string $locale = null) :`
`206`	`206`	`case '#':`
`207`	`207`	`case '-':`
`208`	`208`	`// remove leading zeros but keep last char if also zero`
`209`		`- return preg_replace('/^0+(?=.)/', '', $result);`
	`209`	`+ return preg_replace('/^[0\s]+(?=.)/', '', $result);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`return $result;`