cce4764f13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug RecursiveArrayIterator does not implement Countable
Conflicts:
ext/spl/spl_array.c
2012-06-19 18:08:22 +02:00
4cba4c6193
Fixed bug RecursiveArrayIterator does not implement Countable
...
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
2012-06-19 18:04:14 +02:00
a10da87c6a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-24 23:34:14 +08:00
bde86a6639
Fixed bug #62073
...
(Different ways of iterating over an SplMaxHeap result in in different keys)
2012-05-24 23:31:05 +08:00
9205c4fd62
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-23 20:42:06 +08:00
adfb4c62b7
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
...
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
2012-04-19 11:33:12 +02:00
b2f2e1d6cc
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
2012-04-10 14:03:19 +02:00
593578c8c1
Merge branch '5.3' into 5.4
2012-03-28 13:06:05 +01:00
f07dd29fdc
Fixed problem introduced in a763929 (fixing bug #61347 ).
...
The test added in 8c44c85
2012-03-28 13:04:41 +01:00
1b179545c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added failing test for ArrayObject::offsetExists().
2012-03-27 19:00:28 +05:00
ddac4688e8
Added failing test for ArrayObject::offsetExists().
2012-03-27 18:59:04 +05:00
e018e2ae86
Merge branch '5.3' into 5.4
2012-03-23 22:14:36 +00:00
372801d94c
Fixed tests that var_dump/print_r DOM objects.
2012-03-23 22:08:33 +00:00
0cf70b1a42
Merge branch '5.3' into 5.4
2012-03-23 11:32:20 +00:00
3960def881
Fixed bug #61482 , caused by the fix to bug #61418 .
...
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
2012-03-23 11:19:19 +00:00
85725337d5
Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 "
...
This reverts commit a89c4a34ee
2012-03-23 09:40:27 +00:00
bcc15b5633
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
Add initialization tests for SQLT_INT binds
Fix NEWS
2012-03-22 22:30:51 -07:00
a89c4a34ee
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
...
This reverts commit 714f1ff4b3
2012-03-22 22:29:50 -07:00
dd33437eee
Revert "Fixed reference counting"
...
This reverts commit 752fec88ef
2012-03-22 15:52:32 +04:00
672fe54a00
Revert "Fixed reference counting"
...
This reverts commit 14af1fe692
2012-03-22 15:51:58 +04:00
752fec88ef
Fixed reference counting
2012-03-22 15:03:38 +04:00
14af1fe692
Fixed reference counting
2012-03-22 15:03:16 +04:00
54f0d50d3e
Made some SplFileObject::fputcsv not pollute the working dir.
2012-03-21 13:13:17 +00:00
0f001703a8
Fixed bug #61453 .
...
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
2012-03-21 12:42:09 +00:00
91f2d3809e
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 21:48:55 +01:00
d870a41118
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
714f1ff4b3
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
af2fc625df
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
80cb6e56f6
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
533d90066e
Fix test
2012-03-11 08:30:30 +00:00
430486f0bf
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
a7639291b4
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
88ba84fa7d
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
7bbf5fe650
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
3bc1455496
Fix bug #60596 : Code Cleanup Removing Superfluous If Statement
...
Cleanup only, no function change. Patch by ircmaxell.
2012-03-04 13:52:48 +00:00
6d08a84614
Fix bug #60596 : Code Cleanup Removing Superfluous If Statement
...
Cleanup only, no function change. Patch by ircmaxell.
2012-03-04 13:52:48 +00:00
e613889d50
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
ce535f1819
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
78c8b4c8ff
Fix test
2012-02-01 13:25:32 +00:00
ac5718cdd3
These tests don't work if run as root
2012-01-08 18:43:30 +00:00
f1191166d8
These tests don't work if run as root
2012-01-08 18:43:30 +00:00
adc8c296ac
Make sure gc is enabled
2012-01-08 18:22:50 +00:00
a7dca551f7
This test only works if gc is enabled
2012-01-08 18:21:13 +00:00
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
ea25a9be03
Added tests contributions on spl_autoload and stream_context_set_option()
...
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:45:39 +00:00
183493d624
Added tests contributions on spl_autoload and stream_context_set_option()
...
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:23:19 +00:00
d8ca919da1
Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings)
2011-12-02 11:50:22 +00:00
c3b83e833d
fix bug #60082 (Crash in ArrayObject() when using recursive references)
...
--Tis line, and those below, will be ignored--
M trunk/ext/spl/spl_array.c
M branches/PHP_5_4/ext/spl/spl_array.c
M branches/PHP_5_3/ext/spl/spl_array.c
M branches/PHP_5_3/NEWS
2011-11-18 05:22:35 +00:00
ea97932279
fix bug #60082 (Crash in ArrayObject() when using recursive references)
...
--Tis line, and those below, will be ignored--
M trunk/ext/spl/spl_array.c
M branches/PHP_5_4/ext/spl/spl_array.c
M branches/PHP_5_3/ext/spl/spl_array.c
M branches/PHP_5_3/NEWS
2011-11-18 05:22:35 +00:00
Nikita Popov