summaryrefslogtreecommitdiff
path: root/ext/spl
diff options
context:
space:
mode:
Diffstat (limited to 'ext/spl')
-rw-r--r--ext/spl/examples/tests/dualiterator_001.phpt4
-rw-r--r--ext/spl/tests/DirectoryIterator_by_reference.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_debug-info.phpt4
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt4
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt4
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt4
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt4
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_fflush_basic_001.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_fpassthru_basic.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation1.phpt18
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation10.phpt20
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation11.phpt18
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation12.phpt18
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation13.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation5.phpt18
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation6.phpt20
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation7.phpt20
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation8.phpt20
-rw-r--r--ext/spl/tests/SplFileObject_fscanf_basic.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_ftruncate_error_001.phpt4
-rw-r--r--ext/spl/tests/SplFileObject_fwrite_error_001.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt2
-rw-r--r--ext/spl/tests/SplFileObject_rewind_error001.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_fromarray_indexes.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_offsetUnset_string.phpt10
-rw-r--r--ext/spl/tests/SplFixedArray_toArray_with-params.phpt6
-rw-r--r--ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt8
-rw-r--r--ext/spl/tests/arrayObject___construct_basic2.phpt10
-rw-r--r--ext/spl/tests/arrayObject___construct_basic3.phpt10
-rw-r--r--ext/spl/tests/arrayObject___construct_basic4.phpt10
-rw-r--r--ext/spl/tests/arrayObject___construct_basic5.phpt10
-rw-r--r--ext/spl/tests/arrayObject___construct_basic6.phpt2
-rw-r--r--ext/spl/tests/arrayObject_asort_basic1.phpt4
-rw-r--r--ext/spl/tests/arrayObject_asort_basic2.phpt4
-rw-r--r--ext/spl/tests/arrayObject_clone_basic1.phpt2
-rw-r--r--ext/spl/tests/arrayObject_clone_basic2.phpt2
-rw-r--r--ext/spl/tests/arrayObject_clone_basic3.phpt2
-rw-r--r--ext/spl/tests/arrayObject_count_basic1.phpt2
-rw-r--r--ext/spl/tests/arrayObject_exchangeArray_basic3.phpt2
-rw-r--r--ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt16
-rw-r--r--ext/spl/tests/arrayObject_ksort_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_ksort_basic2.phpt6
-rw-r--r--ext/spl/tests/arrayObject_magicMethods1.phpt12
-rw-r--r--ext/spl/tests/arrayObject_magicMethods2.phpt12
-rw-r--r--ext/spl/tests/arrayObject_magicMethods3.phpt12
-rw-r--r--ext/spl/tests/arrayObject_magicMethods4.phpt12
-rw-r--r--ext/spl/tests/arrayObject_magicMethods5.phpt12
-rw-r--r--ext/spl/tests/arrayObject_magicMethods6.phpt12
-rw-r--r--ext/spl/tests/arrayObject_natcasesort_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_natsort_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_setFlags_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_setFlags_basic2.phpt4
-rw-r--r--ext/spl/tests/arrayObject_uasort_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_uasort_error1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_uksort_basic1.phpt6
-rw-r--r--ext/spl/tests/arrayObject_uksort_error1.phpt4
-rw-r--r--ext/spl/tests/array_003.phpt6
-rw-r--r--ext/spl/tests/array_005.phpt12
-rw-r--r--ext/spl/tests/array_007.phpt8
-rw-r--r--ext/spl/tests/array_009a.phpt2
-rw-r--r--ext/spl/tests/array_013.phpt2
-rw-r--r--ext/spl/tests/array_017.phpt14
-rw-r--r--ext/spl/tests/array_021.phpt2
-rw-r--r--ext/spl/tests/array_022.phpt2
-rw-r--r--ext/spl/tests/bug32134.phpt2
-rw-r--r--ext/spl/tests/bug33136.phpt6
-rw-r--r--ext/spl/tests/bug34548.phpt2
-rw-r--r--ext/spl/tests/bug36258.phpt2
-rw-r--r--ext/spl/tests/bug36825.phpt2
-rw-r--r--ext/spl/tests/bug37457.phpt4
-rw-r--r--ext/spl/tests/bug41691.phpt2
-rw-r--r--ext/spl/tests/bug41692.phpt2
-rw-r--r--ext/spl/tests/bug42703.phpt8
-rw-r--r--ext/spl/tests/bug45216.phpt2
-rw-r--r--ext/spl/tests/bug45614.phpt2
-rw-r--r--ext/spl/tests/bug45622.phpt2
-rw-r--r--ext/spl/tests/bug45622b.phpt2
-rw-r--r--ext/spl/tests/bug49723.phpt2
-rw-r--r--ext/spl/tests/bug50579.phpt6
-rw-r--r--ext/spl/tests/bug52238.phpt2
-rw-r--r--ext/spl/tests/bug53515.phpt2
-rw-r--r--ext/spl/tests/bug60201.phpt2
-rw-r--r--ext/spl/tests/bug62433.phpt2
-rw-r--r--ext/spl/tests/bug62904.phpt2
-rw-r--r--ext/spl/tests/bug64264.phpt10
-rw-r--r--ext/spl/tests/bug66834.phpt6
-rw-r--r--ext/spl/tests/bug68479.phpt2
-rw-r--r--ext/spl/tests/bug71838.phpt2
-rw-r--r--ext/spl/tests/bug73471.phpt2
-rw-r--r--ext/spl/tests/bug74519.phpt2
-rw-r--r--ext/spl/tests/bug75173.phpt2
-rw-r--r--ext/spl/tests/bug76367.phpt2
-rw-r--r--ext/spl/tests/class_implements_basic.phpt6
-rw-r--r--ext/spl/tests/class_implements_basic2.phpt6
-rw-r--r--ext/spl/tests/class_implements_variation.phpt4
-rw-r--r--ext/spl/tests/class_implements_variation1.phpt8
-rw-r--r--ext/spl/tests/class_implements_variation2.phpt8
-rw-r--r--ext/spl/tests/class_uses_basic.phpt4
-rw-r--r--ext/spl/tests/class_uses_basic2.phpt4
-rw-r--r--ext/spl/tests/class_uses_variation.phpt2
-rw-r--r--ext/spl/tests/class_uses_variation1.phpt6
-rw-r--r--ext/spl/tests/class_uses_variation2.phpt6
-rw-r--r--ext/spl/tests/countable_class_basic1.phpt2
-rw-r--r--ext/spl/tests/fileobject_003.phpt2
-rw-r--r--ext/spl/tests/fileobject_005.phpt2
-rw-r--r--ext/spl/tests/fileobject_getbasename_basic.phpt2
-rw-r--r--ext/spl/tests/fileobject_getmaxlinelen_basic.phpt4
-rw-r--r--ext/spl/tests/fileobject_setmaxlinelen_basic.phpt4
-rw-r--r--ext/spl/tests/filesystemiterator_flags.phpt2
-rw-r--r--ext/spl/tests/fixedarray_008.phpt2
-rw-r--r--ext/spl/tests/fixedarray_010.phpt8
-rw-r--r--ext/spl/tests/fixedarray_015.phpt2
-rw-r--r--ext/spl/tests/heap_corruption.phpt2
-rw-r--r--ext/spl/tests/iterator_001.phpt2
-rw-r--r--ext/spl/tests/iterator_002.phpt6
-rw-r--r--ext/spl/tests/iterator_003.phpt12
-rw-r--r--ext/spl/tests/iterator_022.phpt2
-rw-r--r--ext/spl/tests/iterator_023.phpt2
-rw-r--r--ext/spl/tests/iterator_025.phpt2
-rw-r--r--ext/spl/tests/iterator_031.phpt4
-rw-r--r--ext/spl/tests/iterator_034.phpt2
-rw-r--r--ext/spl/tests/iterator_035.phpt4
-rw-r--r--ext/spl/tests/iterator_036.phpt2
-rw-r--r--ext/spl/tests/iterator_037.phpt2
-rw-r--r--ext/spl/tests/iterator_045.phpt4
-rw-r--r--ext/spl/tests/iterator_049b.phptbin633 -> 632 bytes
-rw-r--r--ext/spl/tests/iterator_052.phpt4
-rw-r--r--ext/spl/tests/iterator_053.phpt4
-rw-r--r--ext/spl/tests/iterator_056.phpt8
-rw-r--r--ext/spl/tests/iterator_057.phpt4
-rw-r--r--ext/spl/tests/iterator_058.phpt8
-rw-r--r--ext/spl/tests/iterator_062.phpt2
-rw-r--r--ext/spl/tests/iterator_069.phpt2
-rw-r--r--ext/spl/tests/iterator_071.phpt4
-rw-r--r--ext/spl/tests/observer_001.phpt2
-rw-r--r--ext/spl/tests/observer_002.phpt10
-rw-r--r--ext/spl/tests/observer_003.phpt2
-rw-r--r--ext/spl/tests/observer_004.phpt4
-rw-r--r--ext/spl/tests/observer_005.phpt4
-rw-r--r--ext/spl/tests/observer_006.phpt4
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt4
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt4
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt4
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt4
-rw-r--r--ext/spl/tests/regexiterator_setflags_exception.phpt2
-rw-r--r--ext/spl/tests/regexiterator_setpregflags_exception.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_002.phpt4
-rw-r--r--ext/spl/tests/spl_autoload_005.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_008.phpt6
-rw-r--r--ext/spl/tests/spl_caching_iterator_constructor_flags.phpt2
-rw-r--r--ext/spl/tests/spl_classes.phpt2
-rw-r--r--ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_getcallchildren.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_iterator_constructor.phpt2
-rw-r--r--ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt2
160 files changed, 402 insertions, 402 deletions
diff --git a/ext/spl/examples/tests/dualiterator_001.phpt b/ext/spl/examples/tests/dualiterator_001.phpt
index 53c11537af..b2462bb45f 100644
--- a/ext/spl/examples/tests/dualiterator_001.phpt
+++ b/ext/spl/examples/tests/dualiterator_001.phpt
@@ -15,8 +15,8 @@ spl_autoload_register('spl_examples_autoload');
function test($a, $b, $identical = false)
{
var_dump(DualIterator::compareIterators(
- new RecursiveArrayIterator($a),
- new RecursiveArrayIterator($b),
+ new RecursiveArrayIterator($a),
+ new RecursiveArrayIterator($b),
$identical));
}
diff --git a/ext/spl/tests/DirectoryIterator_by_reference.phpt b/ext/spl/tests/DirectoryIterator_by_reference.phpt
index 06127ec37b..ffe7cd7b9e 100644
--- a/ext/spl/tests/DirectoryIterator_by_reference.phpt
+++ b/ext/spl/tests/DirectoryIterator_by_reference.phpt
@@ -5,7 +5,7 @@ Havard Eide <nucleuz@gmail.com>
#PHPTestFest2009 Norway 2009-06-09 \o/
--FILE--
<?php
-$it = new DirectoryIterator(__DIR__);
+$it = new DirectoryIterator(__DIR__);
foreach( $it as &$file ) {
echo $file . "\n";
}
diff --git a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
index 36c72de191..60203eb4a0 100644
--- a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
@@ -1,5 +1,5 @@
--TEST--
-Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter.
+Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter.
--CREDITS--
Philip Norton philipnorton42@gmail.com
--FILE--
diff --git a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
index 3164b42206..c5d10919ff 100644
--- a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
// Add some items to the list
$dll->push(1);
$dll->push(2);
$dll->push(3);
-
+
// Check the debug info
print_r($dll);
?>
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
index 8d7aaf8c93..a05ba68f7a 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
@@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
var_dump($dll->isEmpty("test"));
?>
--EXPECTF--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
index f129385d07..4e9e2b33de 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
@@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
var_dump($dll->isEmpty());
?>
--EXPECT--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
index 6ea9198bf0..5e3d8e9ee2 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
@@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
// Add some items to the list
$dll->push(1);
$dll->push(2);
$dll->push(3);
//var_dump($dll);
-
+
var_dump($dll->isEmpty("test"));
?>
--EXPECTF--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
index cac1866bc1..4b308f345b 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
@@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
// Add some items to the list
$dll->push(1);
$dll->push(2);
$dll->push(3);
//var_dump($dll);
-
+
var_dump($dll->isEmpty());
?>
--EXPECT--
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
index d3d1d7d9a9..838100be1e 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
// Add some items to the list
$dll->push(1);
$dll->push(2);
$dll->push(3);
-
+
try {
$dll->offsetUnset(-1);
}
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
index aea73b93b4..cd77f11aef 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a new Doubly Linked List
$dll = new SplDoublyLinkedList();
-
+
// Add some items to the list
$dll->push(1);
$dll->push(2);
$dll->push(3);
-
+
try {
$dll->offsetUnset(3);
}
diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index f370159e3b..6aba866669 100644
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -1,5 +1,5 @@
--TEST--
-Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter.
+Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter.
--CREDITS--
Philip Norton philipnorton42@gmail.com
--FILE--
diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
index 2d8a9c8044..b7b0c31dc6 100644
--- a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
+++ b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::fflush function - basic test
+SplFileObject::fflush function - basic test
--FILE--
<?php
/*
diff --git a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
index 55b7481d95..0bd349fc92 100644
--- a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::fpassthru function - basic functionality test
+SplFileObject::fpassthru function - basic functionality test
--FILE--
<?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
index 6780b242dd..f5583a8195 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
@@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with all parameters specified
echo "*** Testing fputcsv() : with all parameters specified ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation1.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
var_dump( $fo->fputcsv($csv_field, $delimiter, $enclosure) );
// check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
index 08a2461b4d..57f5681517 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
@@ -7,8 +7,8 @@ SplFileObject::fputcsv(): Usage variations -- with line without any CSV fields
echo "*** Testing fputcsv() : with no CSV format in the field ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
@@ -23,13 +23,13 @@ $file = "$file_path/fputcsv_variation10.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($fields as $field) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -37,22 +37,22 @@ foreach ($fields as $field) {
$fo = new SplFileObject($file, $file_modes[$mode_counter]);
}
$csv_field = $field;
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field) );
-
+
// check the file pointer position and eof
var_dump( $fo->ftell() );
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
index c85dd0a8cd..ede8e59413 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
@@ -7,8 +7,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure value
echo "*** Testing fputcsv() : with default enclosure value ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation11.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field, $delimiter) );
// check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
index 8bb47d3371..c4bc9f112d 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
@@ -8,8 +8,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure and differe
echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -30,13 +30,13 @@ $file = "$file_path/fputcsv_variation12.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field, '+') );
// check the file pointer position and eof
@@ -54,13 +54,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
index b7c2a6381d..9edaf571fe 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test fputcsv() : usage variations - with default enclosure & delimiter of two chars
+Test fputcsv() : usage variations - with default enclosure & delimiter of two chars
--FILE--
<?php
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
index 9c4c01f54f..4b9e930c7c 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
@@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with default arguments value
echo "*** Testing fputcsv() : with default arguments value ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation5.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field) );
// check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
index 6cbb880aaf..842bb563d1 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test fputcsv() : usage variations - with different delimiter and enclosure
+Test fputcsv() : usage variations - with different delimiter and enclosure
--FILE--
<?php
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure
echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation6.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field, '+', '%') );
// check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
index ceb438a9f1..0f9b8ce366 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test fputcsv() : usage variations - with different delimiter and same enclosure
+Test fputcsv() : usage variations - with different delimiter and same enclosure
--FILE--
<?php
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure
echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation7.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field, '+', $enclosure) );
// check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
index f1a8cbf7b1..64f32187ac 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test fputcsv() : usage variations - with same delimiter and different enclosure
+Test fputcsv() : usage variations - with same delimiter and different enclosure
--FILE--
<?php
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure
echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n";
-/* the array is with three elements in it. Each element should be read as
- 1st element is delimiter, 2nd element is enclosure
+/* the array is with three elements in it. Each element should be read as
+ 1st element is delimiter, 2nd element is enclosure
and 3rd element is csv fields
*/
$csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation8.tmp";
$file_modes = array ("r+", "r+b", "r+t",
"a+", "a+b", "a+t",
"w+", "w+b", "w+t",
- "x+", "x+b", "x+t");
+ "x+", "x+b", "x+t");
$loop_counter = 1;
foreach ($csv_lists as $csv_list) {
for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-
- echo "\n-- file opened in $file_modes[$mode_counter] --\n";
+
+ echo "\n-- file opened in $file_modes[$mode_counter] --\n";
// create the file and add the content with has csv fields
if ( strstr($file_modes[$mode_counter], "r") ) {
$fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
$delimiter = $csv_list[0];
$enclosure = $csv_list[1];
$csv_field = $csv_list[2];
-
+
// write to a file in csv format
var_dump( $fo->fputcsv($csv_field, $delimiter, '+') );
// check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
var_dump( $fo->eof() );
//close the file
unset($fo);
-
- // print the file contents
+
+ // print the file contents
var_dump( file_get_contents($file) );
//delete file
unlink($file);
- } //end of mode loop
+ } //end of mode loop
} // end of foreach
echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fscanf_basic.phpt b/ext/spl/tests/SplFileObject_fscanf_basic.phpt
index 5279039f0c..2f668ac73e 100644
--- a/ext/spl/tests/SplFileObject_fscanf_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fscanf_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::fscanf function - basic functionality test
+SplFileObject::fscanf function - basic functionality test
--FILE--
<?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
index a2eef604f1..831e855b85 100644
--- a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::ftruncate function - truncating with stream that does not support truncation
+SplFileObject::ftruncate function - truncating with stream that does not support truncation
--FILE--
<?php
@@ -21,7 +21,7 @@ $ftruncate_test = "";
//end creating stream
//open an SplFileObject using the above test stream
-$obj = New SplFileObject("SPLtest://ftruncate_test");
+$obj = New SplFileObject("SPLtest://ftruncate_test");
try {
$obj->ftruncate(1);
} catch (LogicException $e) {
diff --git a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
index 296a1f36c9..0418086e9e 100644
--- a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::fpassthru function - parameters test
+SplFileObject::fpassthru function - parameters test
--FILE--
<?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
index 4e3de4bab2..5c65a1b76b 100644
--- a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
+++ b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
@@ -1,5 +1,5 @@
--TEST--
-SplFileObject::getCsvControl function - basic test
+SplFileObject::getCsvControl function - basic test
--FILE--
<?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_rewind_error001.phpt b/ext/spl/tests/SplFileObject_rewind_error001.phpt
index 5f2379aa13..2e4aefb7a7 100644
--- a/ext/spl/tests/SplFileObject_rewind_error001.phpt
+++ b/ext/spl/tests/SplFileObject_rewind_error001.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: SplFileObject::rewind() with a parameter.
+SPL: SplFileObject::rewind() with a parameter.
--CREDITS--
Ricardo Oedietram <ricardo@odracir.nl>
Erwin Poeze <erwin.poeze@gmail.com>
diff --git a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
index 034d457318..aa2bde95c5 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
@@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function use the defa
Philip Norton philipnorton42@gmail.com
--FILE--
<?php
-$array = SplFixedArray::fromArray(array(1 => 1,
+$array = SplFixedArray::fromArray(array(1 => 1,
2 => '2',
3 => false));
var_dump($array);
diff --git a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
index ecae2ab762..29ea85c332 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
@@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function don't try to
Philip Norton philipnorton42@gmail.com
--FILE--
<?php
-$array = SplFixedArray::fromArray(array(1 => 1,
+$array = SplFixedArray::fromArray(array(1 => 1,
2 => '2',
3 => false),
false);
diff --git a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
index 21976b552c..346d85cc3a 100644
--- a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
+++ b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
@@ -6,17 +6,17 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a fixed array
$fixedArray = new SplFixedArray(5);
-
+
// Fill it up
- for ($i=0; $i < 5; $i++) {
+ for ($i=0; $i < 5; $i++) {
$fixedArray[$i] = "PHPNW Testfest";
}
-
+
// remove an item
$fixedArray->offsetUnset("4");
-
+
var_dump($fixedArray);
-
+
?>
--EXPECTF--
object(SplFixedArray)#1 (5) {
diff --git a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
index 8864362c67..4c72dca235 100644
--- a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
+++ b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
<?php
// Create a fixed array
$fixedArray = new SplFixedArray(5);
-
+
// Fill it up
- for ($i=0; $i < 5; $i++) {
+ for ($i=0; $i < 5; $i++) {
$fixedArray[$i] = "PHPNW Testfest";
}
-
+
// Test count() returns correct error when parameters are passed.
$fixedArray->count(1);
?>
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
index 7c8cb7574c..83b3e27d88 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
@@ -1,13 +1,13 @@
--TEST--
-Check that SplObjectStorage::removeUncommon functions when receiving proper input
+Check that SplObjectStorage::removeUncommon functions when receiving proper input
--CREDITS--
Matthew Turland (me@matthewturland.com)
--FILE--
<?php
- $a = (object) 'a';
- $b = (object) 'b';
- $c = (object) 'c';
+ $a = (object) 'a';
+ $b = (object) 'b';
+ $c = (object) 'c';
$foo = new SplObjectStorage;
$foo->attach($a);
diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt
index bd27c42774..9295f40e51 100644
--- a/ext/spl/tests/arrayObject___construct_basic2.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic2.phpt
@@ -8,7 +8,7 @@ class C {
class MyArrayObject extends ArrayObject {
public $prop = 'MyArrayObject::prop.orig';
-}
+}
echo "--> Access prop on instance of ArrayObject:\n";
$c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
echo " - Read:\n";
@var_dump($ao->prop, $ao['prop']);
-
+
echo " - Write:\n";
$ao->prop = 'changed1';
$ao['prop'] = 'changed2';
var_dump($ao->prop, $ao['prop']);
-
+
echo " - Isset:\n";
var_dump(isset($ao->prop), isset($ao['prop']));
-
+
echo " - Unset:\n";
unset($ao->prop);
unset($ao['prop']);
var_dump($ao->prop, $ao['prop']);
-
+
echo " - After:\n";
var_dump($ao, $c);
}
diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt
index 11a17a6dc4..fcd369af84 100644
--- a/ext/spl/tests/arrayObject___construct_basic3.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic3.phpt
@@ -8,7 +8,7 @@ class C {
class MyArrayObject extends ArrayObject {
public $prop = 'MyArrayObject::prop.orig';
-}
+}
echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST:\n";
$c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
echo " - Read:\n";
@var_dump($ao->prop, $ao['prop']);
-
+
echo " - Write:\n";
$ao->prop = 'changed1';
$ao['prop'] = 'changed2';
var_dump($ao->prop, $ao['prop']);
-
+
echo " - Isset:\n";
var_dump(isset($ao->prop), isset($ao['prop']));
-
+
echo " - Unset:\n";
unset($ao->prop);
unset($ao['prop']);
var_dump($ao->prop, $ao['prop']);
-
+
echo " - After:\n";
var_dump($ao, $c);
}
diff --git a/ext/spl/tests/arrayObject___construct_basic4.phpt b/ext/spl/tests/arrayObject___construct_basic4.phpt
index b0809de0d4..c136c949e2 100644
--- a/ext/spl/tests/arrayObject___construct_basic4.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic4.phpt
@@ -8,7 +8,7 @@ class C {
class MyArrayObject extends ArrayObject {
public $prop = 'MyArrayObject::prop.orig';
-}
+}
echo "\n--> Access prop on instance of ArrayObject with ArrayObject::ARRAY_AS_PROPS:\n";
$c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
echo " - Read:\n";
@var_dump($ao->prop, $ao['prop']);
-
+
echo " - Write:\n";
$ao->prop = 'changed1';
$ao['prop'] = 'changed2';
var_dump($ao->prop, $ao['prop']);
-
+
echo " - Isset:\n";
var_dump(isset($ao->prop), isset($ao['prop']));
-
+
echo " - Unset:\n";
unset($ao->prop);
unset($ao['prop']);
var_dump($ao->prop, $ao['prop']);
-
+
echo " - After:\n";
var_dump($ao, $c);
}
diff --git a/ext/spl/tests/arrayObject___construct_basic5.phpt b/ext/spl/tests/arrayObject___construct_basic5.phpt
index 8c44ee2ce4..0eb8904bac 100644
--- a/ext/spl/tests/arrayObject___construct_basic5.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic5.phpt
@@ -8,7 +8,7 @@ class C {
class MyArrayObject extends ArrayObject {
public $prop = 'MyArrayObject::prop.orig';
-}
+}
echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST|ArrayObject::ARRAY_AS_PROPS:\n";
$c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
echo " - Read:\n";
@var_dump($ao->prop, $ao['prop']);
-
+
echo " - Write:\n";
$ao->prop = 'changed1';
$ao['prop'] = 'changed2';
var_dump($ao->prop, $ao['prop']);
-
+
echo " - Isset:\n";
var_dump(isset($ao->prop), isset($ao['prop']));
-
+
echo " - Unset:\n";
unset($ao->prop);
unset($ao['prop']);
var_dump($ao->prop, $ao['prop']);
-
+
echo " - After:\n";
var_dump($ao, $c);
}
diff --git a/ext/spl/tests/arrayObject___construct_basic6.phpt b/ext/spl/tests/arrayObject___construct_basic6.phpt
index 1c7ec36363..3b9992dd99 100644
--- a/ext/spl/tests/arrayObject___construct_basic6.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic6.phpt
@@ -5,7 +5,7 @@ SPL: ArrayObject::__construct: check impact of ArrayObject::STD_PROP_LIST on var
class MyArrayObject extends ArrayObject {
private $priv1 = 'secret1';
public $pub1 = 'public1';
-}
+}
$ao = new ArrayObject(array(1,2,3));
$ao->p = 1;
diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt
index 6a523aec66..f095f6146c 100644
--- a/ext/spl/tests/arrayObject_asort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic1.phpt
@@ -4,9 +4,9 @@ SPL: Test ArrayObject::asort() function : basic functionality with array based s
<?php
/* Prototype : int ArrayObject::asort()
* Description: proto int ArrayIterator::asort()
- * Sort the entries by values.
+ * Sort the entries by values.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::asort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt
index d481d0c4ed..6f2e8509ef 100644
--- a/ext/spl/tests/arrayObject_asort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic2.phpt
@@ -4,9 +4,9 @@ SPL: Test ArrayObject::asort() function : basic functionality with object based
<?php
/* Prototype : int ArrayObject::asort()
* Description: proto int ArrayIterator::asort()
- * Sort the entries by values.
+ * Sort the entries by values.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::asort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_clone_basic1.phpt b/ext/spl/tests/arrayObject_clone_basic1.phpt
index dd4abf3ffb..ed412c9a48 100644
--- a/ext/spl/tests/arrayObject_clone_basic1.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic1.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: Cloning an instance of ArrayObject which wraps an array.
+SPL: Cloning an instance of ArrayObject which wraps an array.
--FILE--
<?php
$a = array(1,2);
diff --git a/ext/spl/tests/arrayObject_clone_basic2.phpt b/ext/spl/tests/arrayObject_clone_basic2.phpt
index 932eaed712..c25041510b 100644
--- a/ext/spl/tests/arrayObject_clone_basic2.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic2.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: Cloning an instance of ArrayObject which wraps an object.
+SPL: Cloning an instance of ArrayObject which wraps an object.
--FILE--
<?php
class C { }
diff --git a/ext/spl/tests/arrayObject_clone_basic3.phpt b/ext/spl/tests/arrayObject_clone_basic3.phpt
index f7ac89442e..0ed3e011f8 100644
--- a/ext/spl/tests/arrayObject_clone_basic3.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic3.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: Cloning nested ArrayObjects.
+SPL: Cloning nested ArrayObjects.
--FILE--
<?php
class C {
diff --git a/ext/spl/tests/arrayObject_count_basic1.phpt b/ext/spl/tests/arrayObject_count_basic1.phpt
index a003c2cf67..b0643d5754 100644
--- a/ext/spl/tests/arrayObject_count_basic1.phpt
+++ b/ext/spl/tests/arrayObject_count_basic1.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: ArrayObject::count() and ArrayIterator::count() basic functionality.
+SPL: ArrayObject::count() and ArrayIterator::count() basic functionality.
--FILE--
==ArrayObject==
<?php
diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
index d89ca821a2..823256edbc 100644
--- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
+++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
@@ -5,7 +5,7 @@ SPL: ArrayObject::exchangeArray() basic usage with object as underlying data sto
class C {
public $pub1 = 'public1';
-}
+}
echo "--> exchangeArray() with objects:\n";
$original = new C;
diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
index b23c196224..472da4f860 100644
--- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
+++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality
+SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality
--FILE--
<?php
class MyIterator extends ArrayIterator {
@@ -9,31 +9,31 @@ class MyIterator extends ArrayIterator {
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function rewind() {
+ function rewind() {
$args = func_get_args();
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
return parent::rewind();
}
- function valid() {
+ function valid() {
$args = func_get_args();
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
return parent::valid();
}
-
- function current() {
+
+ function current() {
$args = func_get_args();
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
return parent::current();
}
- function next() {
+ function next() {
$args = func_get_args();
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
return parent::next();
}
-
- function key() {
+
+ function key() {
$args = func_get_args();
echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
return parent::key();
diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt
index 1e7aa01fe8..1718ccbe3b 100644
--- a/ext/spl/tests/arrayObject_ksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: Test ArrayObject::ksort() function : basic functionality with array based store
+SPL: Test ArrayObject::ksort() function : basic functionality with array based store
--FILE--
<?php
/* Prototype : int ArrayObject::ksort()
* Description: proto int ArrayIterator::ksort()
- * Sort the entries by key.
+ * Sort the entries by key.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::ksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt
index 1464e73761..438310b697 100644
--- a/ext/spl/tests/arrayObject_ksort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: Test ArrayObject::ksort() function : basic functionality with object base store
+SPL: Test ArrayObject::ksort() function : basic functionality with object base store
--FILE--
<?php
/* Prototype : int ArrayObject::ksort()
* Description: proto int ArrayIterator::ksort()
- * Sort the entries by key.
+ * Sort the entries by key.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::ksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_magicMethods1.phpt b/ext/spl/tests/arrayObject_magicMethods1.phpt
index ec4812f107..351f68214a 100644
--- a/ext/spl/tests/arrayObject_magicMethods1.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods1.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
public $c = 3;
private $priv = 'secret';
-
- function __get($name) {
+
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods2.phpt b/ext/spl/tests/arrayObject_magicMethods2.phpt
index 691a9a1e6c..18f0520fcd 100644
--- a/ext/spl/tests/arrayObject_magicMethods2.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods2.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
public $c = 3;
private $priv = 'secret';
-
- function __get($name) {
+
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods3.phpt b/ext/spl/tests/arrayObject_magicMethods3.phpt
index 6231ceabb7..6771c46800 100644
--- a/ext/spl/tests/arrayObject_magicMethods3.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods3.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
public $c = 3;
private $priv = 'secret';
-
- function __get($name) {
+
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods4.phpt b/ext/spl/tests/arrayObject_magicMethods4.phpt
index 9580dc5ae7..d6a6292fc0 100644
--- a/ext/spl/tests/arrayObject_magicMethods4.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods4.phpt
@@ -11,26 +11,26 @@ class C {
}
class UsesMagic extends ArrayObject {
-
+
public $b = "This should not be in the storage";
- function __get($name) {
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new C;
$ao = new UsesMagic($obj);
diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt
index 023086d83a..fbc65e96be 100644
--- a/ext/spl/tests/arrayObject_magicMethods5.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods5.phpt
@@ -11,26 +11,26 @@ class C {
}
class UsesMagic extends ArrayObject {
-
+
public $b = "This should appear in storage";
- function __get($name) {
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new C;
$ao = new UsesMagic($obj);
diff --git a/ext/spl/tests/arrayObject_magicMethods6.phpt b/ext/spl/tests/arrayObject_magicMethods6.phpt
index b43f56c2b0..243e0f53a8 100644
--- a/ext/spl/tests/arrayObject_magicMethods6.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods6.phpt
@@ -11,26 +11,26 @@ class C {
}
class UsesMagic extends ArrayObject {
-
+
public $b = "This should never appear in storage";
- function __get($name) {
+ function __get($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __set($name, $value) {
+ function __set($name, $value) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __isset($name) {
+ function __isset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
- function __unset($name) {
+ function __unset($name) {
$args = func_get_args();
echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
}
-
+
}
$obj = new C;
$ao = new UsesMagic($obj, ArrayObject::ARRAY_AS_PROPS);
diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
index 62ad2ed482..8ab2b55a01 100644
--- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: Test ArrayObject::natcasesort() function : basic functionality
+SPL: Test ArrayObject::natcasesort() function : basic functionality
--FILE--
<?php
/* Prototype : int ArrayObject::natcasesort()
* Description: proto int ArrayIterator::natcasesort()
- Sort the entries by values using case insensitive "natural order" algorithm.
+ Sort the entries by values using case insensitive "natural order" algorithm.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::natcasesort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt
index 1b4fd60f55..abf292f5e7 100644
--- a/ext/spl/tests/arrayObject_natsort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: Test ArrayObject::natsort() function : basic functionality
+SPL: Test ArrayObject::natsort() function : basic functionality
--FILE--
<?php
/* Prototype : int ArrayObject::natsort()
* Description: proto int ArrayIterator::natsort()
- Sort the entries by values using "natural order" algorithm.
+ Sort the entries by values using "natural order" algorithm.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::natsort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_setFlags_basic1.phpt b/ext/spl/tests/arrayObject_setFlags_basic1.phpt
index 391b0eeae7..b8bf099dd6 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic1.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic1.phpt
@@ -1,17 +1,17 @@
--TEST--
-SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622.
+SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622.
--FILE--
<?php
class C extends ArrayObject {
public $p = 'object property';
-}
+}
function access_p($ao) {
// isset
var_dump(isset($ao->p));
// read
var_dump($ao->p);
- // write
+ // write
$ao->p = $ao->p . '.changed';
var_dump($ao->p);
}
diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index 6eece74cbb..fe9111c90b 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -4,11 +4,11 @@ SPL: Ensure access to non-visible properties falls back to dimension access with
<?php
class C extends ArrayObject {
private $x = 'secret';
-
+
static function go($c) {
var_dump($c->x);
}
-}
+}
$c = new C(array('x'=>'public'));
diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt
index 203edb6fb8..bb4440cdd7 100644
--- a/ext/spl/tests/arrayObject_uasort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt
@@ -1,12 +1,12 @@
--TEST--
-SPL: Test ArrayObject::uasort() function : basic functionality
+SPL: Test ArrayObject::uasort() function : basic functionality
--FILE--
<?php
/* Prototype : int ArrayObject::uasort(callback cmp_function)
* Description: proto int ArrayIterator::uasort(callback cmp_function)
- Sort the entries by values user defined function.
+ Sort the entries by values user defined function.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::uasort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt
index d7306c9c88..11d96f233d 100644
--- a/ext/spl/tests/arrayObject_uasort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_error1.phpt
@@ -1,12 +1,12 @@
--TEST--
-Test ArrayObject::uasort() function : wrong arg count
+Test ArrayObject::uasort() function : wrong arg count
--FILE--
<?php
/* Prototype : int ArrayObject::uasort(callback cmp_function)
* Description: proto int ArrayIterator::uasort(callback cmp_function)
- Sort the entries by values user defined function.
+ Sort the entries by values user defined function.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
$ao = new ArrayObject();
diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt
index 1581589e43..8aac0006fd 100644
--- a/ext/spl/tests/arrayObject_uksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt
@@ -1,12 +1,12 @@
--TEST--
-Test ArrayObject::uksort() function : basic functionality
+Test ArrayObject::uksort() function : basic functionality
--FILE--
<?php
/* Prototype : int ArrayObject::uksort(callback cmp_function)
* Description: proto int ArrayIterator::uksort(callback cmp_function)
- * Sort the entries by key using user defined function.
+ * Sort the entries by key using user defined function.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing ArrayObject::uksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt
index d019fc4400..1fdaf5b486 100644
--- a/ext/spl/tests/arrayObject_uksort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_error1.phpt
@@ -1,12 +1,12 @@
--TEST--
-Test ArrayObject::uksort() function : wrong arg count
+Test ArrayObject::uksort() function : wrong arg count
--FILE--
<?php
/* Prototype : int ArrayObject::uksort(callback cmp_function)
* Description: proto int ArrayIterator::uksort(callback cmp_function)
Sort the entries by key using user defined function.
* Source code: ext/spl/spl_array.c
- * Alias to functions:
+ * Alias to functions:
*/
$ao = new ArrayObject();
diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt
index de4ce30f91..94dcd7f5a2 100644
--- a/ext/spl/tests/array_003.phpt
+++ b/ext/spl/tests/array_003.phpt
@@ -3,8 +3,8 @@ SPL: ArrayObject from object
--FILE--
<?php
-// This test also needs to exclude the protected and private variables
-// since they cannot be accessed from the external object which iterates
+// This test also needs to exclude the protected and private variables
+// since they cannot be accessed from the external object which iterates
// them.
class test
@@ -12,7 +12,7 @@ class test
public $pub = "public";
protected $pro = "protected";
private $pri = "private";
-
+
function __construct()
{
$this->imp = "implicit";
diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt
index d7ef15db1a..b0175e7e7a 100644
--- a/ext/spl/tests/array_005.phpt
+++ b/ext/spl/tests/array_005.phpt
@@ -18,7 +18,7 @@ class Student
{
return $this->id . ', ' . $this->name;
}
-
+
public function getId()
{
return $this->id;
@@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator
FilterIterator::__construct($students->getIterator());
$this->id = $other->getId();
}
-
+
public function accept()
{
echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
@@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator
class StudentList implements IteratorAggregate
{
private $students;
-
+
public function __construct()
{
$this->students = new ArrayObject(array());
}
-
+
public function add(Student $student)
{
if (!$this->contains($student)) {
$this->students[] = $student;
}
}
-
+
public function contains(Student $student)
{
foreach ($this->students as $s)
@@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate
}
return false;
}
-
+
public function getIterator() {
return $this->students->getIterator();
}
diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt
index 7d9bf6afc1..a55e04d0a5 100644
--- a/ext/spl/tests/array_007.phpt
+++ b/ext/spl/tests/array_007.phpt
@@ -3,8 +3,8 @@ SPL: ArrayObject/Iterator from IteratorAggregate
--FILE--
<?php
-// This test also needs to exclude the protected and private variables
-// since they cannot be accessed from the external object which iterates
+// This test also needs to exclude the protected and private variables
+// since they cannot be accessed from the external object which iterates
// them.
class test implements IteratorAggregate
@@ -12,12 +12,12 @@ class test implements IteratorAggregate
public $pub = "public";
protected $pro = "protected";
private $pri = "private";
-
+
function __construct()
{
$this->imp = "implicit";
}
-
+
function getIterator()
{
$it = new ArrayObject($this);
diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt
index 396aa9b9e9..f2078bcd41 100644
--- a/ext/spl/tests/array_009a.phpt
+++ b/ext/spl/tests/array_009a.phpt
@@ -9,7 +9,7 @@ class MyRecursiveArrayIterator extends ArrayIterator implements RecursiveIterato
{
return is_array($this->current());
}
-
+
function getChildren()
{
return new MyRecursiveArrayIterator($this->current());
diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt
index c2dc1f4989..6533819b68 100644
--- a/ext/spl/tests/array_013.phpt
+++ b/ext/spl/tests/array_013.phpt
@@ -6,7 +6,7 @@ SPL: ArrayIterator::append
if (!class_exists('NoRewindIterator', false))
{
require_once(dirname(__FILE__) . '/../examples/norewinditerator.inc');
-}
+}
echo "===Array===\n";
diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt
index 8f3d345438..327e214a2c 100644
--- a/ext/spl/tests/array_017.phpt
+++ b/ext/spl/tests/array_017.phpt
@@ -36,7 +36,7 @@ class ArrayObjectEx extends ArrayObject
public $pub1 = 1;
protected $pro1 = 2;
private $pri1 = 3;
-
+
function __construct($ar = array(), $flags = 0)
{
echo __METHOD__ . "()\n";
@@ -66,13 +66,13 @@ class ArrayObjectEx extends ArrayObject
var_dump(array($n => $v));
}
}
-
+
function setFlags($flags)
{
echo __METHOD__ . "($flags)\n";
ArrayObject::setFlags($flags);
}
-
+
function getIterator()
{
echo __METHOD__ . "()\n";
@@ -92,21 +92,21 @@ function check($obj, $flags)
$obj->show();
echo "===FOREACH===\n";
-
+
$it = $obj->getIterator();
foreach($it as $n => $v)
{
var_dump(array($n => $v));
}
-
+
echo "===PROPERTY===\n";
-
+
var_dump($obj->pub1);
var_dump(isset($obj->a));
$obj->setFlags($flags | 2);
var_dump($obj->pub1);
var_dump(isset($obj->a));
-
+
var_dump($it->pub2);
var_dump(isset($it->pub1));
$it->setFlags($flags | 2);
diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt
index f2ae0c87e5..cfe2bcb77d 100644
--- a/ext/spl/tests/array_021.phpt
+++ b/ext/spl/tests/array_021.phpt
@@ -25,7 +25,7 @@ catch (Exception $e)
?>
===DONE===
---EXPECT--
+--EXPECT--
foo::seek(bar)
got exception
===DONE===
diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt
index 1ce6cae4ad..75eeb8884f 100644
--- a/ext/spl/tests/array_022.phpt
+++ b/ext/spl/tests/array_022.phpt
@@ -44,7 +44,7 @@ var_dump($b);
?>
===DONE===
---EXPECTF--
+--EXPECTF--
==ArrayObject===
object(MyArrayObject)#%d (1) {
["bar"]=>
diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt
index 5a880b321d..7c3f810401 100644
--- a/ext/spl/tests/bug32134.phpt
+++ b/ext/spl/tests/bug32134.phpt
@@ -2,7 +2,7 @@
Bug #32134 (Overloading offsetGet/offsetSet)
--FILE--
<?php
-
+
class myArray extends ArrayIterator
{
diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt
index 121ff58ad7..4d9a1506ca 100644
--- a/ext/spl/tests/bug33136.phpt
+++ b/ext/spl/tests/bug33136.phpt
@@ -6,19 +6,19 @@ Bug #33136 (method offsetSet in class extended from ArrayObject crash PHP)
class Collection extends ArrayObject
{
private $data;
-
+
function __construct()
{
$this->data = array();
parent::__construct($this->data);
}
-
+
function offsetGet($index)
{
echo __METHOD__ . "($index)\n";
return parent::offsetGet($index);
}
-
+
function offsetSet($index, $value)
{
echo __METHOD__ . "(" . (is_null($index) ? "NULL" : $index) . ",$value)\n";
diff --git a/ext/spl/tests/bug34548.phpt b/ext/spl/tests/bug34548.phpt
index 27c3094902..399aa33788 100644
--- a/ext/spl/tests/bug34548.phpt
+++ b/ext/spl/tests/bug34548.phpt
@@ -26,7 +26,7 @@ print_r($foo->getArrayCopy());
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
Array
(
[0] => one
diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt
index 60817d06ba..428158c858 100644
--- a/ext/spl/tests/bug36258.phpt
+++ b/ext/spl/tests/bug36258.phpt
@@ -13,7 +13,7 @@ foreach ($diriter as $key => $file) {
?>
===DONE===
---EXPECTF--
+--EXPECTF--
string(%d) "%s"
string(%d) "%s"
===DONE===
diff --git a/ext/spl/tests/bug36825.phpt b/ext/spl/tests/bug36825.phpt
index 35de013a8f..3b68167204 100644
--- a/ext/spl/tests/bug36825.phpt
+++ b/ext/spl/tests/bug36825.phpt
@@ -25,7 +25,7 @@ catch (Exception $e)
?>
===DONE===
---EXPECT--
+--EXPECT--
foo::offsetGet(bar)
got exception
===DONE===
diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt
index e66fa4d6ed..a4caa517a9 100644
--- a/ext/spl/tests/bug37457.phpt
+++ b/ext/spl/tests/bug37457.phpt
@@ -6,13 +6,13 @@ Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterat
class Collection implements Iterator
{
protected $array, $valid = false;
-
+
public function __construct(array $a)
{
echo __METHOD__ . "\n";
$this->array = $a;
}
-
+
public function current()
{
echo __METHOD__ . "\n";
diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt
index 3cf3d8780c..aa6d6657e0 100644
--- a/ext/spl/tests/bug41691.phpt
+++ b/ext/spl/tests/bug41691.phpt
@@ -17,7 +17,7 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1)));
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
array(3) {
["a"]=>
NULL
diff --git a/ext/spl/tests/bug41692.phpt b/ext/spl/tests/bug41692.phpt
index c9b7d8d60f..6095a3800b 100644
--- a/ext/spl/tests/bug41692.phpt
+++ b/ext/spl/tests/bug41692.phpt
@@ -20,7 +20,7 @@ var_dump($bar);
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
object(Bar)#%d (2) {
["foo":"Bar":private]=>
array(3) {
diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt
index 5c52763cd6..cf1180c242 100644
--- a/ext/spl/tests/bug42703.phpt
+++ b/ext/spl/tests/bug42703.phpt
@@ -5,18 +5,18 @@ Bug #42703 (Exception raised in an iterator::current() causes segfault in Filter
class BlaIterator implements Iterator
{
public function rewind() { }
-
+
public function next() { }
-
+
public function valid() {
return true;
}
-
+
public function current()
{
throw new Exception('boo');
}
-
+
public function key() { }
}
diff --git a/ext/spl/tests/bug45216.phpt b/ext/spl/tests/bug45216.phpt
index b3c4aa51bf..99ea491e78 100644
--- a/ext/spl/tests/bug45216.phpt
+++ b/ext/spl/tests/bug45216.phpt
@@ -4,7 +4,7 @@ SPL: SplFileObject::fgetss (bug 45216)
Perrick Penet <perrick@noparking.net>
#testfest phpcampparis 2008-06-07
--FILE--
-<?php
+<?php
$file = dirname(__FILE__) . '/foo.html';
file_put_contents($file, 'text 0<div class="tested">text 1</div>');
$handle = fopen($file, 'r');
diff --git a/ext/spl/tests/bug45614.phpt b/ext/spl/tests/bug45614.phpt
index 9ab3186a75..d9e9207d28 100644
--- a/ext/spl/tests/bug45614.phpt
+++ b/ext/spl/tests/bug45614.phpt
@@ -9,7 +9,7 @@ class C {
public $pub2 = 'public2';
public $pub3 = 'public3';
public $pub4 = 'public4';
-}
+}
function showFirstTwoItems($it) {
echo str_replace("\0", '\0', $it->key()) . " => " . $it->current() .
diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt
index a8fe2c4641..7771c94cdb 100644
--- a/ext/spl/tests/bug45622.phpt
+++ b/ext/spl/tests/bug45622.phpt
@@ -5,7 +5,7 @@ SPL: Bug #45622 (isset($arrayObject->p) misbehaves with ArrayObject::ARRAY_AS_PR
class C extends ArrayObject {
public $p = 'object property';
-}
+}
$ao = new C(array('p'=>'array element'));
$ao->setFlags(ArrayObject::ARRAY_AS_PROPS);
diff --git a/ext/spl/tests/bug45622b.phpt b/ext/spl/tests/bug45622b.phpt
index f101a8459d..879d610301 100644
--- a/ext/spl/tests/bug45622b.phpt
+++ b/ext/spl/tests/bug45622b.phpt
@@ -13,7 +13,7 @@ $ao = new UsesMagic(array(), ArrayObject::ARRAY_AS_PROPS);
echo "Doesn't trigger __get.\n";
echo $ao->prop1;
-echo "Doesn't trigger __set.\n";
+echo "Doesn't trigger __set.\n";
$ao->prop2 = 'foo';
echo "Doesn't trigger __unset.\n";
diff --git a/ext/spl/tests/bug49723.phpt b/ext/spl/tests/bug49723.phpt
index 221e806611..1557cbc15d 100644
--- a/ext/spl/tests/bug49723.phpt
+++ b/ext/spl/tests/bug49723.phpt
@@ -1,5 +1,5 @@
--TEST--
-LimitIterator: do not seek if not needed
+LimitIterator: do not seek if not needed
--FILE--
<?php
diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt
index e32262a743..86d8d9c1b6 100644
--- a/ext/spl/tests/bug50579.phpt
+++ b/ext/spl/tests/bug50579.phpt
@@ -6,8 +6,8 @@ Bug #50579 (RegexIterator::REPLACE doesn't work)
class foo extends ArrayIterator {
public function __construct( ) {
parent::__construct(array(
- 'test1'=>'test888',
- 'test2'=>'what?',
+ 'test1'=>'test888',
+ 'test2'=>'what?',
'test3'=>'test999'));
}
}
@@ -17,7 +17,7 @@ $i->replacement = '[$0]';
foreach ($i as $name=>$value) {
echo $name . '=>' . $value . "\n";
}
-
+
$i->replacement = '$1';
foreach ($i as $name=>$value) {
echo $name . '=>' . $value . "\n";
diff --git a/ext/spl/tests/bug52238.phpt b/ext/spl/tests/bug52238.phpt
index 667c0a497a..53e53e9729 100644
--- a/ext/spl/tests/bug52238.phpt
+++ b/ext/spl/tests/bug52238.phpt
@@ -7,7 +7,7 @@ class Foo implements IteratorAggregate
public function bar() {
throw new Exception;
}
-
+
public function getIterator() {
return new ArrayIterator($this->bar());
}
diff --git a/ext/spl/tests/bug53515.phpt b/ext/spl/tests/bug53515.phpt
index 8ecb02b1e6..53ecd5c2af 100644
--- a/ext/spl/tests/bug53515.phpt
+++ b/ext/spl/tests/bug53515.phpt
@@ -11,7 +11,7 @@ $a[''] = '';
foreach ($a as $key => $value) {
echo $key . ': ' . (is_null($value) ? 'null' : @"$value") .
- ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') .
+ ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') .
' property_exists: ' . (property_exists($o, $key) ? 'true' : 'false'),"\n";
}
diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/bug60201.phpt
index c77988eb13..351b0b08a5 100644
--- a/ext/spl/tests/bug60201.phpt
+++ b/ext/spl/tests/bug60201.phpt
@@ -4,7 +4,7 @@ Bug #60201 (SplFileObject::setCsvControl does not expose third argument via Refl
<?php
$method = new ReflectionMethod('SplFileObject', 'setCsvControl');
-$params = $method->getParameters();
+$params = $method->getParameters();
var_dump($params);
?>
diff --git a/ext/spl/tests/bug62433.phpt b/ext/spl/tests/bug62433.phpt
index bfb3568bac..e96af6e988 100644
--- a/ext/spl/tests/bug62433.phpt
+++ b/ext/spl/tests/bug62433.phpt
@@ -11,7 +11,7 @@ var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $dots));
var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $ndots));
var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $ndots));
?>
---EXPECT--
+--EXPECT--
bool(true)
bool(true)
bool(false)
diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt
index 8ce0d7bc79..ae9151483a 100644
--- a/ext/spl/tests/bug62904.phpt
+++ b/ext/spl/tests/bug62904.phpt
@@ -3,7 +3,7 @@ Bug #62904 (Crash when cloning an object which inherits SplFixedArray)
--FILE--
<?php
-class foo extends SplFixedArray {
+class foo extends SplFixedArray {
public function __construct($size) {
}
}
diff --git a/ext/spl/tests/bug64264.phpt b/ext/spl/tests/bug64264.phpt
index e7b695bd82..90b3af84aa 100644
--- a/ext/spl/tests/bug64264.phpt
+++ b/ext/spl/tests/bug64264.phpt
@@ -2,12 +2,12 @@
Bug #64264 (SPLFixedArray toArray problem)
--FILE--
<?php
-class MyFixedArray extends \SplFixedArray {
- protected $foo;
- protected $bar;
-}
+class MyFixedArray extends \SplFixedArray {
+ protected $foo;
+ protected $bar;
+}
-$myFixedArr = new MyFixedArray(1);
+$myFixedArr = new MyFixedArray(1);
$myFixedArr[0] = 'foo';
$myFixedArr->setSize(2);
$myFixedArr[1] = 'bar';
diff --git a/ext/spl/tests/bug66834.phpt b/ext/spl/tests/bug66834.phpt
index 66686c771a..eed26c815f 100644
--- a/ext/spl/tests/bug66834.phpt
+++ b/ext/spl/tests/bug66834.phpt
@@ -4,7 +4,7 @@ SPL: Bug #66834
<?php
// overrides both offsetExists and offsetGet
-class ArrayObjectBoth extends ArrayObject
+class ArrayObjectBoth extends ArrayObject
{
public function offsetExists($offset) {
var_dump('Called: '.__METHOD__);
@@ -18,7 +18,7 @@ class ArrayObjectBoth extends ArrayObject
}
// overrides only offsetExists
-class ArrayObjectExists extends ArrayObject
+class ArrayObjectExists extends ArrayObject
{
public function offsetExists($offset) {
var_dump('Called: '.__METHOD__);
@@ -27,7 +27,7 @@ class ArrayObjectExists extends ArrayObject
}
// overrides only offsetGet
-class ArrayObjectGet extends ArrayObject
+class ArrayObjectGet extends ArrayObject
{
public function offsetGet($offset) {
var_dump('Called: '.__METHOD__);
diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt
index e4e7976a9b..a217f031d5 100644
--- a/ext/spl/tests/bug68479.phpt
+++ b/ext/spl/tests/bug68479.phpt
@@ -4,7 +4,7 @@ Bug #68479 (Escape parameter missing from SplFileObject::fputcsv)
<?php
$method = new ReflectionMethod('SplFileObject', 'fputcsv');
-$params = $method->getParameters();
+$params = $method->getParameters();
var_dump($params);
?>
diff --git a/ext/spl/tests/bug71838.phpt b/ext/spl/tests/bug71838.phpt
index 44fc761ceb..dc44625d8e 100644
--- a/ext/spl/tests/bug71838.phpt
+++ b/ext/spl/tests/bug71838.phpt
@@ -9,7 +9,7 @@ class A extends SplObjectStorage {
public function __construct() {
$this->a = '123';
}
-
+
public function getA() {
return $this->a;
}
diff --git a/ext/spl/tests/bug73471.phpt b/ext/spl/tests/bug73471.phpt
index 6fdbf187be..43af0ac965 100644
--- a/ext/spl/tests/bug73471.phpt
+++ b/ext/spl/tests/bug73471.phpt
@@ -11,5 +11,5 @@ foreach($events as $event){}
$iterator->append($events2);
?>
===DONE===
---EXPECT--
+--EXPECT--
===DONE===
diff --git a/ext/spl/tests/bug74519.phpt b/ext/spl/tests/bug74519.phpt
index 92efb6378a..6492997b1a 100644
--- a/ext/spl/tests/bug74519.phpt
+++ b/ext/spl/tests/bug74519.phpt
@@ -15,7 +15,7 @@ while($iterator->valid()) {
}
?>
===DONE===
---EXPECT--
+--EXPECT--
2
3
4
diff --git a/ext/spl/tests/bug75173.phpt b/ext/spl/tests/bug75173.phpt
index a2cc9097b1..fa5d2ac371 100644
--- a/ext/spl/tests/bug75173.phpt
+++ b/ext/spl/tests/bug75173.phpt
@@ -8,7 +8,7 @@ $it->append(new ArrayIterator(['foo']));
foreach ($it as $item) {
var_dump($item);
-
+
if ('foo' === $item) {
$it->append(new ArrayIterator(['bar']));
}
diff --git a/ext/spl/tests/bug76367.phpt b/ext/spl/tests/bug76367.phpt
index f34e8a39de..38aefbc922 100644
--- a/ext/spl/tests/bug76367.phpt
+++ b/ext/spl/tests/bug76367.phpt
@@ -10,7 +10,7 @@ while($iter->valid()) {
$iter->next();
}
-var_dump($iter->current());
+var_dump($iter->current());
?>
--EXPECT--
NULL
diff --git a/ext/spl/tests/class_implements_basic.phpt b/ext/spl/tests/class_implements_basic.phpt
index 1170b214f8..986b81e8bc 100644
--- a/ext/spl/tests/class_implements_basic.phpt
+++ b/ext/spl/tests/class_implements_basic.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_implements() function : basic
+SPL: Test class_implements() function : basic
--FILE--
<?php
/* Prototype : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL
+ * Description: Return all classes and interfaces implemented by SPL
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_implements() : basic ***\n";
diff --git a/ext/spl/tests/class_implements_basic2.phpt b/ext/spl/tests/class_implements_basic2.phpt
index ea25e5b98d..6eb3af4556 100644
--- a/ext/spl/tests/class_implements_basic2.phpt
+++ b/ext/spl/tests/class_implements_basic2.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_implements() function : basic
+SPL: Test class_implements() function : basic
--FILE--
<?php
/* Prototype : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL
+ * Description: Return all classes and interfaces implemented by SPL
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_implements() : basic ***\n";
diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt
index 84a52ab2da..dbc617a026 100644
--- a/ext/spl/tests/class_implements_variation.phpt
+++ b/ext/spl/tests/class_implements_variation.phpt
@@ -3,9 +3,9 @@ SPL: Test class_implements() function : variation - no interfaces and autoload
--FILE--
<?php
/* Prototype : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL
+ * Description: Return all classes and interfaces implemented by SPL
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_implements() : variation ***\n";
diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt
index d8a45ce6a6..9d876d3a36 100644
--- a/ext/spl/tests/class_implements_variation1.phpt
+++ b/ext/spl/tests/class_implements_variation1.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_implements() function : variation
+SPL: Test class_implements() function : variation
--FILE--
<?php
/* Prototype : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL
+ * Description: Return all classes and interfaces implemented by SPL
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_implements() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
'resource' => $res,
);
diff --git a/ext/spl/tests/class_implements_variation2.phpt b/ext/spl/tests/class_implements_variation2.phpt
index f6953577f3..f840e78929 100644
--- a/ext/spl/tests/class_implements_variation2.phpt
+++ b/ext/spl/tests/class_implements_variation2.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_implements() function : variation
+SPL: Test class_implements() function : variation
--FILE--
<?php
/* Prototype : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL
+ * Description: Return all classes and interfaces implemented by SPL
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_implements() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
'resource' => $res,
);
diff --git a/ext/spl/tests/class_uses_basic.phpt b/ext/spl/tests/class_uses_basic.phpt
index 8aeb7b52a7..8cad9cab07 100644
--- a/ext/spl/tests/class_uses_basic.phpt
+++ b/ext/spl/tests/class_uses_basic.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_implements() function : basic
+SPL: Test class_implements() function : basic
--FILE--
<?php
/* Prototype : array class_uses(mixed what [, bool autoload ])
* Description: Return all traits used by a class
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_uses() : basic ***\n";
diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt
index a0ffe8b861..be4bfa08d0 100644
--- a/ext/spl/tests/class_uses_basic2.phpt
+++ b/ext/spl/tests/class_uses_basic2.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_uses() function : basic
+SPL: Test class_uses() function : basic
--FILE--
<?php
/* Prototype : array class_uses(mixed what [, bool autoload ])
* Description: Return all traits used by a class
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_uses() : basic ***\n";
diff --git a/ext/spl/tests/class_uses_variation.phpt b/ext/spl/tests/class_uses_variation.phpt
index 1a13521eaf..2a7ea27c55 100644
--- a/ext/spl/tests/class_uses_variation.phpt
+++ b/ext/spl/tests/class_uses_variation.phpt
@@ -5,7 +5,7 @@ SPL: Test class_uses() function : variation - no interfaces and autoload
/* Prototype : array class_uses(mixed what [, bool autoload ])
* Description: Return all traits used by a class
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_uses() : variation ***\n";
diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt
index aa0ba35c94..be6aa9ac7f 100644
--- a/ext/spl/tests/class_uses_variation1.phpt
+++ b/ext/spl/tests/class_uses_variation1.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_uses() function : variation
+SPL: Test class_uses() function : variation
--FILE--
<?php
/* Prototype : array class_uses(mixed what [, bool autoload ])
* Description: Return all traits used by a class
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_uses() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
'resource' => $res,
);
diff --git a/ext/spl/tests/class_uses_variation2.phpt b/ext/spl/tests/class_uses_variation2.phpt
index 36c9623cb3..ae6093f02e 100644
--- a/ext/spl/tests/class_uses_variation2.phpt
+++ b/ext/spl/tests/class_uses_variation2.phpt
@@ -1,11 +1,11 @@
--TEST--
-SPL: Test class_uses() function : variation
+SPL: Test class_uses() function : variation
--FILE--
<?php
/* Prototype : array class_uses(mixed what [, bool autoload ])
* Description: Return all traits used by a class
* Source code: ext/spl/php_spl.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing class_uses() : variation ***\n";
@@ -98,7 +98,7 @@ $inputs = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
'resource' => $res,
);
diff --git a/ext/spl/tests/countable_class_basic1.phpt b/ext/spl/tests/countable_class_basic1.phpt
index c64aad6b6d..177afc8e5d 100644
--- a/ext/spl/tests/countable_class_basic1.phpt
+++ b/ext/spl/tests/countable_class_basic1.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: Test shape of interface Countable.
--SKIPIF--
-<?php
+<?php
// Skip the test case if Standard PHP Library(spl) is not installed
if( !extension_loaded('spl'))
{
diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt
index 6cc650b7b5..822e21b9fa 100644
--- a/ext/spl/tests/fileobject_003.phpt
+++ b/ext/spl/tests/fileobject_003.phpt
@@ -17,7 +17,7 @@ function test($name, $lc, $lp)
var_dump($o === $c);
var_dump($o == $c);
var_dump($o->getPathname() == $c->getPathname());
-
+
try {
$f = new SplFileObject($name);
var_dump($name);
diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt
index fa9e6db173..781614abcc 100644
--- a/ext/spl/tests/fileobject_005.phpt
+++ b/ext/spl/tests/fileobject_005.phpt
@@ -21,7 +21,7 @@ var_dump($fo->fgets(8));
$fo->rewind();
$fo->fwrite("blahlubba");
-// This should throw a warning and return NULL since an argument is missing
+// This should throw a warning and return NULL since an argument is missing
var_dump($fo->ftruncate());
?>
diff --git a/ext/spl/tests/fileobject_getbasename_basic.phpt b/ext/spl/tests/fileobject_getbasename_basic.phpt
index 34fecdc31c..5fb7ffdec2 100644
--- a/ext/spl/tests/fileobject_getbasename_basic.phpt
+++ b/ext/spl/tests/fileobject_getbasename_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: SplFileObject::getBasename
+SPL: SplFileObject::getBasename
--CREDITS--
H�vard Eide <nucleuz at gmail.com>
#Testfest php.no
diff --git a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
index b08a71190d..49cf536f89 100644
--- a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
+++ b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
@@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com>
include_path=.
--FILE--
<?php
-$s = new SplFileObject( __FILE__ );
-$s->setMaxLineLen( 7 );
+$s = new SplFileObject( __FILE__ );
+$s->setMaxLineLen( 7 );
echo $s->getMaxLineLen();
?>
--EXPECT--
diff --git a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
index 1d81a6f651..3af6f01a7f 100644
--- a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
@@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com>
include_path=.
--FILE--
<?php
-$s = new SplFileObject( __FILE__ );
-$s->setMaxLineLen( 3);
+$s = new SplFileObject( __FILE__ );
+$s->setMaxLineLen( 3);
echo $s->getCurrentLine();
?>
--EXPECT--
diff --git a/ext/spl/tests/filesystemiterator_flags.phpt b/ext/spl/tests/filesystemiterator_flags.phpt
index 635345655b..c74129760c 100644
--- a/ext/spl/tests/filesystemiterator_flags.phpt
+++ b/ext/spl/tests/filesystemiterator_flags.phpt
@@ -10,7 +10,7 @@ printflags($it);
$it->setFlags(FileSystemIterator::CURRENT_AS_SELF |
FileSystemIterator::KEY_AS_FILENAME |
- FileSystemIterator::SKIP_DOTS |
+ FileSystemIterator::SKIP_DOTS |
FileSystemIterator::UNIX_PATHS);
printflags($it);
diff --git a/ext/spl/tests/fixedarray_008.phpt b/ext/spl/tests/fixedarray_008.phpt
index 8775d61fff..6d9c9cbf09 100644
--- a/ext/spl/tests/fixedarray_008.phpt
+++ b/ext/spl/tests/fixedarray_008.phpt
@@ -17,7 +17,7 @@ foreach ($a as $x) {
var_dump($x[0]);
} else {
var_dump($x);
- }
+ }
}
var_dump($a->getSize());
diff --git a/ext/spl/tests/fixedarray_010.phpt b/ext/spl/tests/fixedarray_010.phpt
index 472e8b07a2..7af3a83156 100644
--- a/ext/spl/tests/fixedarray_010.phpt
+++ b/ext/spl/tests/fixedarray_010.phpt
@@ -30,10 +30,10 @@ var_dump($a->getSize());
$a = new SplFixedArray(3);
-$a[0] = "test";
-$a[1] = array(1,2,"blah");
-$a[2] = 1;
-$a[0] = "test";
+$a[0] = "test";
+$a[1] = array(1,2,"blah");
+$a[2] = 1;
+$a[0] = "test";
$a->setSize(0);
var_dump($a->getSize());
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index b6f119ab1f..11dca712a5 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -11,6 +11,6 @@ try {
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
Done
diff --git a/ext/spl/tests/heap_corruption.phpt b/ext/spl/tests/heap_corruption.phpt
index 5e9dec7855..6b85681de5 100644
--- a/ext/spl/tests/heap_corruption.phpt
+++ b/ext/spl/tests/heap_corruption.phpt
@@ -9,7 +9,7 @@ Mike Sullivan <mikesul@php.net>
class myHeap extends SplHeap
{
public $allow_compare = true;
-
+
public function compare($v1, $v2)
{
if ($this->allow_compare == true)
diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt
index 26df62e85b..f5bb6974d9 100644
--- a/ext/spl/tests/iterator_001.phpt
+++ b/ext/spl/tests/iterator_001.phpt
@@ -44,7 +44,7 @@ class NumericArrayIterator implements Iterator
echo __METHOD__ . "\n";
$this->i++;
}
-
+
public function greaterThan($comp)
{
echo get_class($this) . '::' . __FUNCTION__ . '(' . $comp . ")\n";
diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt
index 527fe6b776..61765421f1 100644
--- a/ext/spl/tests/iterator_002.phpt
+++ b/ext/spl/tests/iterator_002.phpt
@@ -9,7 +9,7 @@ class RecursiceArrayIterator extends ArrayIterator implements RecursiveIterator
{
return is_array($this->current());
}
-
+
function getChildren()
{
return new RecursiceArrayIterator($this->current());
@@ -22,12 +22,12 @@ class CrashIterator extends FilterIterator implements RecursiveIterator
{
return true;
}
-
+
function hasChildren()
{
return $this->getInnerIterator()->hasChildren();
}
-
+
function getChildren()
{
return new RecursiceArrayIterator($this->getInnerIterator()->current());
diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt
index 11d37b303b..f119661f57 100644
--- a/ext/spl/tests/iterator_003.phpt
+++ b/ext/spl/tests/iterator_003.phpt
@@ -18,7 +18,7 @@ class Student
{
return $this->id . ', ' . $this->name;
}
-
+
public function getId()
{
return $this->id;
@@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator
FilterIterator::__construct($students->getIterator());
$this->id = $other->getId();
}
-
+
public function accept()
{
echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
@@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator
class StudentList implements IteratorAggregate
{
private $students;
-
+
public function __construct()
{
$this->students = new ArrayObject(array());
}
-
+
public function add(Student $student)
{
if (!$this->contains($student)) {
$this->students[] = $student;
}
}
-
+
public function contains(Student $student)
{
foreach ($this->students as $s)
@@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate
}
return false;
}
-
+
public function getIterator() {
return new CachingIterator($this->students->getIterator(), true);
}
diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt
index 8d055313ac..f0831d5799 100644
--- a/ext/spl/tests/iterator_022.phpt
+++ b/ext/spl/tests/iterator_022.phpt
@@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator
}
return $res;
}
-
+
function callGetChildren()
{
if ($this->over == 2)
diff --git a/ext/spl/tests/iterator_023.phpt b/ext/spl/tests/iterator_023.phpt
index 1b6b4685ec..c11a7355cf 100644
--- a/ext/spl/tests/iterator_023.phpt
+++ b/ext/spl/tests/iterator_023.phpt
@@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator
}
return $res;
}
-
+
function callGetChildren()
{
if ($this->over == 2)
diff --git a/ext/spl/tests/iterator_025.phpt b/ext/spl/tests/iterator_025.phpt
index e582b1f39e..623a4cbcf4 100644
--- a/ext/spl/tests/iterator_025.phpt
+++ b/ext/spl/tests/iterator_025.phpt
@@ -9,7 +9,7 @@ class MyRecursiveIteratorIterator extends RecursiveIteratorIterator
{
echo __METHOD__ . "()\n";
}
-
+
function endIteration()
{
echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt
index 8bd3ca7c54..da91469f08 100644
--- a/ext/spl/tests/iterator_031.phpt
+++ b/ext/spl/tests/iterator_031.phpt
@@ -37,13 +37,13 @@ class MyAppendIterator extends AppendIterator
echo __METHOD__ . "\n";
return parent::valid();
}
-
+
function append(Iterator $what)
{
echo __METHOD__ . "\n";
parent::append($what);
}
-
+
function parent__construct()
{
parent::__construct();
diff --git a/ext/spl/tests/iterator_034.phpt b/ext/spl/tests/iterator_034.phpt
index 3329e744bd..84b15d4eec 100644
--- a/ext/spl/tests/iterator_034.phpt
+++ b/ext/spl/tests/iterator_034.phpt
@@ -23,7 +23,7 @@ class MyRecursiveArrayIterator extends RecursiveArrayIterator
echo __METHOD__ . "()\n";
return parent::getChildren();
}
-
+
function rewind()
{
echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index 307337431a..e6d68fbea6 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -2,7 +2,7 @@
SPL: ArrayIterator and values assigned by reference
--FILE--
<?php
-
+
$tmp = 1;
$a = new ArrayIterator();
@@ -11,7 +11,7 @@ $a[] = &$tmp;
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt
index 0f668db53f..a4ff7a214c 100644
--- a/ext/spl/tests/iterator_036.phpt
+++ b/ext/spl/tests/iterator_036.phpt
@@ -17,6 +17,6 @@ test(new CachingIterator($ar, 0));
?>
===DONE===
---EXPECTF--
+--EXPECTF--
Fatal error: Method CachingIterator::__toString() must not throw an exception, caught BadMethodCallException: CachingIterator does not fetch string value (see CachingIterator::__construct) in %siterator_036.php on line %d
diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt
index 2aa61bb03f..3cbb0fd341 100644
--- a/ext/spl/tests/iterator_037.phpt
+++ b/ext/spl/tests/iterator_037.phpt
@@ -89,7 +89,7 @@ catch (Exception $e)
?>
===DONE===
---EXPECTF--
+--EXPECTF--
===1===
int(1)
string(1) "1"
diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt
index d76b2d93ce..c8ffae77a5 100644
--- a/ext/spl/tests/iterator_045.phpt
+++ b/ext/spl/tests/iterator_045.phpt
@@ -27,7 +27,7 @@ class MyCachingIterator extends CachingIterator
$this->offsetSet($k, $v);
}
}
-
+
function testUnset($ar)
{
echo __METHOD__ . "()\n";
@@ -37,7 +37,7 @@ class MyCachingIterator extends CachingIterator
$this->offsetUnset($v);
}
}
-
+
function fill()
{
echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt
index 03c7350fa2..5175f41c0c 100644
--- a/ext/spl/tests/iterator_049b.phpt
+++ b/ext/spl/tests/iterator_049b.phpt
Binary files differ
diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt
index 84b3eb993c..4c8191fab7 100644
--- a/ext/spl/tests/iterator_052.phpt
+++ b/ext/spl/tests/iterator_052.phpt
@@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES
class MyRegexIterator extends RegexIterator
{
public $uk, $re;
-
+
function __construct($it, $re, $mode, $flags = 0)
{
$this->uk = $flags & self::USE_KEY;
@@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator
var_dump($v);
}
}
-
+
function accept()
{
@preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub);
diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt
index 21c044c1b2..fb8e1e5f14 100644
--- a/ext/spl/tests/iterator_053.phpt
+++ b/ext/spl/tests/iterator_053.phpt
@@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES
class MyRegexIterator extends RegexIterator
{
public $uk, $re;
-
+
function __construct($it, $re, $mode, $flags = 0)
{
$this->uk = $flags & self::USE_KEY;
@@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator
var_dump($v);
}
}
-
+
function accept()
{
@preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub);
diff --git a/ext/spl/tests/iterator_056.phpt b/ext/spl/tests/iterator_056.phpt
index b5213732c3..ec49e6b740 100644
--- a/ext/spl/tests/iterator_056.phpt
+++ b/ext/spl/tests/iterator_056.phpt
@@ -20,25 +20,25 @@ class myLimitIterator extends LimitIterator { }
class myNoRewindIterator extends NoRewindIterator {}
try {
- $it = new myFilterIterator();
+ $it = new myFilterIterator();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
- $it = new myCachingIterator();
+ $it = new myCachingIterator();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
- $it = new myRecursiveCachingIterator();
+ $it = new myRecursiveCachingIterator();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
- $it = new myParentIterator();
+ $it = new myParentIterator();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
diff --git a/ext/spl/tests/iterator_057.phpt b/ext/spl/tests/iterator_057.phpt
index 602c125015..61c1dfced6 100644
--- a/ext/spl/tests/iterator_057.phpt
+++ b/ext/spl/tests/iterator_057.phpt
@@ -5,8 +5,8 @@ Sebastian Schürmann
--FILE--
<?php
/**
- * From Docs: Construct a new array iterator from anything that has a hash table.
- * NULL, NOTHING is not a hash table ;)
+ * From Docs: Construct a new array iterator from anything that has a hash table.
+ * NULL, NOTHING is not a hash table ;)
*/
class myArrayIterator extends ArrayIterator {
}
diff --git a/ext/spl/tests/iterator_058.phpt b/ext/spl/tests/iterator_058.phpt
index 3f65ecb7e4..83d9d91feb 100644
--- a/ext/spl/tests/iterator_058.phpt
+++ b/ext/spl/tests/iterator_058.phpt
@@ -5,16 +5,16 @@ Sebastian Schürmann
--FILE--
<?php
class myIterator implements Iterator {
-
+
function current() {}
function next() {}
- function key() {}
+ function key() {}
function valid() {}
function rewind() {}
-
+
}
try {
- $it = new myIterator();
+ $it = new myIterator();
} catch (InvalidArgumentException $e) {
echo 'InvalidArgumentException thrown';
}
diff --git a/ext/spl/tests/iterator_062.phpt b/ext/spl/tests/iterator_062.phpt
index 59a1dfacf0..3694cf1956 100644
--- a/ext/spl/tests/iterator_062.phpt
+++ b/ext/spl/tests/iterator_062.phpt
@@ -5,7 +5,7 @@ Sebastian Schürmann
--FILE--
<?php
class myRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
}
try {
diff --git a/ext/spl/tests/iterator_069.phpt b/ext/spl/tests/iterator_069.phpt
index 1ee44785b3..0c56f9fd3a 100644
--- a/ext/spl/tests/iterator_069.phpt
+++ b/ext/spl/tests/iterator_069.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator cannot be used with foreach by reference
--FILE--
-<?php
+<?php
$arr = array(array(1,2));
$arrOb = new ArrayObject($arr);
diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt
index 8370906abb..9f2cb6c604 100644
--- a/ext/spl/tests/iterator_071.phpt
+++ b/ext/spl/tests/iterator_071.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator - Test where the case is RS_SELF and mode is CHILD_FIRST
--FILE--
-<?php
+<?php
$arr = array(array(1,2),2);
$arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
$recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
function nextelement() {
echo __METHOD__."\n";
}
diff --git a/ext/spl/tests/observer_001.phpt b/ext/spl/tests/observer_001.phpt
index e7d72b9e24..6408406ebf 100644
--- a/ext/spl/tests/observer_001.phpt
+++ b/ext/spl/tests/observer_001.phpt
@@ -16,7 +16,7 @@ class ObserverImpl implements SplObserver
{
echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n";
}
-
+
function getName()
{
return $this->name;
diff --git a/ext/spl/tests/observer_002.phpt b/ext/spl/tests/observer_002.phpt
index 5d006177f2..504e7ca3f3 100644
--- a/ext/spl/tests/observer_002.phpt
+++ b/ext/spl/tests/observer_002.phpt
@@ -49,7 +49,7 @@ class ObserverImpl implements SplObserver
{
echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n";
}
-
+
function getName()
{
return $this->name;
@@ -72,18 +72,18 @@ class SubjectImpl implements SplSubject
echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n";
$this->observers->attach($observer);
}
-
+
function detach(SplObserver $observer)
{
echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n";
$this->observers->detach($observer);
}
-
+
function count()
{
return $this->observers->count();
}
-
+
function notify()
{
echo $this->name . '->' . __METHOD__ . "();\n";
@@ -97,7 +97,7 @@ class SubjectImpl implements SplSubject
{
return $this->name;
}
-
+
function contains($obj)
{
return $this->observers->contains($obj);
diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt
index 5e5da22e38..c7041051b8 100644
--- a/ext/spl/tests/observer_003.phpt
+++ b/ext/spl/tests/observer_003.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization
class TestClass
{
public $test = 25;
-
+
public function __construct($test = 42)
{
$this->test = $test;
diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt
index 0bc2512d80..a56c514615 100644
--- a/ext/spl/tests/observer_004.phpt
+++ b/ext/spl/tests/observer_004.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization & overloading
class TestClass
{
public $test = 25;
-
+
public function __construct($test = 42)
{
$this->test = $test;
@@ -16,7 +16,7 @@ class TestClass
class MyStorage extends SplObjectStorage
{
public $bla = 25;
-
+
public function __construct($bla = 26)
{
$this->bla = $bla;
diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt
index 883602f51d..fe490525b8 100644
--- a/ext/spl/tests/observer_005.phpt
+++ b/ext/spl/tests/observer_005.phpt
@@ -9,7 +9,7 @@ class TestClass
public $pub = 25;
protected $pro = 26;
private $pri = 27;
-
+
public function __construct($pub = 42, $pro = 43, $pri = 44)
{
$this->pub = $pub;
@@ -28,7 +28,7 @@ class MyStorage extends SplObjectStorage
public $pub = 25;
protected $pro = 26;
private $pri = 27;
-
+
public function __construct($pub = 52, $pro = 53, $pri = 54)
{
$this->pub = $pub;
diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt
index 3cd84a742f..f021dfb7f2 100644
--- a/ext/spl/tests/observer_006.phpt
+++ b/ext/spl/tests/observer_006.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage with accociatied information
class TestClass
{
public $test = 25;
-
+
public function __construct($test = 42)
{
$this->test = $test;
@@ -16,7 +16,7 @@ class TestClass
class MyStorage extends SplObjectStorage
{
public $bla = 25;
-
+
public function __construct($bla = 26)
{
$this->bla = $bla;
diff --git a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
index 7ed3b6eb34..cac0e2c479 100644
--- a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator - Exception thrown in beginchildren which should be handled in next()
--FILE--
-<?php
+<?php
$arr = array(array(1,2),2);
$arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
$recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
function beginchildren() {
throw new Exception;
}
diff --git a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
index 0e3c1c1439..1961517253 100644
--- a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator - Exception thrown in callHasChildren which should be handled in next()
--FILE--
-<?php
+<?php
$arr = array(1,2);
$arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
$recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
function callHasChildren() {
throw new Exception;
}
diff --git a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
index 32617bf108..941f92be82 100644
--- a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator - Exception thrown in endchildren which should be handled in next()
--FILE--
-<?php
+<?php
$arr = array(array(1,2));
$arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
$recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
function endchildren() {
throw new Exception;
}
diff --git a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
index a2c0d2ea1b..dd4f038710 100644
--- a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: RecursiveIteratorIterator - Exception thrown in nextelement which should be handled in next()
--FILE--
-<?php
+<?php
$arr = array(1,2);
$arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
$recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-
+
function nextelement() {
throw new Exception;
}
diff --git a/ext/spl/tests/regexiterator_setflags_exception.phpt b/ext/spl/tests/regexiterator_setflags_exception.phpt
index fdc8bca649..44108c746d 100644
--- a/ext/spl/tests/regexiterator_setflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setflags_exception.phpt
@@ -24,7 +24,7 @@ $rege = '/^a/';
$r = new TestRegexIterator(new myIterator, $rege);
-try{
+try{
$r->setFlags();
}catch (Exception $e) {
echo $e->getMessage();
diff --git a/ext/spl/tests/regexiterator_setpregflags_exception.phpt b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
index cc7c17c272..c84af67d2b 100644
--- a/ext/spl/tests/regexiterator_setpregflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
@@ -25,7 +25,7 @@ $rege = '/^a/';
$r = new TestRegexIterator(new myIterator, $rege);
-try{
+try{
$r->setPregFlags();
}catch (Exception $e) {
echo $e->getMessage();
diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt
index 2373d6dbbc..778b22a7d0 100644
--- a/ext/spl/tests/spl_autoload_002.phpt
+++ b/ext/spl/tests/spl_autoload_002.phpt
@@ -1,8 +1,8 @@
--TEST--
SPL: spl_autoload_functions()
--SKIPIF--
-<?php
-if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini');
+<?php
+if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini');
?>
--FILE--
<?php
diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index f4db521d52..58c4d7ca8f 100644
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -11,7 +11,7 @@ class MyAutoLoader {
{
echo __METHOD__ . "($className)\n";
}
-
+
function autoThrow($className)
{
echo __METHOD__ . "($className)\n";
diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index 4b10351866..df795d02b6 100644
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -18,7 +18,7 @@ class MyAutoLoader
echo __METHOD__ . "($className)\n";
throw new Exception('Bla');
}
-
+
function dynaLoad($className)
{
echo __METHOD__ . "($className)\n";
@@ -49,9 +49,9 @@ foreach($funcs as $idx => $func)
if (count(spl_autoload_functions()))
{
echo "registered\n";
-
+
var_dump(class_exists("NoExistingTestClass", true));
- }
+ }
}
catch (Exception $e)
{
diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
index dcb4287c45..e00b25849c 100644
--- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
+++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: CachingInterator constructor flag checks
+SPL: CachingInterator constructor flag checks
--CREDITS--
Sean Burlington www.practicalweb.co.uk
TestFest London May 2009
diff --git a/ext/spl/tests/spl_classes.phpt b/ext/spl/tests/spl_classes.phpt
index 172c4ab92d..9d897c497d 100644
--- a/ext/spl/tests/spl_classes.phpt
+++ b/ext/spl/tests/spl_classes.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: spl_classes() function
+SPL: spl_classes() function
--CREDITS--
Sebastian Schürmann
sebs@php.net
diff --git a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
index 8726f4b32a..823c809f82 100644
--- a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
+++ b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: SplHeap check no arguments to be accepted on recoverFromCorruption
+SPL: SplHeap check no arguments to be accepted on recoverFromCorruption
--CREDITS--
Rohan Abraham (rohanabrahams@gmail.com)
TestFest London May 2009
diff --git a/ext/spl/tests/spl_iterator_getcallchildren.phpt b/ext/spl/tests/spl_iterator_getcallchildren.phpt
index 77b03b6b7f..cbbd97bc6f 100644
--- a/ext/spl/tests/spl_iterator_getcallchildren.phpt
+++ b/ext/spl/tests/spl_iterator_getcallchildren.phpt
@@ -16,7 +16,7 @@ var_dump($test->current());
try {
$output = $test->callGetChildren();
} catch (InvalidArgumentException $ilae){
- $output = null;
+ $output = null;
print "invalid argument exception\n";
}
var_dump($output);
diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
index 4c3fae25a2..e9dfc3c0ce 100644
--- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt
+++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: IteratorInterator constructor checks
+SPL: IteratorInterator constructor checks
--CREDITS--
Sean Burlington www.practicalweb.co.uk
TestFest London May 2009
diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
index 1262ec0d65..eba68d05ec 100644
--- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
+++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
@@ -1,5 +1,5 @@
--TEST--
-SPL: Test on RecursiveIteratorIterator key function checking switch statements
+SPL: Test on RecursiveIteratorIterator key function checking switch statements
--CREDITS--
Rohan Abraham (rohanabrahams@gmail.com)
TestFest London May 2009