rework checks and re-establish old test value.

Author: devnexen

ext/calendar/dow.c

@@ -35,15 +35,11 @@ int DayOfWeek(
 {
 	int dow;
 
-	if ((sdn + 1) > INT_MAX) {
-		return (0);
-	}
-
-	dow = (sdn + 1) % 7;
+	dow = (int)(sdn % 7 + 1);
 	if (dow >= 0) {
-		return (dow);
+		return (dow % 7);
 	} else {
-		return (dow + 7);
+		return (dow + 7) % 7;
 	}
 }
 

ext/calendar/tests/bug53574_2.phpt

@@ -25,7 +25,7 @@ array(9) {
   ["year"]=>
   int(0)
   ["dow"]=>
-  int(0)
+  int(3)
   ["abbrevdayname"]=>
   string(3) "Wed"
   ["dayname"]=>

ext/calendar/tests/gh16258.phpt

@@ -4,8 +4,8 @@ GH-16258 (jddayofweek overflow on argument)
 calendar
 --FILE--
 <?php
-jddayofweek(9223372036854775807, 1);
-jddayofweek(-9223372036854775806, 1);
+jddayofweek(PHP_INT_MAX, 1);
+jddayofweek(PHP_INT_MIN, 1);
 echo "DONE";
 ?>
 --EXPECT--