Commit Graph

1260 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
a19dba56d2 Merge branch '5.4'
Conflicts:
	NEWS
2012-03-21 12:43:51 +00:00
Gustavo André dos Santos Lopes
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
Christopher Jones
faa731f147 Merge branch 'PHP-5.4'
* PHP-5.4:
  Minor text changes (to try new git repo)
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 15:19:00 -07:00
Joshua Thijssen
91f2d3809e Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK 2012-03-19 21:48:55 +01:00
Gustavo André dos Santos Lopes
a3699726f9 - 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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
3954743813 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
80cb6e56f6 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Xinchen Hui
533d90066e Fix test 2012-03-11 08:30:30 +00:00
Xinchen Hui
e6ec1fb166 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Xinchen Hui
430486f0bf Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Xinchen Hui
a7639291b4 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
23e65a9dcc - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
88ba84fa7d - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650 - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Nikita Popov
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
Nikita Popov
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
Nikita Popov
4e2e632fbd 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
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
bdbcc1789d more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Adam Harvey
37272e46de Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2012-02-21 10:34:42 +00:00
Etienne Kneuss
78c8b4c8ff Fix test 2012-02-01 13:25:32 +00:00
Rasmus Lerdorf
ac5718cdd3 These tests don't work if run as root 2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
cb6603ac56 These tests don't work if run as root 2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
f1191166d8 These tests don't work if run as root 2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
adc8c296ac Make sure gc is enabled 2012-01-08 18:22:50 +00:00
Rasmus Lerdorf
2651a1fc39 Make sure gc is enabled 2012-01-08 18:22:50 +00:00
Rasmus Lerdorf
a7dca551f7 This test only works if gc is enabled 2012-01-08 18:21:13 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Patrick Allaert
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
Patrick Allaert
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
Patrick Allaert
2b392c9c10 Added tests contributions on spl_autoload and stream_context_set_option()
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:15:12 +00:00
Michael Wallner
d8ca919da1 Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings) 2011-12-02 11:50:22 +00:00
Michael Wallner
955cc549a0 Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings) 2011-12-02 11:50:22 +00:00
Antony Dovgal
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
Antony Dovgal
3b40dabc8c 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
Antony Dovgal
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
Rasmus Lerdorf
3f930c10bf functor? Where did that come from? 2011-11-14 16:23:56 +00:00
Lars Strojny
7d0fe66ebe Adjusting error messages 2011-11-14 00:26:37 +00:00
Felipe Pena
28d1bc37e2 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
c1e510aea8 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
72a133f155 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Peter Cowburn
9b86852d6e add 3rd parameter to arg info for splfileobject fgetcsv/setcsvcontrol (bug #60201) 2011-11-02 13:24:46 +00:00
Peter Cowburn
ac8ece2718 add 3rd parameter to arg info for splfileobject fgetcsv/setcsvcontrol (bug #60201) 2011-11-02 13:24:46 +00:00
Ferenc Kovacs
28faed47c4 ignore this test on FreeBSD per #60186 2011-11-01 10:25:47 +00:00
Ferenc Kovacs
bb4f96b2a1 duh 2011-11-01 10:20:39 +00:00
Ferenc Kovacs
5a2a02f655 marking ext/spl/tests/bug60082.phpt as slow test 2011-11-01 10:10:24 +00:00
Gustavo André dos Santos Lopes
32f7337bd4 - Reverted changes that required constructor overrides to invoke the parent
constructor in several SPL classes and applied 5.3 fixes instead.
  Related bugs: #54384, #55175 and #55300
2011-10-29 23:17:18 +00:00
Gustavo André dos Santos Lopes
41abc6d017 - Reverted changes that required constructor overrides to invoke the parent
constructor in several SPL classes and applied 5.3 fixes instead.
  Related bugs: #54384, #55175 and #55300
2011-10-29 23:17:18 +00:00
Stanislav Malyshev
d81ea16ef1 Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Stanislav Malyshev
ed12ebc79c Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Xinchen Hui
d2c8d30bb9 Test for #60082 2011-10-19 02:28:53 +00:00
Felipe Pena
83ca3c8ff9 - Fixed bug #60042 (spl_autoload_call may manipulate a dangling pointer)
patch by: tom at punkave dot com
2011-10-12 01:03:15 +00:00
Felipe Pena
261353382f - Fixed bug #60042 (spl_autoload_call may manipulate a dangling pointer)
patch by: tom at punkave dot com
2011-10-12 01:03:15 +00:00
Felipe Pena
71eaaf6567 - Fixed bug #60042 (spl_autoload_call may manipulate a dangling pointer)
patch by: tom at punkave dot com
2011-10-12 01:03:15 +00:00
Hannes Magnusson
f40e5204d4 Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY) 2011-09-30 14:17:23 +00:00
Hannes Magnusson
5fba3ba7c3 Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY) 2011-09-30 14:17:23 +00:00
Hannes Magnusson
b4f6baf9aa Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY) 2011-09-30 14:17:23 +00:00
Hannes Magnusson
3dabada846 Use the default stream context for FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator 2011-09-30 14:12:26 +00:00
Hannes Magnusson
317f933cd6 Use the default stream context for FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator 2011-09-30 14:12:26 +00:00
Hannes Magnusson
f19a112185 Test for non-string replacement, bug#54304 2011-09-12 17:20:44 +00:00
Hannes Magnusson
76d9a3fa3d Test for non-string replacement, bug#54304 2011-09-12 17:20:44 +00:00
Hannes Magnusson
4653534643 Test for non-string replacement, bug#54304 2011-09-12 17:20:44 +00:00
Hannes Magnusson
4ff1539384 Allow replacement to be any scalar value 2011-09-12 13:21:57 +00:00
Hannes Magnusson
75c4d6f888 Allow replacement to be any scalar value 2011-09-12 13:21:57 +00:00
Hannes Magnusson
2c5574b3d8 Allow replacement to be any scalar value 2011-09-12 13:21:57 +00:00
Pierre Joye
c35d34a10d - nuke unused var 2011-09-09 07:57:29 +00:00
Pierre Joye
7a3d89a9aa - nuke unused var 2011-09-09 07:57:29 +00:00
Pierre Joye
ba07a1c72b - improve r316420, function must return a value 2011-09-09 07:56:42 +00:00
Pierre Joye
2d9f758435 - improve r316420, function must return a value 2011-09-09 07:56:42 +00:00
Pierre Joye
6550af384f - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:12:32 +00:00
Pierre Joye
de12ac023c - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:12:32 +00:00
Etienne Kneuss
1e04e19a37 MFH: adapt check for __construct bypass 2011-09-08 23:10:40 +00:00
Pierre Joye
4ccef0b950 - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:07:48 +00:00
Pierre Joye
38c698c062 - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:07:48 +00:00
Pierre Joye
376ba8c92e - force LF 2011-09-08 16:10:07 +00:00
Pierre Joye
59571f6fce - force LF 2011-09-08 16:10:07 +00:00
Etienne Kneuss
5cc7663098 SplFileObject does not accept directories. It did not check for that and blindly opened the directory, which works on linux but fails on windows. Now SplFileObject uses a stat() call to make sure it isn't a directory, if it is, it fails with an exception. Tests have been changed accordingly. 2011-09-08 15:52:59 +00:00
Etienne Kneuss
3afb143e65 SplFileObject does not accept directories. It did not check for that and blindly opened the directory, which works on linux but fails on windows. Now SplFileObject uses a stat() call to make sure it isn't a directory, if it is, it fails with an exception. Tests have been changed accordingly. 2011-09-08 15:52:59 +00:00
Hannes Magnusson
a6c07ae0d3 Fix cleanup routines 2011-09-07 12:05:19 +00:00
Hannes Magnusson
12d67c1a45 Fix cleanup routines 2011-09-07 12:05:19 +00:00
Hannes Magnusson
04044dd07e Fix cleanup routines 2011-09-07 12:05:19 +00:00
Xinchen Hui
16d0023daf fix skipif description 2011-09-07 00:59:10 +00:00
Xinchen Hui
b1263c4363 fix skipif description 2011-09-07 00:59:10 +00:00
Xinchen Hui
b7788089e1 fix skipif description 2011-09-07 00:59:10 +00:00
Pierre Joye
f2b8c5395c - use a more portable name for the filename 2011-09-06 11:24:21 +00:00
Pierre Joye
efc45f8b60 - use a more portable name for the filename 2011-09-06 11:24:21 +00:00
Pierre Joye
f438a87d90 - use something we know it exists... 2011-09-06 07:26:05 +00:00
Pierre Joye
71cda5ea0a - use something we know it exists... 2011-09-06 07:26:05 +00:00
Pierre Joye
1d22c75eb3 - use something we know it exists... 2011-09-06 07:26:05 +00:00
Pierre Joye
c97a56e77f - skip on win, name.. name. are not valid names 2011-09-06 07:23:20 +00:00
Pierre Joye
d29a253629 - skip on win, name.. name. are not valid names 2011-09-06 07:23:20 +00:00
Pierre Joye
80a2175c37 - skip on win, name.. name. are not valid names 2011-09-06 07:23:20 +00:00
Hannes Magnusson
eba373139c Add skipifs for bug#54971 (patch by datibbaw@) 2011-08-30 13:46:24 +00:00
Hannes Magnusson
850d865551 Add skipifs for bug#54971 (patch by datibbaw@) 2011-08-30 13:46:24 +00:00
Hannes Magnusson
d972f636c9 Add skipifs for bug#54971 (patch by datibbaw@) 2011-08-30 13:46:24 +00:00
Etienne Kneuss
b03860a935 Fix CID 593 Mark the missing break by an explicit comment, we DO intend to fall through here 2011-08-12 22:20:35 +00:00
Etienne Kneuss
80742189b8 Fix CID 593 Mark the missing break by an explicit comment, we DO intend to fall through here 2011-08-12 22:20:35 +00:00
Etienne Kneuss
bb7a93081e Fix CID 538/539, explicitely check for something that should never occur 2011-08-12 22:05:10 +00:00
Etienne Kneuss
5128d59331 Fix CID 538/539, explicitely check for something that should never occur 2011-08-12 22:05:10 +00:00
Etienne Kneuss
cf2db20123 Fix CID 547, make static analyzer happy 2011-08-12 21:57:54 +00:00
Etienne Kneuss
81700b8b2f Fix CID 1211, unused intern variable 2011-08-12 21:46:40 +00:00
Etienne Kneuss
32e67db84c Fix CID 1211, unused intern variable 2011-08-12 21:46:40 +00:00
Etienne Kneuss
482e4b9d70 Fix validator for SplFileInfo constructor 2011-08-08 12:05:34 +00:00
Xinchen Hui
a8a0a6c3f1 Sizeof mismatch 2011-08-08 08:49:55 +00:00
Xinchen Hui
802b871ea1 Sizeof mismatch 2011-08-08 08:49:55 +00:00
Xinchen Hui
dbd405a001 Wrong sizeof 2011-08-08 02:33:03 +00:00
Xinchen Hui
8bae5e220e Wrong sizeof 2011-08-08 02:33:03 +00:00
Peter Cowburn
4d28bb722b added (recursive)callbackfilteriterator to spl_classes() (bug #55287) 2011-07-27 08:48:08 +00:00
Peter Cowburn
9159e3d246 added (recursive)callbackfilteriterator to spl_classes() (bug #55287) 2011-07-27 08:48:08 +00:00
Pierre Joye
438cc3e255 - use cwd_expand now 2011-07-26 07:30:41 +00:00
Pierre Joye
5107df2d04 - use cwd_expand now 2011-07-26 07:30:41 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Stefan Marr
dca6f950a9 Added forgotten tests cases for class_uses() from commit rev. 313640 2011-07-24 10:20:08 +00:00
Stefan Marr
f9cb269d59 Added forgotten tests cases for class_uses() from commit rev. 313640 2011-07-24 10:20:08 +00:00
Stefan Marr
1fc4bc1d56 Added missing class_uses(..) function to SPL to mirror class_implements(..).
# Was pointed out as missing in bug #55266.
2011-07-23 19:08:43 +00:00
Stefan Marr
35f58b972f Added missing class_uses(..) function to SPL to mirror class_implements(..).
# Was pointed out as missing in bug #55266.
2011-07-23 19:08:43 +00:00
Pierrick Charron
824726073b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierrick Charron
fb5da94c1b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierre Joye
45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Etienne Kneuss
28c3a180b2 Fix crash 2011-07-12 21:57:14 +00:00
Etienne Kneuss
0909cafc7d Fix crash 2011-07-12 21:57:14 +00:00
Etienne Kneuss
c13f2c3e2c Fix #48860 Implement Serialization for DLL 2011-07-12 21:43:17 +00:00
Etienne Kneuss
fdce66dfd2 Fix #48860 Implement Serialization for DLL 2011-07-12 21:43:17 +00:00
Pierrick Charron
1b416caeb1 Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true) 2011-06-28 11:09:06 +00:00
Pierrick Charron
e53ca46fc0 Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true) 2011-06-28 11:09:06 +00:00
Pierrick Charron
a814063804 Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true) 2011-06-28 11:09:06 +00:00
Knut Urdalen
778edca904 fixed temp directory names in spl tests 2011-06-25 07:45:41 +00:00
Knut Urdalen
785a7a5056 fixed temp directory names in spl tests 2011-06-25 07:45:41 +00:00
Knut Urdalen
db34dc0a8b fixed temp directory names in spl tests 2011-06-25 07:45:41 +00:00
Knut Urdalen
f8e21c395b fixed/refactored some spl tests related to owner/group retrieval 2011-06-25 04:50:42 +00:00
Knut Urdalen
bf61fbb33a fixed/refactored some spl tests related to owner/group retrieval 2011-06-25 04:50:42 +00:00
Knut Urdalen
fe724baa4d fixed/refactored some spl tests related to owner/group retrieval 2011-06-25 04:50:42 +00:00
Felipe Pena
b8d10158d1 - Drop C++ style comments 2011-06-10 23:14:15 +00:00
Felipe Pena
191df85605 - Drop C++ style comments 2011-06-10 23:14:15 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
0afd4bd18b - Possible fix for bug #54609 (Certain implementation(s) of SplFixedArray cause hard crash) 2011-06-05 01:38:12 +00:00
Felipe Pena
f57cbfcaa1 - Possible fix for bug #54609 (Certain implementation(s) of SplFixedArray cause hard crash) 2011-06-05 01:38:12 +00:00
Felipe Pena
a2124382ac - Possible fix for bug #54609 (Certain implementation(s) of SplFixedArray cause hard crash) 2011-06-05 01:38:12 +00:00
Felipe Pena
47315dfdf6 - Fixed bug #54970 (SplFixedArray::setSize() isn't resizing) 2011-06-02 00:40:27 +00:00