Commit Graph

1886 Commits

Author SHA1 Message Date
Derick Rethans
5dc825889d Merge branch 'PHP-7.1' 2017-02-12 20:19:10 +00:00
Derick Rethans
d28df113d5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 20:19:02 +00:00
Derick Rethans
f0519f4837 Upgrade timelib to 2017.01
This fixes:

- Fixed bug #72719 (Relative datetime format ignores weekday on sundays only).
- Fixed bug #73294 (DateTime wrong when date string is negative).
- Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with UTC
  offset).
- Fixed bug #73858 (first/last day of' flag is not being reset).
- Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
  if $date is a Sunday).
- Fixed bug #74057 (wrong day when using "this week" in strtotime).
2017-02-12 20:17:01 +00:00
Derick Rethans
eb1f4e0210 Merge branch 'PHP-7.1' 2017-02-11 11:10:17 +00:00
Derick Rethans
5113909259 Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value). 2017-02-11 11:10:01 +00:00
Joe Watkins
797de51bf1
Merge branch 'PHP-7.1'
* PHP-7.1:
  Add test ini_set with invalid time zone
2017-01-16 04:13:44 +00:00
Joe Watkins
d11bed5909
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add test ini_set with invalid time zone
2017-01-16 04:13:26 +00:00
Niklas Keller
cc9893eb44
Add test ini_set with invalid time zone
Wasn't covered before according to gcov.php.net.
2017-01-16 04:13:01 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Nikita Popov
1283ea4665 Merge branch 'PHP-7.1' 2017-01-01 12:17:01 +01:00
Nikita Popov
8467c5c9bf Fix year dependent test 2017-01-01 12:15:52 +01:00
Sara Golemon
85e88d1d6e Use new params API for throwable constructors in date 2016-12-29 18:26:27 -08:00
Sara Golemon
0951d7d75a Use new param API in date
Left the zend_parse_parameters_throw() uses along because
throwing isn't currently supported by the new API.
Also left the complex parsing in DatePeriod::__construct alone
because the macros don't really stack all that well.
2016-12-28 10:04:35 -08:00
Nuno Lopes
d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Derick Rethans
b8664adc9b Updated to version 2016.10 (2016j) 2016-11-24 10:40:17 +00:00
Derick Rethans
ec366eac5f Updated to version 2016.10 (2016j) 2016-11-24 10:40:15 +00:00
Derick Rethans
c38f2c2a6b Updated to version 2016.10 (2016j) 2016-11-24 10:40:14 +00:00
Derick Rethans
6785ea2340 Updated to version 2016.10 (2016j) 2016-11-24 10:40:11 +00:00
Craig Duncan
c31396f85e Use UTC instead of unavailable timezone in test 2016-11-22 19:29:49 +01:00
Dmitry Stogov
558166bd41 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed test
2016-11-17 13:44:08 +03:00
Dmitry Stogov
c8dc23e9ba Fixed test 2016-11-17 13:43:45 +03:00
Craig Duncan
c1001d22d2 Add expectations for invalid count() warnings 2016-11-17 09:33:04 +00:00
Nuno Lopes
d26b8804d0 fix gcov coverage 2016-11-16 15:11:07 -05:00
Nuno Lopes
7032ed37c0 fix gcov coverage 2016-11-16 15:08:42 -05:00
Nuno Lopes
5e5e071214 fix gcov coverage 2016-11-16 15:07:16 -05:00
Joe Watkins
77efe76bf7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  news entry for #1787
  move declaration of vars to top
  add test for #69587
  fix bug #69587 DateInterval properties and isset
2016-11-13 05:34:11 +00:00
jhdxr
0bd63959c9 move declaration of vars to top 2016-11-13 05:32:24 +00:00
jhdxr
9ad2083773 add test for #69587 2016-11-13 05:32:24 +00:00
jhdxr
23f9e48273 fix bug #69587 DateInterval properties and isset 2016-11-13 05:32:24 +00:00
Joe Watkins
d1910f66e5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  added a test for date_interval_format function
  Merge branch 'pull-request/2198'
2016-11-12 09:59:24 +00:00
Jean Carlo Machado
f578ce3a13 added a test for date_interval_format function 2016-11-12 09:57:50 +00:00
Derick Rethans
0bc6592307 Updated to version 2016.9 (2016i) 2016-11-03 13:57:32 -04:00
Derick Rethans
7f2b7a4950 Updated to version 2016.9 (2016i) 2016-11-03 13:57:31 -04:00
Derick Rethans
ccb91cde94 Updated to version 2016.9 (2016i) 2016-11-03 13:57:28 -04:00
Derick Rethans
1d1a7feecf - Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time. 2016-10-31 10:43:33 +00:00
Derick Rethans
7b9a17d797 Updated to version 2016.8 (2016h) 2016-10-24 10:37:17 +01:00
Derick Rethans
7544040469 Updated to version 2016.8 (2016h) 2016-10-24 10:37:13 +01:00
Derick Rethans
4f5a755b9d Updated to version 2016.8 (2016h) 2016-10-24 10:37:07 +01:00
Remi Collet
0820c94382 also fix 32bits test for microsecond 2016-10-17 15:07:56 +02:00
Anatol Belski
c79f9a4e49 fix gettimeofday proto availability
(cherry picked from commit 79f7d174d0)
2016-10-14 02:03:02 +02:00
Anatol Belski
06e7c9983a fix test
(cherry picked from commit fa9370db03)
2016-10-14 01:44:45 +02:00
Stanislav Malyshev
c4254588a9 Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
(cherry picked from commit 1b29e4488e)
2016-10-14 01:36:38 +02:00
Stanislav Malyshev
1bdb30a429 Merge branch 'PHP-7.0.12' into PHP-7.0
* PHP-7.0.12:
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
2016-10-11 16:46:51 -07:00
Derick Rethans
e3271b1814 Fixed bug #64887 (Allow DateTime modification with subsecond items). 2016-10-07 13:40:06 -04:00
Derick Rethans
55626549d8 Improve support for microseconds with Date/Time
It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.
2016-10-05 15:03:06 -04:00
Derick Rethans
e63443d825 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-30 20:50:00 +01:00
Derick Rethans
6ad288ee23 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-30 20:49:53 +01:00
Derick Rethans
c0219b323e Fixed tests due to changes in underlaying data 2016-09-30 20:49:44 +01:00
Derick Rethans
99b58896dc Merge branch 'PHP-7.0' into PHP-7.1 2016-09-30 20:31:16 +01:00
Derick Rethans
7deb32abc9 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-30 20:31:05 +01:00
Derick Rethans
91fd4bf000 Fixed parsing of AM/PM without all the expected dots in place 2016-09-30 20:21:48 +01:00
Derick Rethans
1350c6431a Updated to version 2016.7 (2016g) 2016-09-28 23:30:28 +01:00
Derick Rethans
83780a6cd2 Updated to version 2016.7 (2016g) 2016-09-28 23:30:27 +01:00
Derick Rethans
6a544f2d1e Updated to version 2016.7 (2016g) 2016-09-28 23:30:26 +01:00
Stanislav Malyshev
1b29e4488e Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation 2016-09-25 16:43:24 -07:00
Anatol Belski
fcc9386578 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  regenerate date parser with re2c 0.15.3
  regenerate date parser with re2c 0.15.3
2016-07-24 14:55:15 +02:00
Anatol Belski
da3995852e regenerate date parser with re2c 0.15.3 2016-07-24 14:53:53 +02:00
Anatol Belski
9cd23ff84f regenerate date parser with re2c 0.15.3 2016-07-24 14:50:10 +02:00
Anatol Belski
b57a38f584 regenerate date parser with re2c 0.13.5 to fix OSX issues 2016-07-20 17:57:39 +02:00
Anatol Belski
c1ca3c5e6d Merge branch 'PHP-7.0'
* PHP-7.0:
  regenerate date parser with re2c 0.13.5
2016-07-20 13:37:17 +02:00
Anatol Belski
90c26fb6b1 regenerate date parser with re2c 0.13.5 2016-07-20 13:32:53 +02:00
Derick Rethans
533266127a Merge branch 'PHP-7.0' 2016-07-20 10:21:19 +01:00
Derick Rethans
1dafa806a9 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-20 10:21:03 +01:00
Derick Rethans
18ba78e988 Regenerate with the -b flag, as we used to do.
Apparently, Apple's LLVM can't handle it otherwise o_O.
2016-07-20 10:19:53 +01:00
Nikita Popov
0bda0422af Merge branch 'PHP-7.0'
Conflicts:
	Zend/zend_vm_execute.h
2016-07-14 18:39:48 +02:00
Nikita Popov
411eee7b5a Fix leak when creating timezone with null bytes 2016-07-14 18:39:16 +02:00
Christoph M. Becker
90108a2f89 Merge branch 'PHP-7.0' 2016-07-11 16:10:15 +02:00
Christoph M. Becker
23d4c9e6c7 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 16:08:10 +02:00
Christoph M. Becker
966311e627 Bug #66836 has been fixed 2016-07-11 16:06:35 +02:00
Derick Rethans
4fe37bb5d1 Merge branch 'PHP-7.0' 2016-07-11 11:32:22 +01:00
Derick Rethans
7759d6b0db Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 11:32:10 +01:00
Derick Rethans
6a5e1783b7 Generate new .c file from .re file, as that was missing on my previous commit 2016-07-11 11:31:43 +01:00
Derick Rethans
cc89a46a89 Updated to version 2016.6 (2016f) 2016-07-06 11:15:46 +01:00
Derick Rethans
a4e140e6ab Updated to version 2016.6 (2016f) 2016-07-06 11:15:45 +01:00
Derick Rethans
884db2f7be Updated to version 2016.6 (2016f) 2016-07-06 11:15:42 +01:00
Jeremy Mikola
7aaa310d7b Export php_date_get_interface_ce() for extension use 2016-07-05 16:19:45 +02:00
Aaron Piotrowski
24237027bc Merge branch 'throw-error-in-extensions' 2016-07-05 02:08:39 -05:00
Aaron Piotrowski
9638e45d2f Return null instead of false 2016-06-29 10:02:17 -05:00
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Derick Rethans
8267a5fba7 Fixed expected test outcome due to rule changes 2016-06-15 18:31:41 +01:00
Derick Rethans
22343e8a31 Merge branch 'PHP-7.0' 2016-06-15 18:30:19 +01:00
Derick Rethans
76ec139a0a Merge branch 'PHP-5.6' into PHP-7.0 2016-06-15 18:30:03 +01:00
Derick Rethans
e0e83c0180 Fixed expected test outcome due to rule changes 2016-06-15 18:29:40 +01:00
Derick Rethans
334db3b921 Updated to version 2016.5 (2016e) 2016-06-15 11:58:51 +01:00
Derick Rethans
020541587a Updated to version 2016.5 (2016e) 2016-06-15 11:58:50 +01:00
Derick Rethans
fffa1aa0f3 Updated to version 2016.5 (2016e) 2016-06-15 11:58:47 +01:00
Nikita Popov
3389c2e6a6 Merge branch 'PHP-7.0' 2016-06-14 22:39:18 +02:00
Nikita Popov
93f7939891 Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/date/php_date.c
2016-06-14 22:38:44 +02:00
Nikita Popov
248fdfcf73 Maybe fix bug #72011 2016-06-14 22:37:27 +02:00
Aaron Piotrowski
771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05:00
Derick Rethans
932c9520bc Merge branch 'PHP-7.0' 2016-05-18 12:19:58 +01:00
Derick Rethans
c572968900 Merge branch 'PHP-5.6' into PHP-7.0 2016-05-18 12:19:49 +01:00
Derick Rethans
f43f6fc39b Fixed bug #63740 (strtotime seems to use both sunday and monday as start of week) 2016-05-18 12:19:11 +01:00
Anatol Belski
9f5970e60a Merge branch 'PHP-7.0'
* PHP-7.0:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
2016-04-05 11:24:45 +02:00
Anatol Belski
d10a8e4804 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
2016-04-05 11:24:23 +02:00
Thomas Punt
1aea777349 Use STR_EMPTY_ALLOC macro instead 2016-04-05 11:18:14 +02:00
Thomas Punt
40f14bad33 Fix DateInterval::format segfault 2016-04-05 11:18:14 +02:00
Derick Rethans
454ae8a6f3 Updated to version 2016.3 (2016c) 2016-03-24 11:09:08 +00:00
Derick Rethans
70878a92b1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:07 +00:00
Derick Rethans
c4681ec8e1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:05 +00:00
Derick Rethans
92db62a32b Updated to version 2016.2 (2016b) 2016-03-15 09:14:12 +00:00
Derick Rethans
ba71144b8c Updated to version 2016.2 (2016b) 2016-03-15 09:14:11 +00:00
Derick Rethans
ddc62f2e8b Updated to version 2016.2 (2016b) 2016-03-15 09:14:09 +00:00
Anatol Belski
0c3022f436 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix DatePeriod::getEndDate() segfault
2016-03-11 14:13:11 +01:00
Anatol Belski
d26d80ab75 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix DatePeriod::getEndDate() segfault
2016-03-11 14:12:54 +01:00
Thomas Punt
f3f5a07aa5 Fix DatePeriod::getEndDate() segfault 2016-03-11 14:08:48 +01:00
Anatol Belski
11102e2653 Fix timelib compat with PHP5
Windows builds in PHP5 are always using long which is 32-bit even
in 64-bit build. Thus in PHP5, timelib_long and the company have
to always evaluate to a 32-bit.
2016-02-15 16:50:42 +01:00
Anatol Belski
633fb2d0e8 Backported fix for bug #71525 2016-02-15 15:14:23 +01:00
Anatol Belski
e0fa32cc8e Merge branch 'PHP-7.0'
* PHP-7.0:
  make sure the tests always uses same tz
2016-02-15 08:39:19 +01:00
Anatol Belski
53639c44df make sure the tests always uses same tz 2016-02-15 08:38:55 +01:00
Anatol Belski
99d98a6ba5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix bug #71525
2016-02-15 08:19:52 +01:00
Sean DuBois
f31e0cd334 Fix bug #71525
timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out
it latters causes other date operations to fail (like date_date_set)
2016-02-15 08:19:07 +01:00
Derick Rethans
871c5ab09a Updated to version 2016.1 (2016a) 2016-02-02 10:34:07 +00:00
Derick Rethans
b573658092 Updated to version 2016.1 (2016a) 2016-02-02 10:34:05 +00:00
Derick Rethans
43fee6c6a1 Updated to version 2016.1 (2016a) 2016-02-02 10:34:03 +00:00
Derick Rethans
c343d3fae5 Merge branch 'PHP-7.0' 2016-01-29 15:30:53 +01:00
Derick Rethans
3523c0a45f Merge branch 'PHP-5.6' into PHP-7.0 2016-01-29 15:30:31 +01:00
Derick Rethans
1a86825688 Use the new timelib function for comparing times 2016-01-29 15:28:11 +01:00
Willem-Jan
2aeef4e539 Test + support for negative timestamps with microtime 2016-01-29 15:22:22 +01:00
Willem-Jan
1bbbc47e79 Also test against equality 2016-01-29 15:22:22 +01:00
Willem-Jan
5879721936 Compare agaist fraction when sse are equal 2016-01-29 15:22:22 +01:00
Willem-Jan
a0237259e9 Added test for comparing dates with microseconds 2016-01-29 15:22:22 +01:00
Derick Rethans
822ca45220 Merge in changes in timelib 2016.01 2016-01-29 15:21:55 +01:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0'
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
5adac3c2d0 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed and improved tests
  test to function socket_getopt();
  test to function socket_clear_error();;
  test to function socket_shutdown();
  test to function socket_send();
  test to function gethostname ( void );
  test to function DateTimeZone::getLocation();
  test to function stream_get_transports();
  test to function stream_get_wrappers();
  test to function stream_socket_enable_crypto();
  test to function stream_socket_get_name();
  Create stream_socket_recvfrom.phpt
  test to stream function set_file_buffer.phpt();
  test to function PDO_getAvaliableDrivers;
  test to misc. function connection_status();
  test to function connection_aborted();
  test to function memory_get_peak_usage();
2015-12-24 14:13:36 +01:00
Julien Pauli
048fb4b00f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed and improved tests
  test to function socket_getopt();
  test to function socket_clear_error();;
  test to function socket_shutdown();
  test to function socket_send();
  test to function gethostname ( void );
  test to function DateTimeZone::getLocation();
  test to function stream_get_transports();
  test to function stream_get_wrappers();
  test to function stream_socket_enable_crypto();
  test to function stream_socket_get_name();
  Create stream_socket_recvfrom.phpt
  test to stream function set_file_buffer.phpt();
  test to function PDO_getAvaliableDrivers;
  test to misc. function connection_status();
  test to function connection_aborted();
  test to function memory_get_peak_usage();
2015-12-24 14:08:59 +01:00
marcosptf
891ac59305 test to function DateTimeZone::getLocation(); 2015-12-24 10:56:23 +01:00
Xinchen Hui
145b68c834 Merge branch 'PHP-7.0' 2015-12-12 22:52:51 -08:00
Xinchen Hui
4171a8f6c6 Internal function argumensts cleanup (strict_types) 2015-12-12 22:52:37 -08:00
Xinchen Hui
f248309b74 Revert "Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)"
THis is bc break, which will break $date1->diff($date2 , 1), which is
common used

please do not do bc break without a asking

This reverts commit 943b23dcf6.
2015-12-09 12:00:23 +08:00
Reeze Xia
943b23dcf6 Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed) 2015-12-09 11:40:47 +08:00
Stanislav Malyshev
9da2de901f Merge branch 'pull-request/1527'
* pull-request/1527:
  adding test scenario to improve coverage
  adding test scenario to improve coverage
2015-10-18 15:02:48 -07:00
Nuno Lopes
052dd3005b fix coverage report for datelib 2015-10-04 05:45:05 -04:00
Nuno Lopes
ba4a85b012 fix coverage report for datelib 2015-10-04 05:39:01 -04:00
Nuno Lopes
6709006457 fix coverage report for datelib 2015-10-04 05:36:47 -04:00
Derick Rethans
5bcb171a71 Updated to version 2015.7 (2015g) 2015-10-02 18:12:19 +01:00
Derick Rethans
a2f5619303 Updated to version 2015.7 (2015g) 2015-10-02 18:12:18 +01:00
Derick Rethans
c08824fd72 Updated to version 2015.7 (2015g) 2015-10-02 18:12:16 +01:00
Xinchen Hui
c98ea8465b Fixed bug #70619 (DateTimeImmutable segfault) 2015-10-02 07:19:21 -07:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Anatol Belski
8317e0fa46 add missing header
For PRIu32 and maybe more, that fixes build
2015-09-23 14:01:59 +02:00
Dmitry Stogov
a9bbe5c384 Make use of timelib 2015.02's support for external memory managers. 2015-09-22 09:17:50 +01:00
Derick Rethans
922f325c68 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-22 09:08:47 +01:00
Derick Rethans
96d1d13d87 Update timelib to 2015.02 2015-09-22 08:59:45 +01:00
Derick Rethans
dfc38fd0e4 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-22 08:45:33 +01:00
Derick Rethans
e4f3fb976b Fixed test cases due to changes in rules 2015-09-22 08:42:12 +01:00
Derick Rethans
fab5cbab1a Bumb timelib version to 2015.01 2015-09-22 08:41:56 +01:00
Edgar R. Sandi
d1d7890a87 adding test scenario to improve coverage 2015-09-18 12:09:38 -03:00
Anatol Belski
00eebd7a47 fix dir separator in test 2015-08-28 11:39:26 +02:00
Anatol Belski
5d2294e8b8 fix path separator in test 2015-08-28 11:38:16 +02:00
Christoph M. Becker
07c1b641b5 fixed changed error message in test 2015-08-17 19:33:49 +02:00
Christoph M. Becker
61591ea636 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70277: new DateTimeZone($foo) is ignoring text after null byte

Resolved conflicts:
	ext/date/php_date.c
2015-08-17 19:28:46 +02:00
Christoph M. Becker
bb057498f7 Fix #70277: new DateTimeZone($foo) is ignoring text after null byte
The DateTimeZone constructors are not binary safe. They're parsing the timezone
as string, but discard the length when calling timezone_initialize(). This
patch adds a tz_len parameter and a respective check to timezone_initialize().
2015-08-17 15:58:37 +02:00
Derick Rethans
b010a9d846 Fixed sorting order
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
Derick Rethans
cdaf057adb Updated to version 2015.6 (2015f) 2015-08-16 21:26:12 +01:00
Christoph M. Becker
5e93fe3c57 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
2015-08-14 14:25:19 +02:00
Christoph M. Becker
e66bf11638 Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
2015-08-14 14:19:12 +02:00
Derick Rethans
f94bcb1026 Of course, we support v2 in PHP 5.6 as well. 2015-08-13 11:07:16 +01:00
Derick Rethans
159bc6ecdc Updated to version 2015.6 (2015f) 2015-08-13 10:54:06 +01:00
Derick Rethans
890204fa45 Updated to version 2015.6 (2015f) 2015-08-13 10:54:03 +01:00
Derick Rethans
3ddd826684 Tell timelib we support v2 2015-08-13 10:50:28 +01:00
Xinchen Hui
e17b1266db Revert "Updated to version 2015.6 (2015f)"
This reverts commit 7b476a600b.
2015-08-13 11:55:30 +08:00
Derick Rethans
7b476a600b Updated to version 2015.6 (2015f) 2015-08-12 22:00:15 +01:00
Derick Rethans
a1c06f10dd Updated to version 2015.6 (2015f) 2015-08-12 22:00:13 +01:00
Christoph M. Becker
3b874086e2 Fix #70245: strtotime does not emit warning when 2nd parameter is object or string
Caused by a refactoring strtotime() called
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ...) instead of
zend_parse_parameters().
2015-08-12 19:01:04 +02:00
Stanislav Malyshev
ed709d5aa0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	ext/soap/php_http.c
	ext/spl/spl_observer.c
2015-08-04 15:29:13 -07:00
Stanislav Malyshev
69ed3969dd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	.gitignore
	ext/date/php_date.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
2015-08-04 14:10:57 -07:00
Stanislav Malyshev
0e09009753 Do not do convert_to_* on unserialize, it messes up references 2015-08-04 13:59:56 -07:00
Stanislav Malyshev
2eaf28367d fix 32-bit test 2015-08-05 12:04:26 -07:00
Stanislav Malyshev
feeb2fba93 fix merge 2015-08-04 23:51:55 -07:00
Stanislav Malyshev
97047e7665 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	Zend/zend_exceptions.c
	ext/date/php_date.c
	ext/openssl/openssl.c
	ext/phar/phar_internal.h
	ext/soap/php_http.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/spl/spl_observer.c
	ext/standard/tests/serialize/bug69152.phpt
	sapi/cli/tests/005.phpt
2015-08-04 16:14:24 -07:00
Ferenc Kovacs
57247f01f7 removed another E_STRICT(with the approval of Derick), 3 more to go 2015-07-30 13:53:44 +02:00
Anatol Belski
0787cd60ed first stone on using the unified globals accessor 2015-07-29 10:36:30 +02:00
Christoph M. Becker
dbadf447b2 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed typo in test for bug #66985
2015-07-07 23:39:18 +02:00
Christoph M. Becker
e68b5252a2 fixed typo in test for bug #66985 2015-07-07 23:35:28 +02:00
Aaron Piotrowski
7ec1e17464 Update memory freeing and other issues, revert some changes 2015-07-05 23:25:53 -05:00
Aaron Piotrowski
907476f34c Convert E_ERROR to thrown Error in extensions 2015-07-05 12:16:57 -05:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Dmitry Stogov
4bd22cf1c1 Improved zend_string API (Francois Laupretre)
Squashed commit of the following:

commit d96eab8d79
Author: Francois Laupretre <francois@tekwire.net>
Date:   Fri Jun 26 01:23:31 2015 +0200

    Use the new 'ZSTR' macros in the rest of the code.

    Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
2015-06-29 16:44:54 +03:00
Anatol Belski
269acaa363 Merge branch 'pull-request/1284'
* pull-request/1284:
  Rename interface macros
  Fix typo in UPGRADING
  Move definition of Throwable to zend_exceptions.h/c
  Check for zend_ce_throwable instead
  Fix some missed tests
  Add Throwable tests
  Fix previous exception type check
  Updated UPGRADING with RFC link
  Changed AssertionException to AssertionError
  Update exception error messages
  Throwable method signatures.
  Update exception names in tests after formatting changes.
  Merge exception formatting changes.
  Make zend_get_exception_base static.
  Fix a few missed tests.
  Fix handler double copy.
  Updated tests to reflect exception class changes.
  Remodel exceptions based on Throwable interface
2015-06-17 21:55:03 +02:00
Derick Rethans
7eae1cc2ce - Updated to version 2015.5 (2015e) 2015-06-15 10:41:32 +01:00
Derick Rethans
c661e7680f - Updated to version 2015.5 (2015e) 2015-06-15 10:41:30 +01:00
Derick Rethans
558342124e - Updated to version 2015.5 (2015e) 2015-06-15 10:41:29 +01:00
Derick Rethans
37e3d92d64 - Updated to version 2015.5 (2015e) 2015-06-15 10:28:26 +01:00
Derick Rethans
22a43410cb - Updated to version 2015.5 (2015e) 2015-06-15 10:28:23 +01:00
Derick Rethans
9026a66579 - Updated to version 2015.5 (2015e) 2015-06-15 10:28:22 +01:00
Derick Rethans
40e1ef15be - Updated to version .-96 () 2015-06-15 10:17:27 +01:00
Derick Rethans
4903f1d139 - Updated to version .-96 () 2015-06-15 10:17:24 +01:00
Derick Rethans
1d6f4891bd - Updated to version .-96 () 2015-06-15 10:17:23 +01:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
Anatol Belski
b148c50f48 Revert fix for bug #55407
See 8e19705a93 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
2015-06-12 17:56:02 +02:00
Dmitry Stogov
1c754f0b71 Get rid of more ZVAL_ZVAL() macros 2015-06-12 13:33:14 +03:00
Dmitry Stogov
8e10e8f921 Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
2015-06-12 12:33:23 +03:00