clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,574 Commits 494 Branches 1,367 Tags 802 MiB
a01e8c1fe9
Commit Graph

1482 Commits

Author SHA1 Message Date
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
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
Derick Rethans
2c117a40a7 Export date_get_immutable_ce() so that extensions can make use of it too. 2015-03-31 11:08:56 +01:00
Dmitry Stogov
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
Kalle Sommer Nielsen
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
Anatol Belski
ec89c85054 cleaning up the version macros 2015-03-23 20:13:59 +01:00
Stanislav Malyshev
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
Stanislav Malyshev
57f835e148 oops, forgot TSRMLS_CC 2015-03-22 21:55:34 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
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
Trevor Suarez
c2e22556ba Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable() 2015-03-22 20:54:25 -07:00
Derick Rethans
a86a871bd0 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:14 +01:00
Derick Rethans
a73d0b0fb3 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:11 +01:00
Derick Rethans
b98a486606 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:09 +01:00
Dmitry Stogov
d146d15003 Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
Anatol Belski
92d106d26d fixed test 2015-03-13 17:33:48 +01:00
Dmitry Stogov
8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Trevor Suarez
98c6567e71 Putting whitespace back to the way it was. 2015-03-11 09:29:08 -04:00
Dmitry Stogov
a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Trevor Suarez
1de1b6f927 Updating the DateTime_verify test to include the 
new method in the reflected method list
 2015-03-05 09:50:32 -05:00
Trevor Suarez
d3863aeaf7 Whoops! String length.... 2015-03-05 02:57:14 -05:00
Trevor Suarez
46f22acdcd Adding a new test for the new method 2015-03-05 02:02:50 -05:00
Trevor Suarez
42660f3d6a Adding a new createFromImmutable method to the 
`DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-05 01:58:09 -05:00
Reeze Xia
1359dfd18f Revert mktime()/gmmktime()'s arginfo 
$is_dst parameter has been removed in commit: 9c5eaac18b
 2015-02-28 18:32:18 +08:00
Reeze Xia
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
Reeze Xia
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
Reeze Xia
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
Bob Weinand
b22caa81ee Remove useless date warning 2015-02-27 23:27:09 +01:00
Anatol Belski
5aec067b34 fix dir separator in tests 2015-02-27 16:48:09 +01:00
Xinchen Hui
5b8a504519 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/php_date.c
 2015-02-27 11:13:07 +08:00
Xinchen Hui
2d1a3ecd27 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:11:45 +08:00
Taoguang Chen
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
Mariano Iglesias
d20da1d92e Renaming test to match Bug #69089 2015-02-20 14:17:11 -03:00
Mariano Iglesias
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
Stanislav Malyshev
0a331f49c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2015-02-17 07:47:27 +01:00
Stanislav Malyshev
213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev
625ab10f99 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 07:02:20 +01:00
Stanislav Malyshev
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
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00