Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php

Conflicts:
	debian/changelog
	debian/patches/series

6 files changed, 10 insertions, 10 deletions

diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c
index 99adfd356..467f8d04d 100644
--- a/ext/calendar/cal_unix.c
+++ b/ext/calendar/cal_unix.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index 34b34da37..bbd63f328 100644
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -208,7 +208,7 @@ static struct cal_entry_t cal_conversion_table[CAL_NUM_CALS] = {
 #define JEWISH_HEB_MONTH_NAME(year) ((monthsPerYear[((year)-1) % 19] == 13)?JewishMonthHebNameLeap:JewishMonthHebName)
 
 /* For jddayofweek */
-enum { CAL_DOW_DAYNO, CAL_DOW_SHORT, CAL_DOW_LONG };
+enum { CAL_DOW_DAYNO, CAL_DOW_LONG, CAL_DOW_SHORT };
 
 /* For jdmonthname */
 enum { CAL_MONTH_GREGORIAN_SHORT, CAL_MONTH_GREGORIAN_LONG,
@@ -696,10 +696,10 @@ PHP_FUNCTION(jddayofweek)
 	daynames = DayNameShort[day];
 
 	switch (mode) {
-	case CAL_DOW_SHORT:
+	case CAL_DOW_LONG:
 		RETURN_STRING(daynamel, 1);
 		break;
-	case CAL_DOW_LONG:
+	case CAL_DOW_SHORT:
 		RETURN_STRING(daynames, 1);
 		break;
 	case CAL_DOW_DAYNO:
diff --git a/ext/calendar/easter.c b/ext/calendar/easter.c
index a999da044..bbc5b837d 100644
--- a/ext/calendar/easter.c
+++ b/ext/calendar/easter.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/ext/calendar/julian.c b/ext/calendar/julian.c
index 17e7bcb59..cbaebc057 100644
--- a/ext/calendar/julian.c
+++ b/ext/calendar/julian.c
@@ -47,7 +47,7 @@
  *
  * CALENDAR OVERVIEW
  *
- *     Julias Ceasar created the calendar in 46 B.C. as a modified form of
+ *     Julius Caesar created the calendar in 46 B.C. as a modified form of
  *     the old Roman republican calendar which was based on lunar cycles.
  *     The new Julian calendar set fixed lengths for the months, abandoning
  *     the lunar cycle.  It also specified that there would be exactly 12
diff --git a/ext/calendar/tests/jddayofweek.phpt b/ext/calendar/tests/jddayofweek.phpt
index c33d59892..c5647804b 100644
--- a/ext/calendar/tests/jddayofweek.phpt
+++ b/ext/calendar/tests/jddayofweek.phpt
@@ -6,7 +6,7 @@ jddayofweek()
 <?php
 foreach (array(2440588, 2452162, 2453926, -1000) as $jd) {
   echo "### JD $jd ###\n";
-  for ($mode = 0; $mode <= 2; $mode++) {
+  foreach (array(CAL_DOW_DAYNO, CAL_DOW_LONG, CAL_DOW_SHORT) as $mode) {
     echo "--- mode $mode ---\n";
     for ($offset = 0; $offset <= 7; $offset++) {
       echo jddayofweek($jd + $offset, $mode). "\n";
diff --git a/ext/calendar/tests/unixtojd.phpt b/ext/calendar/tests/unixtojd.phpt
index 4eeb1ca93..6183cae9e 100644
--- a/ext/calendar/tests/unixtojd.phpt
+++ b/ext/calendar/tests/unixtojd.phpt
@@ -21,10 +21,10 @@ putenv('TZ=UTC');
 //		-uses --INI-- section with date.timezone=UTC
 //		-uses putenv('TZ=UTC')
 // date.timezone=UTC
-//		-if ommitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
+//		-if omitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
 //			-easter_date() calls mktime() and localtime()
 //			-whereas unixtojd(1000000000) calls localtime(1000000000)
-//		-if ommitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
+//		-if omitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
 //
 // unixtojd() calls php_localtime_r() which for Pacific timezone systems, returns a time -8 hours
 //		-this incorrect localtime is passed to the julian date conversion (GregorianToSDN) function which works (probably correctly)