php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
89,969 Commits 549 Branches 1,486 Tags
359df4dea8aa87f7b0c86471c312f60697e71b75
Commit Graph

1521 Commits

Author SHA1 Message Date
Derick Rethans c2ef8a9acc Merge branch 'PHP-5.6' 2015-04-29 00:29:04 +01:00
Derick Rethans ce9b6e5ee8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:28:56 +01:00
Derick Rethans 6a5798d990 Use new structures for tzdb header here as well 2015-04-29 00:28:50 +01:00
Derick Rethans 66c7eea659 Merge branch 'PHP-5.5' 2015-04-29 00:28:04 +01:00
Derick Rethans 7d6d8a3369 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:27:55 +01:00
Derick Rethans df49ce3d5a This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync 2015-04-29 00:25:29 +01:00
Derick Rethans f179852f83 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_tz.c
 2015-04-29 00:10:40 +01:00
Derick Rethans a1fef89abe Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:09:00 +01:00
Derick Rethans 912e42fc23 Split header reading in 32bit and 64bit variants. 
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
 2015-04-29 00:08:28 +01:00
Derick Rethans 43c69443bb Merge branch 'PHP-5.5' into PHP-5.6 2015-04-28 15:57:35 +01:00
Derick Rethans cdd2b8a79f Merge whitespace changes that have been made to timelib and PHP-5.6 and master 2015-04-28 15:57:26 +01:00
Matteo Beccati e645837ba1 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:15 +02:00
Matteo Beccati 4cabbf9781 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:11 +02:00
Matteo Beccati 7778a5a9b4 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:05 +02:00
Remi Collet 97fcbf041a relax tests with huge year (new zic) 2015-04-28 12:48:47 +02:00
Remi Collet c1e84a3bde ignore second value for huge timestamp test (new zic) 2015-04-28 12:48:38 +02:00
Remi Collet 194e64982e relax test for date < INT32_MIN (new zic) 2015-04-28 12:48:30 +02:00
Remi Collet ba41b340c2 relax bigbang content (new zic) 2015-04-28 12:48:23 +02:00
Remi Collet c39e777722 Make date transitions tests more flexible 
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
 2015-04-28 12:48:13 +02:00
Matteo Beccati 94f0b940f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix segfault in ext/date since 957aa2
 2015-04-28 11:08:46 +02:00
Matteo Beccati df490dcf0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix segfault in ext/date since 957aa2
 2015-04-28 10:57:52 +02:00
Matteo Beccati b5e5098c50 Fix segfault in ext/date since 957aa2 2015-04-28 10:57:18 +02:00
Derick Rethans 1a4d3e4855 Merge branch 'PHP-5.6' 2015-04-26 11:04:54 +01:00
Derick Rethans 1e18ffd2f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-26 11:04:35 +01:00
Derick Rethans 957aa220aa Fixed location reading due to file format changes 2015-04-26 11:04:16 +01:00
Derick Rethans 0cfbdb7200 - Updated to version 2015.4 (2015d) 2015-04-24 22:56:26 +01:00
Derick Rethans ad9aaf8093 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:33 +01:00
Derick Rethans 53c49994f2 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:31 +01:00
Remi Collet 1f0a6241b4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax tests with huge year (new zic)
 2015-04-18 10:00:24 +02:00
Remi Collet 1302eb7f72 relax tests with huge year (new zic) 2015-04-18 10:00:15 +02:00
Remi Collet 3bbfb96e1a ignore second value for huge timestamp test (new zic) 2015-04-18 09:37:06 +02:00
Remi Collet 81d01809a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax test for date < INT32_MIN (new zic)
 2015-04-18 09:28:39 +02:00
Remi Collet 3c81e945a3 relax test for date < INT32_MIN (new zic) 2015-04-18 09:28:29 +02:00
Remi Collet f877bdac72 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax bigbang content (new zic)
 2015-04-18 09:11:48 +02:00
Remi Collet 984f4b09e0 relax bigbang content (new zic) 2015-04-18 09:11:39 +02:00
Remi Collet 971441cfe5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Make date transitions tests more flexible
 2015-04-18 07:50:31 +02:00
Remi Collet cd93b120c3 Make date transitions tests more flexible 
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
 2015-04-18 07:47:47 +02:00
Nikita Popov 10756522a7 Fix leak in timezone_open when instantiation fails 2015-04-14 21:44:33 +02:00
Derick Rethans 66bd59225b - Updated to version 2015.3 (2015c) 2015-04-14 10:51:15 +01:00
Derick Rethans d887ef5a04 - Updated to version 2015.3 (2015c) 2015-04-14 10:51:12 +01:00
Derick Rethans 043f8ac51e - Updated to version 2015.3 (2015c) 2015-04-14 10:51:10 +01:00
Nikita Popov 122d759618 Always throw TypeException on throwing zpp failures 
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
 2015-04-06 11:27:34 +02:00
Stanislav Malyshev 4975019dd7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"

Conflicts:
	ext/date/php_date.c
	ext/date/tests/DateTime_verify.phpt
 2015-04-01 12:50:40 -07:00
Stanislav Malyshev 2d9399af35 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit aa22e80b1a, reversing
changes made to 3e7f47cb03.

Conflicts:
	ext/date/php_date.c
 2015-04-01 12:49:25 -07:00
Dmitry Stogov 4796e0242b Merge branch 'InternalClassClean' 
* InternalClassClean:
  Fixed test
  Patch improvement:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
 2015-04-01 12:11:13 +03:00
Derick Rethans d252c9f832 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_date.c
	ext/date/php_date.c
 2015-03-31 16:36:51 +01:00
Derick Rethans 2d3868984c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 16:35:10 +01:00
Derick Rethans ffbd380e44 Fixed bug #69336 (Issues with "last day of <monthname>"). 2015-03-31 16:35:03 +01:00
Derick Rethans f9d1a47f24 Merge branch 'PHP-5.6' 2015-03-31 11:09:31 +01:00
Derick Rethans 346c8f7331 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 11:09:23 +01:00