Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 5 | -5/+5 |
|\ | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 5 | -5/+5 |
| | | |||||
| * | fixed test | Christoph M. Becker | 2015-08-01 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-05-31 | 3 | -1/+52 |
| |\ | | | | | | | | | | | | | | | | * PHP-5.5: split the original test to check behaviour diff on 32- and 64-bit recovered original meaning of SXE xpath test | ||||
| | * | split the original test to check behaviour diff on 32- and 64-bit | Christoph M. Becker | 2015-05-31 | 2 | -0/+44 |
| | | | |||||
| | * | recovered original meaning of SXE xpath test | Christoph M. Becker | 2015-05-31 | 1 | -1/+8 |
| | | | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-05-29 | 7 | -1/+299 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.5: Refactored the fix for bug #66084, by cmb@php.net Merge the fix for #69703 to 5.5 per request from Julien | ||||
| | * | Refactored the fix for bug #66084, by cmb@php.net | Anatol Belski | 2015-05-29 | 7 | -1/+299 |
| | | | |||||
| | * | Bump year | Xinchen Hui | 2015-01-15 | 5 | -5/+5 |
| | | | |||||
| * | | bump year | Xinchen Hui | 2015-01-15 | 5 | -5/+5 |
| | | | |||||
* | | | fix test | Anatol Belski | 2015-08-26 | 1 | -7/+2 |
| | | | |||||
* | | | add range checks to simplexml | Anatol Belski | 2015-08-26 | 1 | -3/+34 |
| | | | |||||
* | | | Fix simplexml warnings | Nikita Popov | 2015-07-17 | 1 | -4/+4 |
| | | | |||||
* | | | Switch position of ce in exception ce variable names | Aaron Piotrowski | 2015-07-03 | 1 | -1/+1 |
| | | | |||||
* | | | Change zend_exception_get_default() to zend_exception_ce | Aaron Piotrowski | 2015-07-03 | 1 | -1/+1 |
| | | | |||||
* | | | Cleanup (removed dead code) | Dmitry Stogov | 2015-07-01 | 1 | -5/+0 |
| | | | |||||
* | | | Improved zend_string API (Francois Laupretre) | Dmitry Stogov | 2015-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 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 b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods | ||||
* | | | Fix more proto comments | Rasmus Lerdorf | 2015-06-23 | 1 | -1/+1 |
| | | | |||||
* | | | Fix some missed tests | Aaron Piotrowski | 2015-06-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-06-14 | 11 | -26/+368 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt | ||||
| * | | | Get rid of more ZVAL_ZVAL() macros | Dmitry Stogov | 2015-06-12 | 1 | -2/+9 |
| | | | | |||||
| * | | | Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few ↵ | Dmitry Stogov | 2015-06-12 | 1 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | places). Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places) | ||||
| * | | | Make convert_to_* safe with rc>1 | Nikita Popov | 2015-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only involves switching zval_dtor to zval_ptr_dtor for arrays and making the convert_to_object for arrays a bit more generic. All the other changes outside zend_operators.c just make use of this new ability (use COPY instead of DUP). What's still missing: Proper references handling. I've seen many convert_to* calls that will break when a reference is used. Also fixes bug #69788. | ||||
| * | | | split simplexml tests for 7 | Christoph M. Becker | 2015-05-31 | 3 | -12/+53 |
| | | | | |||||
| * | | | removed test for unrelated bug #68946 | Christoph M. Becker | 2015-05-29 | 1 | -16/+0 |
| | | | | |||||
| * | | | fixed whitespace dependend behavior of casting SimpleXMLElements to boolean | Christoph M. Becker | 2015-05-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | added tests for bug #61335, bug #67572 and bug #68946 (the latter already ↵ | Christoph M. Becker | 2015-05-29 | 3 | -0/+68 |
| | | | | | | | | | | | | | | | | passing, but better safe than sorry) | ||||
| * | | | fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing ↵ | Christoph M. Becker | 2015-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | SimpleXMLElements | ||||
| * | | | added failing tests for bug #62639, bug #67116, bug #69169 and bug #69491 | Christoph M. Becker | 2015-05-29 | 4 | -0/+246 |
| | | | | |||||
* | | | | Update exception names in tests after formatting changes. | Aaron Piotrowski | 2015-05-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-05-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Tweak uncaught exception message display | Nikita Popov | 2015-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions. | ||||
* | | | | Updated tests to reflect exception class changes. | Aaron Piotrowski | 2015-05-16 | 2 | -3/+3 |
|/ / / | |||||
* | | | Display EngineExceptions like ordinary exceptions | Nikita Popov | 2015-05-15 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup. | ||||
* | | | improve searchability for libxml2 headers | Anatol Belski | 2015-05-10 | 1 | -2/+4 |
| | | | | | | | | | | | | and bring the configs inline with the current libxml2 build | ||||
* | | | Merge branch 'master' of git.php.net:php-src | Xinchen Hui | 2015-05-06 | 1 | -40/+70 |
|\ \ \ | |||||
| * | | | Loop splitting and specialization | Dmitry Stogov | 2015-05-05 | 1 | -12/+35 |
| | | | | |||||
| * | | | Fixed compilation warning | Dmitry Stogov | 2015-05-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use zend heap instead of system | Dmitry Stogov | 2015-05-05 | 1 | -12/+12 |
| | | | | |||||
| * | | | Use better zend_hash_*() functions. | Dmitry Stogov | 2015-05-05 | 1 | -13/+16 |
| | | | | |||||
| * | | | Removed check for count() in SXE class | Dmitry Stogov | 2015-05-05 | 1 | -3/+7 |
| | | | | |||||
* | | | | fixed comment | Xinchen Hui | 2015-05-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Unused macros | Xinchen Hui | 2015-05-05 | 1 | -11/+0 |
| | | | |||||
* | | | Optimize cast simplexml to IS_BOOL | Xinchen Hui | 2015-05-05 | 1 | -5/+96 |
| | | | |||||
* | | | Unused var | Xinchen Hui | 2015-05-05 | 1 | -4/+2 |
| | | | |||||
* | | | Avoid repeatable lookups for count() method in the same class entry. | Dmitry Stogov | 2015-05-05 | 1 | -27/+47 |
| | | | |||||
* | | | Always throw TypeException on throwing zpp failures | Nikita Popov | 2015-04-06 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | cleanup mod version macros and mod defs, round x | Anatol Belski | 2015-03-23 | 2 | -1/+4 |
| | | | |||||
* | | | export useful symbols from ext/simplexml | Anatol Belski | 2015-03-23 | 2 | -3/+5 |
| | | | |||||
* | | | more fixes to the shared compilation | Anatol Belski | 2015-03-23 | 1 | -0/+4 |
| | | |