cvs: php-src /ext/ftp/tests 006.phpt bug39583.phpt server.inc /ext/standard/tests/general_functions phpcredits.phpt phpcredits2.phpt phpinfo.phpt
phpinfo2.phpt
| From: | Nuno Lopes | Date: | Fri, 24 Nov 2006 20:20:51 +0000 |
| Subject: | cvs: php-src /ext/ftp/tests 006.phpt bug39583.phpt server.inc /ext/standard/tests/general_functions phpcredits.phpt phpcredits2.phpt phpinfo.phpt phpinfo2.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41728@lists.php.net to get a copy of this message | ||
nlopess Fri Nov 24 20:20:51 2006 UTC
Modified files:
/php-src/ext/standard/tests/general_functions phpcredits.phpt
phpcredits2.phpt
phpinfo.phpt
phpinfo2.phpt
/php-src/ext/ftp/tests 006.phpt bug39583.phpt server.inc
Log:
more tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpcredits.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpcredits.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpcredits.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpcredits.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,54 @@ +--TEST-- +phpcredits() +--FILE-- +<?php + +var_dump(phpcredits()); +var_dump(phpcredits(array())); + +echo "--\n"; +var_dump(phpcredits(0)); + +echo "--\n"; +var_dump(phpcredits(CREDITS_GROUP)); + +?> +--EXPECTF-- +PHP Credits + +PHP Group +%s + +Language Design & Concept +%s + +%wPHP %d Authors%w +%s + +%wSAPI Modules%w +%s + +%wModule Authors%w +%s + +%wPHP Documentation%w +%s + +PHP Quality Assurance Team +%s + +PHP Website Team +%s +bool(true) + +Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits.php on line 4 +NULL +-- +PHP Credits +bool(true) +-- +PHP Credits + +PHP Group +%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpcredits2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpcredits2.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpcredits2.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpcredits2.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,32 @@ +--TEST-- +phpcredits() CGI +--SKIPIF-- +<?php if (php_sapi_name()=='cli') echo 'skip'; ?> +--POST-- +dummy=x +--FILE-- +<?php + +var_dump(phpcredits()); +var_dump(phpcredits(array())); + +echo "--\n"; +var_dump(phpcredits(0)); + +echo "--\n"; +var_dump(phpcredits(CREDITS_GROUP)); + +?> +--EXPECTF-- +<!DOCTYPE %s>%s</html> +bool(true) + +Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits2.php on line 4 +NULL +-- +<h1>PHP Credits</h1> +bool(true) +-- +<h1>PHP Credits</h1> +%sPHP Group%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,75 @@ +--TEST-- +phpinfo() +--FILE-- +<?php +var_dump(phpinfo()); + +echo "--\n"; +var_dump(phpinfo(array())); + +echo "--\n"; +var_dump(phpinfo(0)); + +echo "--\n"; +var_dump(phpinfo(INFO_LICENSE)); + +?> +--EXPECTF-- +phpinfo() +PHP Version => %s + +System => %s +Build Date => %s +Configure Command => %s +Server API => Command Line Interface +Virtual Directory Support => %s +Configuration File (php.ini) Path => %s +PHP API => %d +PHP Extension => %d +Zend Extension => %d +Debug Build => %s +Thread Safety => %s +Zend Memory Manager => %s +IPv6 Support => %s +Registered PHP Streams => %s +Registered Stream Socket Transports => %s +Registered Stream Filters => %s + +%s + _______________________________________________________________________ + + +Configuration + +PHP Core + +%s + +Additional Modules + +%s + +Environment + +%s + +PHP Variables + +%s + +PHP License +%s +bool(true) +-- + +Warning: phpinfo() expects parameter 1 to be long, array given in %sphpinfo.php on line 5 +NULL +-- +phpinfo() +bool(true) +-- +phpinfo() + +PHP License +%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo2.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpinfo2.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpinfo2.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,33 @@ +--TEST-- +phpinfo() CGI +--SKIPIF-- +<?php if (php_sapi_name()=='cli') echo 'skip'; ?> +--POST-- +dummy=x +--FILE-- +<?php +var_dump(phpinfo()); + +echo "--\n"; +var_dump(phpinfo(array())); + +echo "--\n"; +var_dump(phpinfo(0)); + +echo "--\n"; +var_dump(phpinfo(INFO_LICENSE)); + +?> +--EXPECTF-- +<!DOCTYPE %s> +%s</html>bool(true) +-- + +Warning: phpinfo() expects parameter 1 to be long, array given in %sphpinfo2.php on line 5 +NULL +-- +<!DOCTYPE %s> +%s</html>bool(true) +-- +<!DOCTYPE %s> +%s</html>bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ftp/tests/006.phpt diff -u /dev/null php-src/ext/ftp/tests/006.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/ftp/tests/006.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,100 @@ +--TEST-- +FTP with bogus parameters +--SKIPIF-- +<?php +require 'skipif.inc'; +?> +--FILE-- +<?php +$ftp=null; + +var_dump(ftp_connect(array())); +var_dump(ftp_connect('127.0.0.1', 0, -3)); +var_dump(ftp_raw($ftp)); +var_dump(ftp_mkdir($ftp)); +var_dump(ftp_rmdir($ftp)); +var_dump(ftp_nlist($ftp)); +var_dump(ftp_rawlist($ftp)); +var_dump(ftp_fget($ftp)); +var_dump(ftp_nb_fget($ftp)); +var_dump(ftp_nb_get($ftp)); +var_dump(ftp_pasv($ftp)); +var_dump(ftp_nb_continue()); +var_dump(ftp_fput()); +var_dump(ftp_nb_fput($ftp)); +var_dump(ftp_put($ftp)); +var_dump(ftp_nb_put($ftp)); +var_dump(ftp_size($ftp)); +var_dump(ftp_mdtm($ftp)); +var_dump(ftp_rename($ftp)); +var_dump(ftp_site($ftp)); +var_dump(ftp_set_option($ftp)); +var_dump(ftp_get_option($ftp)); + +?> +--EXPECTF-- +Warning: ftp_connect() expects parameter 1 to be string, array given in %s006.php on line 4 +NULL + +Warning: ftp_connect(): Timeout has to be greater than 0 in %s006.php on line 5 +bool(false) + +Warning: ftp_raw() expects exactly 2 parameters, 1 given in %s006.php on line 6 +NULL + +Warning: ftp_mkdir() expects exactly 2 parameters, 1 given in %s006.php on line 7 +NULL + +Warning: ftp_rmdir() expects exactly 2 parameters, 1 given in %s006.php on line 8 +NULL + +Warning: ftp_nlist() expects exactly 2 parameters, 1 given in %s006.php on line 9 +NULL + +Warning: ftp_rawlist() expects at least 2 parameters, 1 given in %s006.php on line 10 +NULL + +Warning: ftp_fget() expects at least 4 parameters, 1 given in %s006.php on line 11 +NULL + +Warning: ftp_nb_fget() expects at least 4 parameters, 1 given in %s006.php on line 12 +NULL + +Warning: ftp_nb_get() expects at least 4 parameters, 1 given in %s006.php on line 13 +NULL + +Warning: ftp_pasv() expects exactly 2 parameters, 1 given in %s006.php on line 14 +NULL + +Warning: ftp_nb_continue() expects exactly 1 parameter, 0 given in %s006.php on line 15 +NULL + +Warning: ftp_fput() expects at least 4 parameters, 0 given in %s006.php on line 16 +NULL + +Warning: ftp_nb_fput() expects at least 4 parameters, 1 given in %s006.php on line 17 +NULL + +Warning: ftp_put() expects at least 4 parameters, 1 given in %s006.php on line 18 +NULL + +Warning: ftp_nb_put() expects at least 4 parameters, 1 given in %s006.php on line 19 +NULL + +Warning: ftp_size() expects exactly 2 parameters, 1 given in %s006.php on line 20 +NULL + +Warning: ftp_mdtm() expects exactly 2 parameters, 1 given in %s006.php on line 21 +NULL + +Warning: ftp_rename() expects exactly 3 parameters, 1 given in %s006.php on line 22 +NULL + +Warning: ftp_site() expects exactly 2 parameters, 1 given in %s006.php on line 23 +NULL + +Warning: ftp_set_option() expects exactly 3 parameters, 1 given in %s006.php on line 24 +NULL + +Warning: ftp_get_option() expects exactly 2 parameters, 1 given in %s006.php on line 25 +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/bug39583.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ftp/tests/bug39583.phpt diff -u php-src/ext/ftp/tests/bug39583.phpt:1.2 php-src/ext/ftp/tests/bug39583.phpt:1.3 --- php-src/ext/ftp/tests/bug39583.phpt:1.2 Fri Nov 24 15:50:45 2006 +++ php-src/ext/ftp/tests/bug39583.phpt Fri Nov 24 20:20:51 2006 @@ -6,6 +6,7 @@ ?> --FILE-- <?php +$bug39583=1; require 'server.inc'; $ftp = ftp_connect('127.0.0.1', $port); http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/server.inc?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/ftp/tests/server.inc diff -u php-src/ext/ftp/tests/server.inc:1.5 php-src/ext/ftp/tests/server.inc:1.6 --- php-src/ext/ftp/tests/server.inc:1.5 Fri Nov 24 15:50:45 2006 +++ php-src/ext/ftp/tests/server.inc Fri Nov 24 20:20:51 2006 @@ -187,7 +187,7 @@ if (isset($ascii) && !$ascii && $orig === $data) { fputs($s, "226 Closing data Connection.\r\n"); - } elseif (!empty($ascii) && $data === strtr($orig, array("\r\n" => "\n", "\r" => "\n", "\n" => "\r\n"))) { + } elseif ((!empty($ascii) || isset($bug39583)) && $data === strtr($orig, array("\r\n" => "\n", "\r" => "\n", "\n" => "\r\n"))) { fputs($s, "226 Closing data Connection.\r\n"); } else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpcredits.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpcredits.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpcredits.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpcredits.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,54 @@ +--TEST-- +phpcredits() +--FILE-- +<?php + +var_dump(phpcredits()); +var_dump(phpcredits(array())); + +echo "--\n"; +var_dump(phpcredits(0)); + +echo "--\n"; +var_dump(phpcredits(CREDITS_GROUP)); + +?> +--EXPECTF-- +PHP Credits + +PHP Group +%s + +Language Design & Concept +%s + +%wPHP %d Authors%w +%s + +%wSAPI Modules%w +%s + +%wModule Authors%w +%s + +%wPHP Documentation%w +%s + +PHP Quality Assurance Team +%s + +PHP Website Team +%s +bool(true) + +Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits.php on line 4 +NULL +-- +PHP Credits +bool(true) +-- +PHP Credits + +PHP Group +%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpcredits2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpcredits2.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpcredits2.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpcredits2.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,32 @@ +--TEST-- +phpcredits() CGI +--SKIPIF-- +<?php if (php_sapi_name()=='cli') echo 'skip'; ?> +--POST-- +dummy=x +--FILE-- +<?php + +var_dump(phpcredits()); +var_dump(phpcredits(array())); + +echo "--\n"; +var_dump(phpcredits(0)); + +echo "--\n"; +var_dump(phpcredits(CREDITS_GROUP)); + +?> +--EXPECTF-- +<!DOCTYPE %s>%s</html> +bool(true) + +Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits2.php on line 4 +NULL +-- +<h1>PHP Credits</h1> +bool(true) +-- +<h1>PHP Credits</h1> +%sPHP Group%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,75 @@ +--TEST-- +phpinfo() +--FILE-- +<?php +var_dump(phpinfo()); + +echo "--\n"; +var_dump(phpinfo(array())); + +echo "--\n"; +var_dump(phpinfo(0)); + +echo "--\n"; +var_dump(phpinfo(INFO_LICENSE)); + +?> +--EXPECTF-- +phpinfo() +PHP Version => %s + +System => %s +Build Date => %s +Configure Command => %s +Server API => Command Line Interface +Virtual Directory Support => %s +Configuration File (php.ini) Path => %s +PHP API => %d +PHP Extension => %d +Zend Extension => %d +Debug Build => %s +Thread Safety => %s +Zend Memory Manager => %s +IPv6 Support => %s +Registered PHP Streams => %s +Registered Stream Socket Transports => %s +Registered Stream Filters => %s + +%s + _______________________________________________________________________ + + +Configuration + +PHP Core + +%s + +Additional Modules + +%s + +Environment + +%s + +PHP Variables + +%s + +PHP License +%s +bool(true) +-- + +Warning: phpinfo() expects parameter 1 to be long, array given in %sphpinfo.php on line 5 +NULL +-- +phpinfo() +bool(true) +-- +phpinfo() + +PHP License +%s +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo2.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/phpinfo2.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/standard/tests/general_functions/phpinfo2.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,33 @@ +--TEST-- +phpinfo() CGI +--SKIPIF-- +<?php if (php_sapi_name()=='cli') echo 'skip'; ?> +--POST-- +dummy=x +--FILE-- +<?php +var_dump(phpinfo()); + +echo "--\n"; +var_dump(phpinfo(array())); + +echo "--\n"; +var_dump(phpinfo(0)); + +echo "--\n"; +var_dump(phpinfo(INFO_LICENSE)); + +?> +--EXPECTF-- +<!DOCTYPE %s> +%s</html>bool(true) +-- + +Warning: phpinfo() expects parameter 1 to be long, array given in %sphpinfo2.php on line 5 +NULL +-- +<!DOCTYPE %s> +%s</html>bool(true) +-- +<!DOCTYPE %s> +%s</html>bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/ftp/tests/006.phpt diff -u /dev/null php-src/ext/ftp/tests/006.phpt:1.2 --- /dev/null Fri Nov 24 20:20:51 2006 +++ php-src/ext/ftp/tests/006.phpt Fri Nov 24 20:20:51 2006 @@ -0,0 +1,100 @@ +--TEST-- +FTP with bogus parameters +--SKIPIF-- +<?php +require 'skipif.inc'; +?> +--FILE-- +<?php +$ftp=null; + +var_dump(ftp_connect(array())); +var_dump(ftp_connect('127.0.0.1', 0, -3)); +var_dump(ftp_raw($ftp)); +var_dump(ftp_mkdir($ftp)); +var_dump(ftp_rmdir($ftp)); +var_dump(ftp_nlist($ftp)); +var_dump(ftp_rawlist($ftp)); +var_dump(ftp_fget($ftp)); +var_dump(ftp_nb_fget($ftp)); +var_dump(ftp_nb_get($ftp)); +var_dump(ftp_pasv($ftp)); +var_dump(ftp_nb_continue()); +var_dump(ftp_fput()); +var_dump(ftp_nb_fput($ftp)); +var_dump(ftp_put($ftp)); +var_dump(ftp_nb_put($ftp)); +var_dump(ftp_size($ftp)); +var_dump(ftp_mdtm($ftp)); +var_dump(ftp_rename($ftp)); +var_dump(ftp_site($ftp)); +var_dump(ftp_set_option($ftp)); +var_dump(ftp_get_option($ftp)); + +?> +--EXPECTF-- +Warning: ftp_connect() expects parameter 1 to be string, array given in %s006.php on line 4 +NULL + +Warning: ftp_connect(): Timeout has to be greater than 0 in %s006.php on line 5 +bool(false) + +Warning: ftp_raw() expects exactly 2 parameters, 1 given in %s006.php on line 6 +NULL + +Warning: ftp_mkdir() expects exactly 2 parameters, 1 given in %s006.php on line 7 +NULL + +Warning: ftp_rmdir() expects exactly 2 parameters, 1 given in %s006.php on line 8 +NULL + +Warning: ftp_nlist() expects exactly 2 parameters, 1 given in %s006.php on line 9 +NULL + +Warning: ftp_rawlist() expects at least 2 parameters, 1 given in %s006.php on line 10 +NULL + +Warning: ftp_fget() expects at least 4 parameters, 1 given in %s006.php on line 11 +NULL + +Warning: ftp_nb_fget() expects at least 4 parameters, 1 given in %s006.php on line 12 +NULL + +Warning: ftp_nb_get() expects at least 4 parameters, 1 given in %s006.php on line 13 +NULL + +Warning: ftp_pasv() expects exactly 2 parameters, 1 given in %s006.php on line 14 +NULL + +Warning: ftp_nb_continue() expects exactly 1 parameter, 0 given in %s006.php on line 15 +NULL + +Warning: ftp_fput() expects at least 4 parameters, 0 given in %s006.php on line 16 +NULL + +Warning: ftp_nb_fput() expects at least 4 parameters, 1 given in %s006.php on line 17 +NULL + +Warning: ftp_put() expects at least 4 parameters, 1 given in %s006.php on line 18 +NULL + +Warning: ftp_nb_put() expects at least 4 parameters, 1 given in %s006.php on line 19 +NULL + +Warning: ftp_size() expects exactly 2 parameters, 1 given in %s006.php on line 20 +NULL + +Warning: ftp_mdtm() expects exactly 2 parameters, 1 given in %s006.php on line 21 +NULL + +Warning: ftp_rename() expects exactly 3 parameters, 1 given in %s006.php on line 22 +NULL + +Warning: ftp_site() expects exactly 2 parameters, 1 given in %s006.php on line 23 +NULL + +Warning: ftp_set_option() expects exactly 3 parameters, 1 given in %s006.php on line 24 +NULL + +Warning: ftp_get_option() expects exactly 2 parameters, 1 given in %s006.php on line 25 +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/bug39583.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ftp/tests/bug39583.phpt diff -u php-src/ext/ftp/tests/bug39583.phpt:1.2 php-src/ext/ftp/tests/bug39583.phpt:1.3 --- php-src/ext/ftp/tests/bug39583.phpt:1.2 Fri Nov 24 15:50:45 2006 +++ php-src/ext/ftp/tests/bug39583.phpt Fri Nov 24 20:20:51 2006 @@ -6,6 +6,7 @@ ?> --FILE-- <?php +$bug39583=1; require 'server.inc'; $ftp = ftp_connect('127.0.0.1', $port); http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/server.inc?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/ftp/tests/server.inc diff -u php-src/ext/ftp/tests/server.inc:1.5 php-src/ext/ftp/tests/server.inc:1.6 --- php-src/ext/ftp/tests/server.inc:1.5 Fri Nov 24 15:50:45 2006 +++ php-src/ext/ftp/tests/server.inc Fri Nov 24 20:20:51 2006 @@ -187,7 +187,7 @@ if (isset($ascii) && !$ascii && $orig === $data) { fputs($s, "226 Closing data Connection.\r\n"); - } elseif (!empty($ascii) && $data === strtr($orig, array("\r\n" => "\n", "\r" => "\n", "\n" => "\r\n"))) { + } elseif ((!empty($ascii) || isset($bug39583)) && $data === strtr($orig, array("\r\n" => "\n", "\r" => "\n", "\n" => "\r\n"))) { fputs($s, "226 Closing data Connection.\r\n"); } else {