Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.3' into PHP-5.4 | Etienne Kneuss | 2013-03-16 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-5.3: Remove spurious int cast in between two longs | ||||
| * | Remove spurious int cast in between two longs | Etienne Kneuss | 2013-03-16 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2013-02-26 | 2 | -1/+23 |
|\ \ | |/ | | | | | | | * PHP-5.3: Bug #52861: unset fails with ArrayObject and deep arrays | ||||
| * | Bug #52861: unset fails with ArrayObject and deep arrays | Mike Willbanks | 2013-02-26 | 2 | -1/+23 |
| | | | | | | | | When checking to make into a reference write, readwrite are checked but not unset | ||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-02-24 | 2 | -10/+44 |
|\ \ | |/ | | | | | | | Conflicts: ext/spl/spl_fixedarray.c | ||||
| * | Fixed bug #64264 (SPLFixedArray toArray problem) | Xinchen Hui | 2013-02-24 | 2 | -11/+42 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-02-17 | 1 | -0/+25 |
|\ \ | |/ | |||||
| * | Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS) | Xinchen Hui | 2013-02-17 | 2 | -1/+27 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2013-01-30 | 3 | -2/+25 |
|\ \ | |/ | |||||
| * | Fixed bug #64106: Segfault on SplFixedArray[][x] = y when extended | Nikita Popov | 2013-01-30 | 3 | -2/+25 |
| | | |||||
* | | Merge branch 'bug64023' into PHP-5.4 | Gustavo Lopes | 2013-01-22 | 2 | -0/+24 |
|\ \ | |/ | | | | | | | | | | | | | | | * bug64023: Fix bug #64023 (__toString() & SplFileInfo) Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||||
| * | Fix bug #64023 (__toString() & SplFileInfo) | Gustavo Lopes | 2013-01-22 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Defining a __toString() method was having no effect when concatenating the object. This was because the cast_object() handler would ignore __toString(). Using echo() directly would actually use __toString(), but this was a bug: the ECHO handler would try zend_std_cast_object_tostring() before cast_object(), but cast_object() should have priority as zend_std_cast_object_tostring() assumes an object with a zend_class_entry. | ||||
| * | Happy New Year~ | Xinchen Hui | 2013-01-01 | 22 | -22/+22 |
| | | |||||
* | | Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa." | Adam Harvey | 2013-01-15 | 1 | -5/+5 |
| | | | | | | | | This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a. | ||||
* | | Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa. | Adam Harvey | 2013-01-15 | 1 | -5/+5 |
| | | |||||
* | | Happy New Year | Xinchen Hui | 2013-01-01 | 22 | -22/+22 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-12-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MFH | Xinchen Hui | 2012-12-13 | 1 | -1/+1 |
| | | |||||
* | | Use get_gc instead of hacks of get_properties | Dmitry Stogov | 2012-12-05 | 1 | -12/+5 |
| | | |||||
* | | Fixed bug #63680 (Memleak in splfixedarray with cycle reference) | Dmitry Stogov | 2012-12-05 | 2 | -1/+35 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 40 | -0/+0 |
|\ \ | |/ | |||||
| * | Remove executable permission on inc | Xinchen Hui | 2012-10-10 | 40 | -0/+0 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 140 | -0/+0 |
|\ \ | |/ | |||||
| * | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 141 | -0/+0 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-09 | 16 | -0/+0 |
|\ \ | |/ | |||||
| * | Fixed bug #63236 (Executable permission on various source files) | Xinchen Hui | 2012-10-09 | 16 | -0/+0 |
| | | |||||
* | | Fixed bug #63184 test ↵ | Xinchen Hui | 2012-10-01 | 1 | -1/+1 |
| | | | | | | | | (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed) | ||||
* | | Fix test | Xinchen Hui | 2012-10-01 | 1 | -2/+0 |
| | | |||||
* | | Remove meaningless md5 string && Attempt to fix #63184 | Xinchen Hui | 2012-09-29 | 2 | -31/+29 |
| | | |||||
* | | fix unix/win dir separators | Anatoliy Belsky | 2012-09-27 | 2 | -11/+11 |
| | | |||||
* | | Merging PR #116 | Lars Strojny | 2012-09-18 | 2 | -0/+110 |
| | | |||||
* | | Remove extra blank in notice message, should act as same as vm | Xinchen Hui | 2012-09-01 | 18 | -56/+56 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-09-01 | 2 | -37/+87 |
|\ \ | |/ | | | | | | | Conflicts: ext/spl/spl_array.c | ||||
| * | Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all ↵ | Xinchen Hui | 2012-09-01 | 2 | -32/+88 |
| | | | | | | | | | | | | undefined variables) The get_zval_ptr_ptr of spl_array handler should act as same as the vm's | ||||
| * | Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) | Xinchen Hui | 2012-08-23 | 2 | -4/+27 |
| | | |||||
* | | Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) | Xinchen Hui | 2012-08-23 | 2 | -4/+27 |
| | | |||||
* | | Implemented FR #62840 (Add sort flag to ArrayObject::ksort) | Xinchen Hui | 2012-08-21 | 3 | -22/+70 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-08-19 | 1 | -1/+0 |
|\ \ | |/ | | | | | | | * PHP-5.3: - Value stored to var is never used | ||||
| * | - Value stored to var is never used | Felipe Pena | 2012-08-19 | 1 | -1/+0 |
| | | |||||
| * | missed the test script | Xinchen Hui | 2012-07-21 | 1 | -0/+15 |
| | | |||||
| * | Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance ↵ | Xinchen Hui | 2012-07-21 | 1 | -0/+2 |
| | | | | | | | | gives Segmentation fault) | ||||
* | | more test script for #62328 | Xinchen Hui | 2012-08-13 | 1 | -0/+24 |
| | | |||||
* | | Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance ↵ | Xinchen Hui | 2012-07-21 | 2 | -0/+17 |
| | | | | | | | | gives Segmentation fault) | ||||
* | | Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array ↵ | Stanislav Malyshev | 2012-07-14 | 2 | -55/+126 |
| | | | | | | | | empty or moved to the end) | ||||
* | | removed unneccesary arrat and ini settings | donnut | 2012-07-14 | 11 | -31/+0 |
| | | |||||
* | | addition SplFileObject tests | donnut | 2012-07-14 | 16 | -0/+323 |
| | | |||||
* | | new tests from PHP TestFest June 2012 | donnut | 2012-07-14 | 16 | -0/+359 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-07-12 | 4 | -45/+2 |
|\ \ | |/ | | | | | | | * PHP-5.3: reverted changes for #62477 | ||||
| * | reverted changes for #62477 | Anatoliy Belsky | 2012-07-12 | 4 | -45/+2 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-07-11 | 4 | -2/+45 |
|\ \ | |/ | | | | | | | * PHP-5.3: Fixed bug #62477 LimitIterator int overflow |