From: Arnaud Le Blanc Date: Fri, 24 Apr 2009 19:47:43 +0000 (+0000) Subject: Fix tests (MFB, etc) X-Git-Tag: php-5.4.0alpha1~191^2~3864 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bc34ef8c1bd590a655fb3bead53ec7b26c418fe;p=php Fix tests (MFB, etc) --- diff --git a/ext/standard/tests/filters/php_user_filter_01.phpt b/ext/standard/tests/filters/php_user_filter_01.phpt index 513331e3f7..534b9abf32 100644 --- a/ext/standard/tests/filters/php_user_filter_01.phpt +++ b/ext/standard/tests/filters/php_user_filter_01.phpt @@ -14,4 +14,4 @@ class bar extends php_user_filter { } ?> --EXPECTF-- -Fatal error: Declaration of bar::filter() must be compatible with that of php_user_filter::filter() in %s on line %d +Strict Standards: Declaration of bar::filter() should be compatible with that of php_user_filter::filter() in %s on line %d diff --git a/ext/standard/tests/filters/php_user_filter_02.phpt b/ext/standard/tests/filters/php_user_filter_02.phpt index d72342539d..73a1f02672 100644 --- a/ext/standard/tests/filters/php_user_filter_02.phpt +++ b/ext/standard/tests/filters/php_user_filter_02.phpt @@ -9,4 +9,4 @@ class foo extends php_user_filter { } ?> --EXPECTF-- -Fatal error: Declaration of foo::filter() must be compatible with that of php_user_filter::filter() in %s on line %d +Strict Standards: Declaration of foo::filter() should be compatible with that of php_user_filter::filter() in %s on line %d diff --git a/ext/standard/tests/filters/php_user_filter_03.phpt b/ext/standard/tests/filters/php_user_filter_03.phpt index 4830eb964b..5962951eee 100644 --- a/ext/standard/tests/filters/php_user_filter_03.phpt +++ b/ext/standard/tests/filters/php_user_filter_03.phpt @@ -9,4 +9,4 @@ class foo extends php_user_filter { } ?> --EXPECTF-- -Fatal error: Declaration of foo::onCreate() must be compatible with that of php_user_filter::onCreate() in %s on line %d +Strict Standards: Declaration of foo::onCreate() should be compatible with that of php_user_filter::onCreate() in %s on line %d diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index 38fabc0885..73c7872ef0 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -1909,5 +1909,5 @@ unicode(9) "lambda_2" *** Testing error conditions *** -Warning: Wrong parameter count for var_dump() in %s on line %d +Warning: var_dump() expects at least 1 parameter, 0 given in %s Done diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt index 0413988814..400e3fb15c 100644 --- a/ext/standard/tests/network/bug20134.phpt +++ b/ext/standard/tests/network/bug20134.phpt @@ -21,4 +21,4 @@ else { ?> --EXPECT-- int(1) -bool(false) +string(0) "" diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt index 88225f180a..6cfe47056b 100644 --- a/ext/standard/tests/strings/bug40754.phpt +++ b/ext/standard/tests/strings/bug40754.phpt @@ -26,9 +26,9 @@ var_dump(chunk_split("abcde", $v, "abc")); var_dump(substr("abcde", $v, $v)); ?> ---EXPECTF-- -unicode(4) "bcde" -unicode(6) "abcdex" +--EXPECTF-- +%unicode|string%(4) "bcde" +%unicode|string%(6) "abcdex" bool(false) bool(false) @@ -59,5 +59,5 @@ bool(false) Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d bool(false) int(2) -unicode(8) "abcdeabc" +string(8) "abcdeabc" bool(false) diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt index fdc892cdf9..91c81e8014 100644 --- a/ext/standard/tests/strings/uuencode.phpt +++ b/ext/standard/tests/strings/uuencode.phpt @@ -9,7 +9,7 @@ var_dump(convert_uudecode(array())); var_dump(convert_uuencode("")); var_dump(convert_uudecode("")); var_dump($enc = convert_uuencode("~!@#$%^&*()_}{POIUYTREWQQSDFGHJKL: diff --git a/ext/standard/tests/versioning/php_sapi_name.phpt b/ext/standard/tests/versioning/php_sapi_name.phpt index 0747b32d66..c9d4988d95 100644 --- a/ext/standard/tests/versioning/php_sapi_name.phpt +++ b/ext/standard/tests/versioning/php_sapi_name.phpt @@ -6,4 +6,4 @@ php_sapi_name test var_dump(php_sapi_name()); --EXPECTF-- -string(3) "c%ci" +%unicode|string%(3) "c%ci" diff --git a/sapi/cgi/tests/002.phpt b/sapi/cgi/tests/002.phpt index 66e2424f28..884e6521e2 100644 --- a/sapi/cgi/tests/002.phpt +++ b/sapi/cgi/tests/002.phpt @@ -29,24 +29,24 @@ echo "Done\n"; ?> --EXPECTF-- string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r -string(3) "111" +%unicode|string%(3) "111" " string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r -string(3) "500" +%unicode|string%(3) "500" " string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r -string(3) "555" +%unicode|string%(3) "555" " string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r -string(3) "555" -string(10) "/test/path" +%unicode|string%(3) "555" +%unicode|string%(10) "/test/path" " Done diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt index ea418d104c..533743323f 100644 --- a/sapi/cgi/tests/003.phpt +++ b/sapi/cgi/tests/003.phpt @@ -42,7 +42,7 @@ echo "Done\n"; ?> --EXPECTF-- string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r " diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt index 40140e8792..7537664cc8 100644 --- a/sapi/cgi/tests/008.phpt +++ b/sapi/cgi/tests/008.phpt @@ -39,7 +39,7 @@ echo "Done\n"; ?> --EXPECTF-- string(%d) "X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r
<?php
$test = "var"; //var
/* test class */
class test {
    private $var = array();

    public static function foo(Test $arg) {
        echo "hello";
        var_dump($this);
    }
}

$o = new test;
?>
 @@ -47,7 +47,7 @@ Content-type: text/html " string(%d) "Status: 404 Not Found X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r No input file specified. " diff --git a/sapi/cgi/tests/009.phpt b/sapi/cgi/tests/009.phpt index 1c429ac198..c8e9ae1af1 100644 --- a/sapi/cgi/tests/009.phpt +++ b/sapi/cgi/tests/009.phpt @@ -24,7 +24,7 @@ echo "Done\n"; ?> --EXPECTF-- X-Powered-By: PHP/%s -Content-type: text/html +Content-type: text/html%r; charset=.*|%r string(%d) "%s/x" Done diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index da966f7114..77c76c1940 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -12,8 +12,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $php = getenv('TEST_PHP_EXECUTABLE'); -$filename = dirname(__FILE__)."/010.test.php"; -$filename_txt = dirname(__FILE__)."/010.test.txt"; +$filename = __DIR__."/010.test.php"; +$filename_txt = __DIR__."/010.test.txt"; $code = ' +===DONE=== +--CLEAN-- + --EXPECTF-- -string(38) " +string(25) " string(10) "test hello" - -bool(false) " -Done +===DONE===