Merged pull request #7586

Author: derickr

NEWS

@@ -17,6 +17,8 @@ PHP                                                                        NEWS
 - Date:
   . Fixed GH-8458 (DateInterval::createFromDateString does not throw if
     non-relative items are present). (Derick)
+  . idate() now accepts format specifiers "N" (ISO Day-of-Week) and "o" (ISO
+    Year). (Pavel Djundik)
 
 - FPM:
   . Emit error for invalid port setting. (David Carlier)

ext/date/php_date.c

@@ -882,6 +882,7 @@ PHPAPI int php_idate(char format, time_t ts, bool localtime)
 		/* day */
 		case 'd': case 'j': retval = (int) t->d; break;
 
+		case 'N': retval = (int) timelib_iso_day_of_week(t->y, t->m, t->d); break;
 		case 'w': retval = (int) timelib_day_of_week(t->y, t->m, t->d); break;
 		case 'z': retval = (int) timelib_day_of_year(t->y, t->m, t->d); break;
 
@@ -896,6 +897,7 @@ PHPAPI int php_idate(char format, time_t ts, bool localtime)
 		case 'L': retval = (int) timelib_is_leap((int) t->y); break;
 		case 'y': retval = (int) (t->y % 100); break;
 		case 'Y': retval = (int) t->y; break;
+		case 'o': retval = (int) isoyear; break; /* iso year */
 
 		/* Swatch Beat a.k.a. Internet Time */
 		case 'B':

ext/standard/tests/time/idate.phpt

@@ -3,14 +3,15 @@ idate() function
 --FILE--
 <?php
 date_default_timezone_set('GMT0');
-$tmp = "UYzymndjHGhgistwLBIW";
+$tmp = "UYozymndjHGhgistwNLBIW";
 for($a = 0;$a < strlen($tmp); $a++){
     echo $tmp[$a], ': ', idate($tmp[$a], 1043324459)."\n";
 }
 ?>
 --EXPECT--
 U: 1043324459
 Y: 2003
+o: 2003
 z: 22
 y: 3
 m: 1
@@ -25,6 +26,7 @@ i: 20
 s: 59
 t: 31
 w: 4
+N: 4
 L: 0
 B: 556
 I: 0

ext/standard/tests/time/idate_iso.phpt

@@ -0,0 +1,23 @@
+--TEST--
+idate() function: ISO Day-of-Week and ISO Year
+--FILE--
+<?php
+date_default_timezone_set('UTC');
+$tmp = "UwNW";
+for ($a = 0; $a < strlen($tmp); $a++){
+    echo $tmp[$a], ': ', idate($tmp[$a], 1041808859), "\n";
+}
+$tmp = "UYoW";
+for ($a = 0; $a < strlen($tmp); $a++){
+    echo $tmp[$a], ': ', idate($tmp[$a], 1072912859), "\n";
+}
+?>
+--EXPECT--
+U: 1041808859
+w: 0
+N: 7
+W: 1
+U: 1072912859
+Y: 2003
+o: 2004
+W: 1