Parser: fix float to time

h4kuna · Oct 2, 2023 · f722b7a · f722b7a
1 parent f91e6e6
commit f722b7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/Date/Parser.php b/src/Date/Parser.php
@@ -14,6 +14,7 @@ final class Parser
 	/** @var array<string> */
 	public static array $formats = ['d.m. H:i', 'm-d H:i', 'd.m.Y H:i', 'Y-m-d H:i', 'd.m.Y H:i:s', 'Y-m-d H:i:s'];
 
+
 	/**
 	 * @param string $any
 	 * @param DateTime|DateTimeImmutable|null $dateTime
@@ -47,16 +48,7 @@ public static function fromString(
 
 	private static function modifierFromFloat(float $value): string
 	{
-		$way = $value < 0 ? -1 : 1;
-		[$hour, $minute] = explode('.', (string) $value);
-
-		$minute = intval($minute);
-		$hour = intval($hour);
-		if ($minute !== 0) {
-			$minute = (int) round(6 / (1 / $minute));
-		}
-
-		return self::modifier($hour, $minute * $way);
+		return self::modifier(0, 0, (int) ($value * 3600));
 	}
 
 

diff --git a/tests/src/Unit/Date/ParserTest.php b/tests/src/Unit/Date/ParserTest.php
@@ -21,15 +21,17 @@ final class ParserTest extends TestCase
 	public function provideMakeFromString(): array
 	{
 		return [
-//			['expected' => '2023-06-11 07:00:00', 'input' => ''],
-//			['expected' => self::format(new DateTime()), 'input' => 'now'],
-//			['expected' => '2023-06-11 07:00:00', 'input' => '0'],
-//			['expected' => '2023-06-11 07:30:00', 'input' => '0.5'],
+			['expected' => '2023-06-11 07:00:00', 'input' => ''],
+			['expected' => self::format(new DateTime()), 'input' => 'now'],
+			['expected' => '2023-06-11 07:00:00', 'input' => '0'],
+			['expected' => '2023-06-11 07:30:00', 'input' => '0.5'],
 //			// decimal number has same behavior with or without +
 			['expected' => '2023-06-11 07:30:00', 'input' => '+0.5'],
 			['expected' => '2023-06-11 07:30:00', 'input' => '+0,5'],
+			['expected' => '2023-06-11 08:45:00', 'input' => '+1,75'],
 			['expected' => '2023-06-11 06:30:00', 'input' => '-0,5'],
 			['expected' => '2023-06-11 05:30:00', 'input' => '-1,5'],
+			['expected' => '2023-06-11 05:34:48', 'input' => '-1,42'],
 			['expected' => '2023-06-11 08:00:00', 'input' => '+1'],
 			['expected' => '2023-06-11 17:00:00', 'input' => '+10'],
 			['expected' => '2023-06-11 10:00:00', 'input' => '10'],