com php-src: Fixed bug #69336 (Issues with "last day of <monthname>").: NEWS ext/date/lib/parse_date.c ext/date/lib/parse_date .re
ext/date/lib/timelib.h ext/date/lib/tm2unixtime .c ext/date/php_date.c ext/date/tests/bug6933 6.phpt
| From: | Derick Rethans | Date: | Tue, 31 Mar 2015 15:35:03 +0000 |
| Subject: | com php-src: Fixed bug #69336 (Issues with "last day of <monthname>").: NEWS ext/date/lib/parse_date.c ext/date/lib/parse_date .re ext/date/lib/timelib.h ext/date/lib/tm2unixtime .c ext/date/php_date.c ext/date/tests/bug6933 6.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85972@lists.php.net to get a copy of this message | ||
Commit: ffbd380e4483a5b36733cfd99fab779008082d11
Author: Derick Rethans <github@derickrethans.nl> Tue, 31 Mar 2015 16:35:03 +0100
Parents: 97a1b343004058404915e9a77c5f57743dd215a8
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ffbd380e4483a5b36733cfd99fab779008082d11
Log:
Fixed bug #69336 (Issues with "last day of <monthname>").
Bugs:
https://bugs.php.net/69336
Changed paths:
M NEWS
M ext/date/lib/parse_date.c
M ext/date/lib/parse_date.re
M ext/date/lib/timelib.h
M ext/date/lib/tm2unixtime.c
M ext/date/php_date.c
A ext/date/tests/bug69336.phpt
Diff:
diff --git a/NEWS b/NEWS
index 5cc74f8..36f60ff 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ PHP NEWS
- Date:
. Export date_get_immutable_ce so that it can be used by extensions. (Derick
Rethans)
+ . Fixed bug #69336 (Issues with "last day of <monthname>"). (Derick Rethans)
- Curl:
. Implemented FR#69278 (HTTP2 support). (Masaki Kagaya)
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index afa1425..2a10139 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Aug 18 18:28:27 2014 */
+/* Generated by re2c 0.13.5 on Tue Mar 31 16:32:03 2015 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -19864,9 +19864,9 @@ yy1315:
/* skip "last day of" or "first day of" */
if (*ptr == 'l' || *ptr == 'L') {
- s->time->relative.first_last_day_of = 2;
+ s->time->relative.first_last_day_of = TIMELIB_SPECIAL_LAST_DAY_OF_MONTH;
} else {
- s->time->relative.first_last_day_of = 1;
+ s->time->relative.first_last_day_of = TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH;
}
TIMELIB_DEINIT;
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 4cdbc2a..66d4f22 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -1030,9 +1030,9 @@ weekdayof = (reltextnumber|reltexttext) space (dayfull|dayabbr) space
'of
/* skip "last day of" or "first day of" */
if (*ptr == 'l' || *ptr == 'L') {
- s->time->relative.first_last_day_of = 2;
+ s->time->relative.first_last_day_of = TIMELIB_SPECIAL_LAST_DAY_OF_MONTH;
} else {
- s->time->relative.first_last_day_of = 1;
+ s->time->relative.first_last_day_of = TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH;
}
TIMELIB_DEINIT;
diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
index 797ed10..28f3b8c 100644
--- a/ext/date/lib/timelib.h
+++ b/ext/date/lib/timelib.h
@@ -38,6 +38,9 @@
#define TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH 0x02
#define TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH 0x03
+#define TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH 0x01
+#define TIMELIB_SPECIAL_LAST_DAY_OF_MONTH 0x02
+
#ifndef LONG_MAX
#define LONG_MAX 2147483647L
#endif
diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c
index a3d48c5..0f59d31 100644
--- a/ext/date/lib/tm2unixtime.c
+++ b/ext/date/lib/tm2unixtime.c
@@ -205,15 +205,17 @@ static void do_adjust_relative(timelib_time* time)
time->m += time->relative.m;
time->y += time->relative.y;
}
+
switch (time->relative.first_last_day_of) {
- case 1: /* first */
+ case TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH: /* first */
time->d = 1;
break;
- case 2: /* last */
+ case TIMELIB_SPECIAL_LAST_DAY_OF_MONTH: /* last */
time->d = 0;
time->m++;
break;
}
+
timelib_do_normalize(time);
}
@@ -296,6 +298,15 @@ static void do_adjust_special_early(timelib_time* time)
break;
}
}
+ switch (time->relative.first_last_day_of) {
+ case TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH: /* first */
+ time->d = 1;
+ break;
+ case TIMELIB_SPECIAL_LAST_DAY_OF_MONTH: /* last */
+ time->d = 0;
+ time->m++;
+ break;
+ }
timelib_do_normalize(time);
}
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 0819b45..7f05bab 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2989,7 +2989,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time
*
add_assoc_long(element, "weekdays", parsed_time->relative.special.amount);
}
if (parsed_time->relative.first_last_day_of) {
- add_assoc_bool(element, parsed_time->relative.first_last_day_of == 1 ?
"first_day_of_month" : "last_day_of_month", 1);
+ add_assoc_bool(element, parsed_time->relative.first_last_day_of ==
TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month",
1);
}
add_assoc_zval(return_value, "relative", element);
}
diff --git a/ext/date/tests/bug69336.phpt b/ext/date/tests/bug69336.phpt
new file mode 100644
index 0000000..8444aa3
--- /dev/null
+++ b/ext/date/tests/bug69336.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #69336 (Issues with "last day of <monthname>")
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+var_dump(date('d.m.Y',strtotime('last day of april')));
+var_dump(date('d.m.Y',strtotime('last tuesday of march 2015')));
+var_dump(date('d.m.Y',strtotime('last wednesday of march 2015')));
+var_dump(date('d.m.Y',strtotime('last wednesday of april 2015')));
+var_dump(date('d.m.Y',strtotime('last wednesday of march 2014')));
+var_dump(date('d.m.Y',strtotime('last wednesday of april 2014')));
+?>
+--EXPECTF--
+string(10) "30.04.%d"
+string(10) "31.03.2015"
+string(10) "25.03.2015"
+string(10) "29.04.2015"
+string(10) "26.03.2014"
+string(10) "30.04.2014"