php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,406 Commits 549 Branches 1,485 Tags
2142d78281fe093043b50897d8a22f00910dfd0c
Commit Graph

1238 Commits

Author SHA1 Message Date
Derick Rethans 0e5f475f5e Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 15:59:17 +01:00
Derick Rethans 0874ef624c Merge branch 'PHP-5.4' into PHP-5.5 2014-10-04 15:58:40 +01:00
Florian MARGAINE 046c345de5 DateTimeZone::getOffset() now accepts a DateTimeInterface 
Fixes #68062
 2014-10-04 15:58:24 +01:00
Derick Rethans 71c39612d5 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-26 16:27:05 +01:00
Derick Rethans 5d299509b4 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-26 16:27:00 +01:00
Derick Rethans 16e2d954fc - Updated to version 2014.8 (2014h) 2014-09-26 16:26:59 +01:00
Derick Rethans f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans 21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Stanislav Malyshev 6da2a977fc fix test 2014-08-20 14:44:25 -07:00
Stanislav Malyshev 2dfabd8b51 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:43:22 -07:00
Stanislav Malyshev 6424bf659d fix test 2014-08-20 14:42:48 -07:00
Derick Rethans 77cc6aabb7 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-18 20:27:44 +01:00
Derick Rethans 36d05d75c8 Fixed bug #67109: First uppercase letter breaks date string parsing. 2014-08-18 18:41:50 +01:00
Derick Rethans 2b9af967fb Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10. 2014-08-18 18:41:50 +01:00
Tjerk Meesters 7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters 4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters 4647016abe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #66091
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:20:10 +08:00
Tjerk Meesters c5f619ba6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:15:52 +08:00
Tjerk Meesters f6896e4395 Fixed #66091 2014-08-13 20:12:42 +08:00
Ferenc Kovacs 54e8595f34 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
 2014-08-12 10:38:35 +02:00
Ferenc Kovacs 7aa776c7b4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
 2014-08-12 10:37:44 +02:00
Ferenc Kovacs 39dd715382 fix the failing date tests introduced with the latest timezonedb update 
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
 2014-08-12 10:34:54 +02:00
Derick Rethans 33e9bb79a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-07 10:22:14 +01:00
Derick Rethans 0753c22e76 Merge branch 'PHP-5.4' into PHP-5.5 2014-08-07 10:22:10 +01:00
Derick Rethans 7df4087b98 - Updated to version 2014.6 (2014f) 2014-08-07 10:22:09 +01:00
Peter Cowburn 6a4f0b14eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:34:50 +01:00
Peter Cowburn c2f2d5c8fc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
 2014-07-31 14:33:55 +01:00
Peter Cowburn 358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Lior Kaplan c186ce8fef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:09:54 +03:00
Lior Kaplan 3e1b749f5e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:04:23 +03:00
Lior Kaplan 2dff153b23 Enable build without atoll (e.g old AIX flavours) 2014-07-17 22:58:36 +03:00
Lior Kaplan 11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan 6f3bcb0d6e Update copyright year for re2c generated files 2014-06-16 23:28:36 +03:00
Lior Kaplan e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Remi Collet 6788f14f5e fix failed test 2014-06-16 10:52:26 +02:00
Derick Rethans a06dabb5e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-13 23:26:47 +01:00
Derick Rethans c06ccf7c70 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-13 23:26:43 +01:00
Derick Rethans ce70b920e4 - Updated to version 2014.5 (2014e) 2014-06-13 23:26:42 +01:00
Remi Collet b16950b5d3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test for 5.4/5.5
 2014-06-05 17:34:32 +02:00
Remi Collet 67f1a58ac9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test for 5.4/5.5
 2014-06-05 17:34:09 +02:00
Remi Collet 127651e9ae fix test for 5.4/5.5 2014-06-05 17:33:40 +02:00
Remi Collet 218df7e058 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add test for previous fix
 2014-06-05 14:00:29 +02:00
Remi Collet ab848ea400 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add test for previous fix
 2014-06-05 14:00:15 +02:00
Remi Collet 15d8c80ead add test for previous fix 2014-06-05 14:00:00 +02:00
Remi Collet 2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:46:41 +02:00
Remi Collet 9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:45:57 +02:00
Remi Collet 1fe9f1e4f5 Fix regression introduce in fix for bug #67118 
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
  which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.
 2014-06-05 13:39:46 +02:00
Adam Harvey 549331a925 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:05:08 -05:00