Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-02-27 | 2 | -2/+2 |
|\ | | | | | | | | | * PHP-5.4: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 | ||||
| * | fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 | Ferenc Kovacs | 2014-02-27 | 2 | -2/+2 |
| | | |||||
| * | Bump year | Xinchen Hui | 2014-01-03 | 2 | -2/+2 |
| | | |||||
* | | Bump year | Xinchen Hui | 2014-01-03 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-12-10 | 2 | -40/+47 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed Bug #66218 zend_register_functions breaks reflection | ||||
| * | Fixed Bug #66218 zend_register_functions breaks reflection | Remi Collet | 2013-12-10 | 2 | -40/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection. Ex: additional_functions from api_module_entry. Ex: in CLI, dl, cli_set_process_title and cli_get_process_title Note: - also affects functions overrided in extension (should be be reported in extension, where overrided, not in original extension) - also allow extension to call zend_register_functions for various list (instead of having a single bug list) | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c | ||||
| * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -1/+1 |
| | | |||||
| * | typo fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | typo fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-06-20 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | * PHP-5.4: skip test for bug #64936 when tokenizer not built | ||||
| * | skip test for bug #64936 when tokenizer not built | Remi Collet | 2013-06-20 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-16 | 2 | -0/+39 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #64936 - clean doc comment state at the beginning and end of the scan ws fix Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_language_scanner_defs.h | ||||
| * | Fix bug #64936 - clean doc comment state at the beginning and end of the scan | Stanislav Malyshev | 2013-06-16 | 2 | -0/+39 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-03-21 | 2 | -1/+46 |
|\ \ | |/ | |||||
| * | Fix bug in reflectionClass relate to #64239 | Xinchen Hui | 2013-03-21 | 2 | -1/+46 |
| | | |||||
| * | Happy New Year | Xinchen Hui | 2013-01-01 | 2 | -2/+2 |
| | | |||||
* | | Made test compatible with O+ | Dmitry Stogov | 2013-03-16 | 9 | -0/+27 |
| | | |||||
* | | Fix test related to change for #bug64007 and also fix in newInstanceArgs | Xinchen Hui | 2013-01-22 | 2 | -12/+28 |
| | | |||||
* | | Fixed bug #64007 (There is an ability to create instance of Generator by hand). | Xinchen Hui | 2013-01-19 | 2 | -8/+25 |
| | | | | | | | | Use get_constrctor instead of access of the ce->constructor directly | ||||
* | | Happy New Year | Xinchen Hui | 2013-01-01 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2012-11-27 | 2 | -1/+42 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-11-27 | 2 | -1/+42 |
| |\ | |||||
| | * | Fixed Bug #63614 (Fatal error on Reflection) | Xinchen Hui | 2012-11-27 | 2 | -1/+42 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-31 | 3 | -4/+53 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves ↵ | Xinchen Hui | 2012-10-31 | 3 | -4/+53 |
| | | | | | | | | | | | | traitnames) | ||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 53 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 3 | -0/+0 |
| | | | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 50 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 50 | -0/+0 |
| | | | |||||
| | * | Fixed bug that can not get default value of parameter if it's not `optional` | Xinchen Hui | 2012-08-02 | 2 | -4/+7 |
| | | | |||||
* | | | Implemented ReflectionFunction::isGenerator() | Reeze Xia | 2012-09-02 | 2 | -0/+61 |
|/ / | |||||
* | | - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing ↵ | Felipe Pena | 2012-08-22 | 1 | -2/+4 |
| | | | | | | | | trait methods as private) | ||||
* | | Fixed bug that can not get default value of parameter if it's not `optional` | Xinchen Hui | 2012-08-02 | 3 | -9/+9 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-08-01 | 2 | -3/+18 |
|\ \ | |/ | |||||
| * | Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result) | Xinchen Hui | 2012-08-01 | 2 | -3/+18 |
| | | |||||
| * | Fix #62432 ReflectionMethod random corrupt memory on high concurrent | Johannes Schlüter | 2012-06-27 | 1 | -1/+1 |
| | | | | | | | | | | This fixes the same issue in multiple extensions. This isn't needed in later branches as 5.4 introduced object_properties_init() | ||||
* | | Merge branch 'pull-request/96' into PHP-5.4 | Stanislav Malyshev | 2012-07-14 | 4 | -12/+210 |
|\ \ | | | | | | | | | | | | | * pull-request/96: Implemented FR #61602 Allow access to name of constant used as default value | ||||
| * | | Implemented FR #61602 Allow access to name of constant used as default value | Reeze Xia | 2012-05-31 | 4 | -12/+210 |
| | | | | | | | | | | | | | | | This is an improved commit for FR #61602, this fixed the previous commit 054f3e3's C99 compiler compatibility issue | ||||
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-06-23 | 1 | -5/+3 |
|\ \ \ | | |/ | |/| | | | | | | | * PHP-5.3: - Improved fix for #62384 | ||||
| * | | - Improved fix for #62384 | Felipe Pena | 2012-06-23 | 1 | -5/+3 |
| | | | |||||
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-06-22 | 2 | -0/+31 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.3: - Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul) | ||||
| * | | - Fixed bug #62384 (Attempting to invoke a Closure more than once causes ↵ | Felipe Pena | 2012-06-22 | 2 | -0/+31 |
| | | | | | | | | | | | | segfaul) | ||||
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-06-01 | 1 | -1/+2 |
|\ \ \ | |/ / | | / | |/ |/| | * PHP-5.3: Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) | ||||
| * | Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with ↵ | Xinchen Hui | 2012-06-01 | 1 | -1/+2 |
| | | | | | | | | constant) | ||||
| * | Fix typo while resolving conflicts | Xinchen Hui | 2012-05-23 | 1 | -1/+1 |
| | | |||||
| * | Revert "Implemented FR #61602 Allow access to name of constant used as ↵ | Xinchen Hui | 2012-05-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | default value" This reverts commit 054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74. See: http://news.php.net/php.cvs/69137 and the author confirmed. Will commit later after the author fixed this then make a new PR. Conflicts: ext/reflection/php_reflection.c | ||||
* | | Revert "Implemented FR #61602 Allow access to name of constant used as ↵ | Xinchen Hui | 2012-05-23 | 4 | -191/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | default value" This reverts commit 054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74. See: http://news.php.net/php.cvs/69137 and the author confirmed. Will commit later after the author fixed this then make a new PR. Conflicts: ext/reflection/php_reflection.c | ||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | zoe slattery | 2012-05-15 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | * PHP-5.3: Small fixes to tests, see #62022 | ||||
| * | | Small fixes to tests, see #62022 | zoe slattery | 2012-05-15 | 1 | -1/+0 |
| |/ |