Commit Graph

547 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
47315dfdf6 - Fixed bug #54970 (SplFixedArray::setSize() isn't resizing) 2011-06-02 00:40:27 +00:00
Felipe Pena
767f924665 - Fixed bug #54970 (SplFixedArray::setSize() isn't resizing) 2011-06-02 00:40:27 +00:00
Felipe Pena
df4c4a9e7f - Fixed bug #54970 (SplFixedArray::setSize() isn't resizing) 2011-06-02 00:40:27 +00:00
Dmitry Stogov
77ed819430 Fixed bug #54323 (Accessing unset()'ed ArrayObject's property causes crash) 2011-04-07 14:52:30 +00:00
Gustavo André dos Santos Lopes
2975308e1a - Fixed bug #54384 (Dual iterators, GlobIterator, SplFileObject and
SplTempFileObject crash when user-space classes don't call the paren
  constructor).
2011-04-04 02:50:27 +00:00
Gustavo André dos Santos Lopes
f7b7b6aa9e - Improved upon r309729.
- Extented strategy to remaining the classes on spl_directory.c, even those that don't crash.
- UPGRADING.
- Better bug54384.phpt, with all the classes covered.
2011-03-27 22:44:34 +00:00
Arnaud Le Blanc
b83e243c23 Added CallbackFilterIterator and RecursiveCallbackFilterIterator classes
[DOC] This is a concrete FilterIterator which takes a callback as
constructor parameter, and uses this callback for filtering. This allows
to use FilterIterator without extending it.

CallbackFilterIterator Example:

$it = new ArrayIterator(range(1,100));
$it = new CallbackFilterIterator($it, function($value) {
	return $value % 2;
});
foreach($it as $value) // ...

RecursiveCallbackFilterIterator Example:

$it = new RecursiveDirectoryIterator("/");
$it = new RecursiveCallbackFilterIterator($it, function($file, $k, $it) {
	return $it->hasChildren() || $file->getSize() > 1024;
});
foreach(new RecursiveIteratorIterator($it) as $file) // ...

The callback takes the current value, the current key and the inner
iterator as parameters.
2011-03-27 20:13:27 +00:00
Gustavo André dos Santos Lopes
c2fe893985 - Fixed bug #54384: Several SPL classes crash when parent constructor is
not called.
#Merge to 5.3 pending (slight BC break on AppendIterator, as it's no
#longer possible to defer the call to the parent constructor until
#after the constructor is performed).
#Bugs fixed in an atypical way for SPL. The parent constructor call
#check is performed at construction time by using a wrapper constructor
#instead of a check on the beginning of each instance method.
#Perhaps this should be uniformized in trunk; this method was mainly
#applied only to the ones crashing, except a few iterators (at least
#AppendIterator and RecursiveIteratorIterator).
2011-03-27 04:21:06 +00:00
Felipe Pena
39e0aa4dc6 - Fixed bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) 2011-03-23 22:46:04 +00:00
Felipe Pena
0ab7f1cebf - Fixed bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) 2011-03-23 22:46:04 +00:00
Felipe Pena
0dd448cbf1 - Fixed bug #54281 (Crash in non-initialized RecursiveIteratorIterator) 2011-03-22 22:41:16 +00:00
Felipe Pena
11c4a5b96a - Fixed bug #54281 (Crash in non-initialized RecursiveIteratorIterator) 2011-03-22 22:41:16 +00:00
Gustavo André dos Santos Lopes
f06e3ba5c1 - Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting
with \0).
2011-03-19 23:15:04 +00:00
Gustavo André dos Santos Lopes
8deb11c0c3 - Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting
with \0).
2011-03-19 23:15:04 +00:00
Peter Cowburn
14c6cc5b7f MFH - Added SplFileInfo::getExtension() (FR #48767) 2011-02-11 22:07:22 +00:00
Adam Harvey
6bc25ca285 Fix bug #53914 (SPL assumes HAVE_GLOB is defined). Original patch by Chris
Jones; test updates by myself.
2011-02-04 10:49:49 +00:00
Adam Harvey
a7d4b80ca2 Fix bug #53914 (SPL assumes HAVE_GLOB is defined). Original patch by Chris
Jones; test updates by myself.
2011-02-04 10:49:49 +00:00
Adam Harvey
3571c955b5 Implement request #53659 (Implementing RegexIterator::getRegex() method). Patch
by Joshua Thijssen.
2011-01-06 02:32:02 +00:00
Adam Harvey
e4fe297006 Remove empty files left when r306542 was reverted in r306552. 2011-01-06 02:24:49 +00:00
Adam Harvey
e7a1d5004e Remove empty files left when r306542 was reverted in r306552. 2011-01-06 02:24:49 +00:00
Etienne Kneuss
47fc5e06f0 Implement SplObjectStorage::removeAllExcept (Patch by Matthey Turland) 2011-01-05 15:01:18 +00:00
Etienne Kneuss
78728e33fa Implement SplObjectStorage::removeAllExcept (Patch by Matthey Turland) 2011-01-05 15:01:18 +00:00
Eyal Teutsch
cc1759598f SplFileObject_fgetcsv files: SplFileObject__fgetcsv.csv used instead of SplFileObject::fgetcsv.csv, as to make this naming convetion windows legitimate 2010-12-26 13:29:29 +00:00
Eyal Teutsch
83ef8850a0 SplFileObject_fgetcsv files: SplFileObject__fgetcsv.csv used instead of SplFileObject::fgetcsv.csv, as to make this naming convetion windows legitimate 2010-12-26 13:29:29 +00:00
Peter Cowburn
064a254483 Implemented FR #48767 (SplFileInfo::getExtension()) 2010-12-23 22:32:52 +00:00
Gustavo André dos Santos Lopes
9b698dbcea - Revert of revision 306542, turns out the semantics of compare() are
different in SplMinHeap and SplMaxHeap.
2010-12-21 19:52:17 +00:00
Gustavo André dos Santos Lopes
8f44d2ca36 - Revert of revision 306542, turns out the semantics of compare() are
different in SplMinHeap and SplMaxHeap.
2010-12-21 19:52:17 +00:00
Gustavo André dos Santos Lopes
4a11d76a75 - Fixed bug #53588 (SplMinHeap bad sorting with custom compare
function).
2010-12-21 17:29:14 +00:00
Gustavo André dos Santos Lopes
e427e312d4 - Fixed bug #53588 (SplMinHeap bad sorting with custom compare
function).
2010-12-21 17:29:14 +00:00
Eyal Teutsch
95c4e449d1 moved the second unlink() to the CLEAN section in the SplFileObject_fwrite_variation* tests 2010-12-12 07:24:51 +00:00
Eyal Teutsch
8e2475a787 moved the second unlink() to the CLEAN section in the SplFileObject_fwrite_variation* tests 2010-12-12 07:24:51 +00:00
Felipe Pena
9864040e35 - Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0 values) 2010-12-10 23:58:33 +00:00
Felipe Pena
13c99651fc - Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0 values) 2010-12-10 23:58:33 +00:00
Dmitry Stogov
c35fc78890 Fixed bug #53511 (Exceptions are lost in case an exception is thrown in catch operator) 2010-12-09 16:38:37 +00:00
Eyal Teutsch
7eb70247a3 test bug42364 included a superfluous ?> 2010-12-09 12:39:21 +00:00
Eyal Teutsch
f69051602a test bug42364 included a superfluous ?> 2010-12-09 12:39:21 +00:00
Felipe Pena
9608da9443 - Fixed bug #53362 (Segmentation fault when extending SplFixedArray) 2010-11-19 20:07:32 +00:00
Felipe Pena
f16059d697 - Fixed bug #53362 (Segmentation fault when extending SplFixedArray) 2010-11-19 20:07:32 +00:00
Jani Taskinen
d225fe4e58 - Fix test 2010-11-17 14:54:37 +00:00
Jani Taskinen
6d7fa61843 - Fix test 2010-11-17 14:54:37 +00:00
Felipe Pena
6958cb4a14 - Added missing void arg checks 2010-11-14 18:40:08 +00:00
Felipe Pena
8192f0f771 - Added missing void arg checks 2010-11-14 18:40:08 +00:00
Adam Harvey
6cb7ea4089 Implemented FR #53264 (Add fputcsv method to SplFileObject). 2010-11-09 15:07:50 +00:00
Adam Harvey
150a741fee Fix bug #53279 (SplFileObject doesn't initialise default CSV escape character). 2010-11-09 14:53:23 +00:00
Adam Harvey
84dc845ff8 Fix bug #53279 (SplFileObject doesn't initialise default CSV escape character). 2010-11-09 14:53:23 +00:00
Felipe Pena
590ad22361 - Fix the fix (wrong behavior) 2010-11-08 20:26:14 +00:00
Felipe Pena
22f7998a0d - Fix the fix (wrong behavior) 2010-11-08 20:26:14 +00:00
Felipe Pena
7636635ec5 - Fixed bug #50579 (RegexIterator::REPLACE doesn't work) 2010-11-06 00:09:50 +00:00
Felipe Pena
d31e4e7f8e - Fixed bug #50579 (RegexIterator::REPLACE doesn't work) 2010-11-06 00:09:50 +00:00
Gustavo André dos Santos Lopes
5721132c29 - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). 2010-10-25 01:41:54 +00:00
Gustavo André dos Santos Lopes
7fcce35f9b - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). 2010-10-25 01:41:54 +00:00
Felipe Pena
f0d2559d26 - Fixed bug #53144 (SplObjectStorage::removeAll()) 2010-10-24 14:03:07 +00:00
Felipe Pena
6887b97a8d - Fixed bug #53144 (SplObjectStorage::removeAll()) 2010-10-24 14:03:07 +00:00
Felipe Pena
2fb2f81538 - Improved fix for bug #52573 2010-08-18 01:59:37 +00:00
Felipe Pena
f3028b9226 - Improved fix for bug #52573 2010-08-18 01:59:37 +00:00
Felipe Pena
658272c9ee - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault) 2010-08-10 22:37:24 +00:00
Felipe Pena
c10bb27254 - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault) 2010-08-10 22:37:24 +00:00
Johannes Schlüter
e46fee1d1a Fix bug #52238: Crash when an Exception occured in iterator_to_array 2010-07-02 19:17:45 +00:00
Johannes Schlüter
21d5041c03 Fix bug #52238: Crash when an Exception occured in iterator_to_array 2010-07-02 19:17:45 +00:00
Stanislav Malyshev
865f85718f fix SplObjectStorage unserialization (CVE-2010-2225) 2010-06-29 00:58:31 +00:00
Stanislav Malyshev
de8022e905 fix SplObjectStorage unserialization (CVE-2010-2225) 2010-06-29 00:58:31 +00:00
Ben Longden
ddc9246071 Merged SplFileObject::fgetcsv tests from trunk 2010-06-15 21:42:04 +00:00
Ben Longden
45bd9b385e Added tests for SplFileObject::fgetcsv 2010-06-15 21:25:47 +00:00