c2ef8a9acc
Merge branch 'PHP-5.6'
2015-04-29 00:29:04 +01:00
ce9b6e5ee8
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:28:56 +01:00
6a5798d990
Use new structures for tzdb header here as well
2015-04-29 00:28:50 +01:00
10756522a7
Fix leak in timezone_open when instantiation fails
2015-04-14 21:44:33 +02:00
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
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
2d9399af35
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit aa22e80b1a3e7f47cb03
2015-04-01 12:49:25 -07:00
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
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
2d3868984c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-31 16:35:10 +01:00
ffbd380e44
Fixed bug #69336 (Issues with "last day of <monthname>").
2015-03-31 16:35:03 +01:00
1018f462d8
Patch improvement:
...
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
2015-03-30 18:53:38 +03:00
75e86b44fc
Drop this redundant check, since the minimum version of VC we support is VC11 (_MSC_VER == 1700) in ext/date
2015-03-29 07:14:54 +02:00
ec89c85054
cleaning up the version macros
2015-03-23 20:13:59 +01:00
081a812b49
Merge branch 'PHP-5.6'
...
* PHP-5.6:
oops, forgot TSRMLS_CC
Conflicts:
ext/date/php_date.c
2015-03-22 21:56:40 -07:00
57f835e148
oops, forgot TSRMLS_CC
2015-03-22 21:55:34 -07:00
dc6d8f7838
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Conflicts:
ext/date/php_date.c
2015-03-22 21:09:00 -07:00
cc2fd00942
Merge branch 'pull-request/1145'
...
* pull-request/1145:
Putting whitespace back to the way it was.
Updating the `DateTime_verify` test to include the new method in the reflected method list
Whoops! String length....
Adding a new test for the new method
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:04:41 -07:00
aa22e80b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:03:46 -07:00
c2e22556ba
Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable()
2015-03-22 20:54:25 -07:00
d146d15003
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()
2015-03-20 02:02:42 +03:00
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
98c6567e71
Putting whitespace back to the way it was.
2015-03-11 09:29:08 -04:00
42660f3d6a
Adding a new createFromImmutable method to the
...
`DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-05 01:58:09 -05:00
1359dfd18f
Revert mktime()/gmmktime()'s arginfo
...
$is_dst parameter has been removed in commit: 9c5eaac18b
2015-02-28 18:32:18 +08:00
968a9f4807
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:43:41 +08:00
1b240ff9e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:40:06 +08:00
f824f91ac9
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
...
This include:
- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime (missing "is_dst")
- gmmktime (missing "is_dst")
2015-02-28 16:37:14 +08:00
b22caa81ee
Remove useless date warning
2015-02-27 23:27:09 +01:00
5b8a504519
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/php_date.c
2015-02-27 11:13:07 +08:00
2d1a3ecd27
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:11:45 +08:00
e441d71baa
fix bug#68942's patch
...
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
2015-02-27 10:41:53 +08:00
e6819794eb
Adding 'v' formatting to DateTime::format(), and adding constant DateTime::RFC3339_EXTENDED to output datetime using the RFC3339 extended format (aka ISO8601 extended format)
2015-02-20 09:21:14 -03:00
0a331f49c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TS build
2015-02-17 07:47:27 +01:00
213725057e
fix TS build
2015-02-17 07:47:12 +01:00
625ab10f99
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
2015-02-17 07:02:20 +01:00
78389b29f9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
2015-02-17 06:57:50 +01:00
29a4e710de
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
2015-02-17 06:53:27 +01:00
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
2015-02-04 17:39:16 +01:00
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
aa5e34d79e
remove unused var
2015-01-30 10:28:57 +01:00
a3a529411e
Merge branch 'PHP-5.6'
2015-01-20 21:44:36 +00:00
1d09926e33
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-20 21:44:25 +00:00
8e19705a93
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
2015-01-20 21:44:19 +00:00
9c5eaac18b
Remove mktime() and gmmktime() $is_dst parameter
2015-01-17 18:26:45 +01:00
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Derick Rethans