cvs: php-src(PHP_5_2) /ext/standard/tests/file fgetcsv_variation10.phpt fgetcsv_variation14.phpt fgetcsv_variation2.phpt fgetcsv_variation22.phpt
fgetcsv_variation29.phpt fgetcsv_variation30.phpt fgetcsv_variation31.phpt

kraghuba Tue Aug 14 14:07:47 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file fgetcsv_variation2.phpt fgetcsv_variation29.phpt fgetcsv_variation30.phpt fgetcsv_variation31.phpt fgetcsv_variation10.phpt fgetcsv_variation22.phpt fgetcsv_variation14.phpt Log: Fix tests

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation2.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation2.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation2.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation2.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation2.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with length as 0 (Bug #42175) +Test fgetcsv() : usage variations - with length as 0 --FILE-- <?php /* @@ -99,7 +99,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(2) { @@ -109,7 +109,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(2) { @@ -119,7 +119,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(2) { @@ -129,7 +129,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(2) { @@ -139,7 +139,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(2) { @@ -149,7 +149,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(2) { @@ -159,7 +159,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(2) { @@ -169,7 +169,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(2) { @@ -179,7 +179,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(2) { @@ -189,7 +189,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(2) { @@ -199,7 +199,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(2) { @@ -209,7 +209,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(2) { @@ -219,7 +219,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(2) { @@ -229,7 +229,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(2) { @@ -239,7 +239,7 @@ string(5) "fruit" } int(14) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(2) { @@ -249,7 +249,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(2) { @@ -259,7 +259,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(2) { @@ -269,7 +269,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(2) { @@ -279,7 +279,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(2) { @@ -289,7 +289,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(2) { @@ -299,7 +299,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(2) { @@ -309,7 +309,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(2) { @@ -319,7 +319,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(2) { @@ -329,7 +329,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(2) { @@ -339,7 +339,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(2) { @@ -349,7 +349,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(2) { @@ -359,7 +359,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(2) { @@ -369,7 +369,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(2) { @@ -379,7 +379,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(2) { @@ -389,7 +389,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(2) { @@ -399,7 +399,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(2) { @@ -409,7 +409,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(2) { @@ -419,7 +419,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(2) { @@ -429,7 +429,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(2) { @@ -439,7 +439,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(2) { @@ -449,7 +449,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(2) { @@ -459,7 +459,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(2) { @@ -469,7 +469,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(2) { @@ -479,7 +479,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(2) { @@ -489,7 +489,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(2) { @@ -499,7 +499,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(2) { @@ -509,7 +509,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(2) { @@ -519,7 +519,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(2) { @@ -529,7 +529,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(2) { @@ -539,7 +539,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(2) { @@ -549,7 +549,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(2) { @@ -559,7 +559,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(2) { @@ -569,7 +569,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(2) { @@ -579,7 +579,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(2) { @@ -589,7 +589,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(2) { @@ -599,7 +599,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(2) { @@ -609,7 +609,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(2) { @@ -619,7 +619,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(2) { @@ -629,7 +629,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(2) { @@ -639,7 +639,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(2) { @@ -649,7 +649,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(2) { @@ -659,7 +659,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(2) { @@ -669,7 +669,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(2) { @@ -679,7 +679,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(2) { @@ -689,7 +689,7 @@ string(5) "fruit" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(2) { @@ -699,7 +699,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(2) { @@ -709,7 +709,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(2) { @@ -719,7 +719,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(2) { @@ -729,7 +729,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(2) { @@ -739,7 +739,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(2) { @@ -749,7 +749,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(2) { @@ -759,7 +759,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(2) { @@ -769,7 +769,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(2) { @@ -779,7 +779,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(2) { @@ -789,7 +789,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(2) { @@ -799,7 +799,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(2) { @@ -809,7 +809,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(2) { @@ -819,7 +819,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(2) { @@ -829,7 +829,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(2) { @@ -839,7 +839,7 @@ string(0) "" } int(16) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(1) { @@ -847,7 +847,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(1) { @@ -855,7 +855,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(1) { @@ -863,7 +863,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(1) { @@ -871,7 +871,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(1) { @@ -879,7 +879,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(1) { @@ -887,7 +887,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(1) { @@ -895,7 +895,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(1) { @@ -903,7 +903,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(1) { @@ -911,7 +911,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(1) { @@ -919,7 +919,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(1) { @@ -927,7 +927,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(1) { @@ -935,7 +935,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(1) { @@ -943,7 +943,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(1) { @@ -951,7 +951,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(1) { @@ -959,7 +959,7 @@ string(14) "water-fruitair" } int(18) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(3) { @@ -971,7 +971,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(3) { @@ -983,7 +983,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(3) { @@ -995,7 +995,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(3) { @@ -1007,7 +1007,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(3) { @@ -1019,7 +1019,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(3) { @@ -1031,7 +1031,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(3) { @@ -1043,7 +1043,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(3) { @@ -1055,7 +1055,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(3) { @@ -1067,7 +1067,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(3) { @@ -1079,7 +1079,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(3) { @@ -1091,7 +1091,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(3) { @@ -1103,7 +1103,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(3) { @@ -1115,7 +1115,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(3) { @@ -1127,7 +1127,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(3) { @@ -1139,7 +1139,7 @@ string(0) "" } int(22) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r mode -- array(6) { @@ -1157,7 +1157,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rb mode -- array(6) { @@ -1175,7 +1175,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using rt mode -- array(6) { @@ -1193,7 +1193,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+ mode -- array(6) { @@ -1211,7 +1211,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+b mode -- array(6) { @@ -1229,7 +1229,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using r+t mode -- array(6) { @@ -1247,7 +1247,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+ mode -- array(6) { @@ -1265,7 +1265,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+b mode -- array(6) { @@ -1283,7 +1283,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using a+t mode -- array(6) { @@ -1301,7 +1301,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+ mode -- array(6) { @@ -1319,7 +1319,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+b mode -- array(6) { @@ -1337,7 +1337,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using w+t mode -- array(6) { @@ -1355,7 +1355,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+ mode -- array(6) { @@ -1373,7 +1373,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+b mode -- array(6) { @@ -1391,7 +1391,7 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) -- Testing fgetcsv() with file opened using x+t mode -- array(6) { @@ -1409,5 +1409,5 @@ string(4) ",,,," } int(24) -bool(true) +bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation29.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation29.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation29.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation29.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation29.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation29.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file (Bug #42175) +Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file --FILE-- <?php /* @@ -85,531 +85,531 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing fgetcsv() : with file handle as only argument and file pointer pointing at end of file *** -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation30.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation30.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation30.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation30.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation30.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation30.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file (Bug #42175) +Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file --FILE-- <?php /* @@ -84,531 +84,531 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing fgetcsv() : with file handle and length arguments, file pointer pointing at end of file *** -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation31.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation31.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation31.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation31.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation31.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation31.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file (Bug #42175) +Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file --FILE-- <?php /* @@ -86,531 +86,531 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing fgetcsv() : with enclosure argument, file pointer pointing at end of file *** -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation10.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation10.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation10.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation10.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation10.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation10.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - file pointer pointing to EOF (Bug #42175) +Test fgetcsv() : usage variations - file pointer pointing to EOF --FILE-- <?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation22.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation22.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation22.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation22.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation22.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation22.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file (Bug #42175) +Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file --FILE-- <?php /* @@ -84,531 +84,531 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing fgetcsv() : with default enclosure, file pointer pointing at end of file *** -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(53) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(53) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(57) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(57) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rb mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using rt mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- int(0) -bool(true) +bool(false) bool(false) int(61) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- int(0) -bool(true) bool(false) -int(61) +bool(false) +int(%d) bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetcsv_variation14.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgetcsv_variation14.phpt diff -u php-src/ext/standard/tests/file/fgetcsv_variation14.phpt:1.1.2.1 php-src/ext/standard/tests/file/fgetcsv_variation14.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fgetcsv_variation14.phpt:1.1.2.1 Wed Aug 8 13:13:18 2007 +++ php-src/ext/standard/tests/file/fgetcsv_variation14.phpt Tue Aug 14 14:07:46 2007 @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - reading the blank line (Bug #42228) +Test fgetcsv() : usage variations - reading the blank line --FILE-- <?php /* @@ -55,6 +55,11 @@ // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); + // read again to struck EOF + var_dump( fgetcsv($file_handle, 1024) ); + // check the file pointer position and if eof + var_dump( ftell($file_handle) ); + var_dump( feof($file_handle) ); // close the file fclose($file_handle); @@ -73,6 +78,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using rb mode -- @@ -81,6 +89,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using rt mode -- @@ -89,6 +100,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using r+ mode -- @@ -97,6 +111,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using r+b mode -- @@ -105,6 +122,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using r+t mode -- @@ -113,6 +133,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using a+ mode -- @@ -121,6 +144,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using a+b mode -- @@ -129,6 +155,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using a+t mode -- @@ -137,6 +166,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using w+ mode -- @@ -145,6 +177,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using w+b mode -- @@ -153,6 +188,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using w+t mode -- @@ -161,6 +199,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using x+ mode -- @@ -169,6 +210,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using x+b mode -- @@ -177,6 +221,9 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) -- Testing fgetcsv() with file opened using x+t mode -- @@ -185,5 +232,8 @@ string(0) "" } int(1) +bool(false) +bool(false) +int(1) bool(true) Done