From a772d7c3efbd3d22cec4950ac17c521f15bf288f Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Fri, 24 Apr 2009 19:48:41 +0000 Subject: [PATCH] MFH --- ext/standard/tests/network/bug20134.phpt | 2 +- ext/standard/tests/strings/bug40754.phpt | 4 ++-- ext/standard/tests/url/bug47174.phpt | 4 ++-- .../tests/versioning/php_sapi_name.phpt | 2 +- sapi/cgi/tests/002.phpt | 18 +++++++++--------- sapi/cgi/tests/003.phpt | 6 +++--- sapi/cgi/tests/008.phpt | 4 ++-- sapi/cgi/tests/009.phpt | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt index e311f892f7..400e3fb15c 100644 --- a/ext/standard/tests/network/bug20134.phpt +++ b/ext/standard/tests/network/bug20134.phpt @@ -11,7 +11,7 @@ if (!$fp) { } else { /* Likewise, writes will always appear to succeed */ - $x = fwrite($fp,"\n"); + $x = fwrite($fp,b"\n"); var_dump($x); /* But reads should always fail */ $content = fread($fp, 40); diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt index e4bba8f440..6cfe47056b 100644 --- a/ext/standard/tests/strings/bug40754.phpt +++ b/ext/standard/tests/strings/bug40754.phpt @@ -27,8 +27,8 @@ var_dump(substr("abcde", $v, $v)); ?> --EXPECTF-- -string(4) "bcde" -string(6) "abcdex" +%unicode|string%(4) "bcde" +%unicode|string%(6) "abcdex" bool(false) bool(false) diff --git a/ext/standard/tests/url/bug47174.phpt b/ext/standard/tests/url/bug47174.phpt index 6d08063253..0296dbe753 100644 --- a/ext/standard/tests/url/bug47174.phpt +++ b/ext/standard/tests/url/bug47174.phpt @@ -2,13 +2,13 @@ Bug #47174 (base64_decode() interprets pad char in mid string as terminator) --FILE-- 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 -- 2.40.0