Fixed date/diff where the difference in hour is less than 1

php · Nov 18, 2021 · e4679ef · e4679ef · dstogov · Nov 19, 2021
1 parent 5ab2749
commit e4679ef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c
@@ -200,7 +200,7 @@ void timelib_decimal_hour_to_hms(double h, int *hour, int *min, int *sec)
 
 void timelib_hms_to_decimal_hour(int hour, int min, int sec, double *h)
 {
-	if (hour > 0) {
+	if (hour >= 0) {
 		*h = ((double)hour + (double)min / 60 + (double)sec / 3600);
 	} else {
 		*h = ((double)hour - (double)min / 60 - (double)sec / 3600);
@@ -209,7 +209,7 @@ void timelib_hms_to_decimal_hour(int hour, int min, int sec, double *h)
 
 void timelib_hmsf_to_decimal_hour(int hour, int min, int sec, int us, double *h)
 {
-	if (hour > 0) {
+	if (hour >= 0) {
 		*h = ((double)hour + (double)min / MINS_PER_HOUR + (double)sec / SECS_PER_HOUR) + (double)us / USECS_PER_HOUR;
 	} else {
 		*h = ((double)hour - (double)min / MINS_PER_HOUR - (double)sec / SECS_PER_HOUR) - (double)us / USECS_PER_HOUR;

diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
@@ -30,9 +30,9 @@
 # include "timelib_config.h"
 #endif
 
-#define TIMELIB_VERSION 202110
-#define TIMELIB_EXTENDED_VERSION 20211001
-#define TIMELIB_ASCII_VERSION "2021.10"
+#define TIMELIB_VERSION 202111
+#define TIMELIB_EXTENDED_VERSION 20211101
+#define TIMELIB_ASCII_VERSION "2021.11"
 
 #include <stdlib.h>
 #include <stdbool.h>

diff --git a/ext/date/tests/bug81458.phpt b/ext/date/tests/bug81458.phpt
@@ -7,7 +7,14 @@ $second = new DateTime('2018-07-02 00:00:00.000000 America/Toronto');
 
 var_dump($first->diff($second)->days);
 var_dump($first->diff($second)->d);
+
+date_default_timezone_set('UTC');
+$a = new DateTime('2018-12-01 00:00');
+$b = new DateTime('2018-12-02 00:01');
+
+var_dump($a->diff($b)->days);
 ?>
 --EXPECT--
 int(1)
 int(1)
+int(1)