From 230ef2d94774939f92128bcbbc54ffc046c2000e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Magalh=C3=A3es?= Date: Wed, 21 Feb 2018 22:44:06 +0000 Subject: [PATCH 1/2] improve extension skeleton generator --- ext/ext_skel.php | 6 +-- ext/skeleton/.gitignore.in | 36 ++++++++++++++++++ ext/skeleton/config.m4.in | 76 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 ext/skeleton/.gitignore.in diff --git a/ext/ext_skel.php b/ext/ext_skel.php index b5e3aad0a9b18..adfe76d39c96d 100644 --- a/ext/ext_skel.php +++ b/ext/ext_skel.php @@ -140,7 +140,7 @@ function process_args($argv, $argc) { continue; } - $options[$opt] = ($opt == 'dir' ? realpath($argv[$i + 1]) : $argv[$i + 1]); + $options[$opt] = ($opt == 'dir' ? realpath($argv[$i + 1]) . DIRECTORY_SEPARATOR : $argv[$i + 1]); } break; default: { @@ -249,9 +249,7 @@ function copy_config_scripts() { $files[] = 'config.w32'; } - if (!$files) { - return; - } + $files[] = '.gitignore'; foreach($files as $config_script) { $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script; diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in new file mode 100644 index 0000000000000..912ca92c74a41 --- /dev/null +++ b/ext/skeleton/.gitignore.in @@ -0,0 +1,36 @@ +.deps +*.lo +*.la +.libs +acinclude.m4 +aclocal.m4 +autom4te.cache +build +config.guess +config.h +config.h.in +config.log +config.nice +config.status +config.sub +configure +configure.ac +configure.in +include +install-sh +libtool +ltmain.sh +Makefile +Makefile.fragments +Makefile.global +Makefile.objects +missing +mkinstalldirs +modules +run-tests.php +tests/*/*.diff +tests/*/*.out +tests/*/*.php +tests/*/*.exp +tests/*/*.log +tests/*/*.sh diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in index fe2a1c48ededb..3cea301e01e38 100644 --- a/ext/skeleton/config.m4.in +++ b/ext/skeleton/config.m4.in @@ -1,7 +1,83 @@ +dnl $Id$ +dnl config.m4 for extension %EXTNAME% + +dnl Comments in this file start with the string 'dnl'. +dnl Remove where necessary. + +dnl If your extension references something external, use with: + +dnl PHP_ARG_WITH(%EXTNAME%, for %EXTNAME% support, +dnl Make sure that the comment is aligned: +dnl [ --with-%EXTNAME% Include %EXTNAME% support]) + +dnl Otherwise use enable: + PHP_ARG_ENABLE(%EXTNAME%, whether to enable %EXTNAME% support, +dnl Make sure that the comment is aligned: [ --enable-%EXTNAME% Enable %EXTNAME% support], no) if test "$PHP_%EXTNAMECAPS%" != "no"; then + dnl Write more examples of tests here... + + dnl # get library FOO build options from pkg-config output + dnl AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + dnl AC_MSG_CHECKING(for libfoo) + dnl if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists foo; then + dnl if $PKG_CONFIG foo --atleast-version 1.2.3; then + dnl LIBFOO_CFLAGS=\`$PKG_CONFIG foo --cflags\` + dnl LIBFOO_LIBDIR=\`$PKG_CONFIG foo --libs\` + dnl LIBFOO_VERSON=\`$PKG_CONFIG foo --modversion\` + dnl AC_MSG_RESULT(from pkgconfig: version $LIBFOO_VERSON) + dnl else + dnl AC_MSG_ERROR(system libfoo is too old: version 1.2.3 required) + dnl fi + dnl else + dnl AC_MSG_ERROR(pkg-config not found) + dnl fi + dnl PHP_EVAL_LIBLINE($LIBFOO_LIBDIR, %EXTNAMECAPS%_SHARED_LIBADD) + dnl PHP_EVAL_INCLINE($LIBFOO_CFLAGS) + + dnl # --with-%EXTNAME% -> check with-path + dnl SEARCH_PATH="/usr/local /usr" # you might want to change this + dnl SEARCH_FOR="/include/%EXTNAME%.h" # you most likely want to change this + dnl if test -r $PHP_%EXTNAMECAPS%/$SEARCH_FOR; then # path given as parameter + dnl %EXTNAMECAPS%_DIR=$PHP_%EXTNAMECAPS% + dnl else # search default path list + dnl AC_MSG_CHECKING([for %EXTNAME% files in default path]) + dnl for i in $SEARCH_PATH ; do + dnl if test -r $i/$SEARCH_FOR; then + dnl %EXTNAMECAPS%_DIR=$i + dnl AC_MSG_RESULT(found in $i) + dnl fi + dnl done + dnl fi + dnl + dnl if test -z "$%EXTNAMECAPS%_DIR"; then + dnl AC_MSG_RESULT([not found]) + dnl AC_MSG_ERROR([Please reinstall the %EXTNAME% distribution]) + dnl fi + + dnl # --with-%EXTNAME% -> add include path + dnl PHP_ADD_INCLUDE($%EXTNAMECAPS%_DIR/include) + + dnl # --with-%EXTNAME% -> check for lib and symbol presence + dnl LIBNAME=%EXTNAMECAPS% # you may want to change this + dnl LIBSYMBOL=%EXTNAMECAPS% # you most likely want to change this + + dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, + dnl [ + dnl PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $%EXTNAMECAPS%_DIR/$PHP_LIBDIR, %EXTNAMECAPS%_SHARED_LIBADD) + dnl AC_DEFINE(HAVE_%EXTNAMECAPS%LIB,1,[ ]) + dnl ],[ + dnl AC_MSG_ERROR([wrong %EXTNAME% lib version or lib not found]) + dnl ],[ + dnl -L$%EXTNAMECAPS%_DIR/$PHP_LIBDIR -lm + dnl ]) + dnl + dnl PHP_SUBST(%EXTNAMECAPS%_SHARED_LIBADD) + + dnl # In case of no dependencies AC_DEFINE(HAVE_%EXTNAMECAPS%, 1, [ Have %EXTNAME% support ]) + PHP_NEW_EXTENSION(%EXTNAME%, %EXTNAME%.c, $ext_shared) fi From b895690dfacfcc888ff3d652d9997557154ddf0a Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Tue, 20 Feb 2018 18:59:13 -0300 Subject: [PATCH 2/2] remove support for string|unicode in tests --- Zend/tests/bug46665.phpt | 2 +- Zend/tests/call_user_func_001.phpt | 2 +- Zend/tests/call_user_func_005.phpt | 2 +- Zend/tests/get_required_files.phpt | 2 +- ext/curl/tests/bug48514.phpt | 4 +-- ext/curl/tests/curl_basic_007.phpt | 2 +- ext/date/tests/bug46108.phpt | 4 +-- ext/date/tests/strtotime_basic.phpt | 12 +++---- .../tests/strtotime_variation_scottish.phpt | 8 ++--- ext/imap/tests/imap_binary_basic.phpt | 8 ++--- .../tests/imap_fetch_overview_variation1.phpt | 10 +++--- .../tests/imap_fetch_overview_variation2.phpt | 10 +++--- .../tests/imap_fetch_overview_variation3.phpt | 2 +- ext/interbase/tests/ibase_close_001.phpt | 2 +- ext/pcre/tests/bug47229.phpt | 8 ++--- ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt | 20 +++++------ .../tests/pdo_sqlite_createaggregate.phpt | 4 +-- .../tests/pdo_sqlite_createfunction.phpt | 8 ++--- .../tests/pdo_sqlite_lastinsertid.phpt | 6 ++-- ext/phar/tests/badparameters.phpt | 4 +-- ext/phar/tests/bug46032.phpt | 4 +-- .../tests/cache_list/copyonwrite17.phar.phpt | 2 +- .../tests/cache_list/copyonwrite19.phar.phpt | 2 +- .../tests/cache_list/frontcontroller22.phpt | 4 +-- ext/reflection/tests/bug49719.phpt | 2 +- ext/session/tests/rfc1867.phpt | 12 +++---- ext/session/tests/rfc1867_cleanup.phpt | 12 +++---- ext/session/tests/rfc1867_disabled.phpt | 12 +++---- ext/session/tests/rfc1867_disabled_2.phpt | 12 +++---- ext/session/tests/rfc1867_inter.phpt | 12 +++---- ext/session/tests/rfc1867_no_name.phpt | 12 +++---- ext/session/tests/rfc1867_sid_cookie.phpt | 12 +++---- ext/session/tests/rfc1867_sid_get.phpt | 12 +++---- ext/session/tests/rfc1867_sid_get_2.phpt | 12 +++---- ext/session/tests/rfc1867_sid_invalid.phpt | 12 +++---- .../tests/rfc1867_sid_only_cookie.phpt | 12 +++---- .../tests/rfc1867_sid_only_cookie_2.phpt | 12 +++---- ext/session/tests/rfc1867_sid_post.phpt | 12 +++---- ext/snmp/tests/snmp-object-errno-errstr.phpt | 10 +++--- ext/snmp/tests/snmp-object-properties.phpt | 10 +++--- ext/snmp/tests/snmp3.phpt | 36 +++++++++---------- ext/soap/tests/bug48557.phpt | 2 +- ...SplDoublylinkedlist_offsetunset_first.phpt | 4 +-- .../SplDoublylinkedlist_offsetunset_last.phpt | 4 +-- .../SplFixedArray_fromarray_indexes.phpt | 2 +- .../SplFixedArray_fromarray_non_indexes.phpt | 2 +- ...FixedArray_fromarray_param_multiarray.phpt | 2 +- .../SplFixedArray_offsetUnset_string.phpt | 8 ++--- ext/spl/tests/SplFixedArray_setsize_001.phpt | 4 +-- ext/sqlite3/tests/sqlite3_02_open.phpt | 2 +- .../tests/sqlite3_29_createfunction.phpt | 6 ++-- ext/sqlite3/tests/sqlite3_31_open.phpt | 2 +- .../tests/network/gethostbyname_error006.phpt | 2 +- ext/standard/tests/strings/bug46578.phpt | 12 +++---- ext/standard/tests/strings/bug47443.phpt | 6 ++-- ext/standard/tests/strings/bug47481.phpt | 24 ++++++------- ext/xsl/tests/xsltprocessor_getParameter.phpt | 2 +- run-tests.php | 22 +----------- tests/basic/rfc1867_anonymous_upload.phpt | 12 +++---- tests/basic/rfc1867_empty_upload.phpt | 18 +++++----- tests/basic/rfc1867_max_file_size.phpt | 20 +++++------ tests/basic/rfc1867_missing_boundary_2.phpt | 6 ++-- tests/basic/rfc1867_post_max_filesize.phpt | 18 +++++----- .../lang/engine_assignExecutionOrder_001.phpt | 18 +++++----- 64 files changed, 262 insertions(+), 282 deletions(-) diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/bug46665.phpt index 954dbfaefb858..29491dc26c5c0 100644 --- a/Zend/tests/bug46665.phpt +++ b/Zend/tests/bug46665.phpt @@ -13,4 +13,4 @@ new $baz(); ?> --EXPECTF-- -%string|unicode%(11) "Foo\Bar\Baz" +string(11) "Foo\Bar\Baz" diff --git a/Zend/tests/call_user_func_001.phpt b/Zend/tests/call_user_func_001.phpt index e9b35f9570027..b4b29c850a69b 100644 --- a/Zend/tests/call_user_func_001.phpt +++ b/Zend/tests/call_user_func_001.phpt @@ -28,7 +28,7 @@ namespace testing { ?> --EXPECTF-- -%string|unicode%(6) "foobar" +string(6) "foobar" Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access private method testing\foo::priv() in %s on line %d diff --git a/Zend/tests/call_user_func_005.phpt b/Zend/tests/call_user_func_005.phpt index 525b853fbfdf6..3191a714cc8c2 100644 --- a/Zend/tests/call_user_func_005.phpt +++ b/Zend/tests/call_user_func_005.phpt @@ -19,7 +19,7 @@ var_dump(call_user_func(array('foo', 'teste'))); ?> --EXPECTF-- Deprecated: %son-static method foo::teste() should not be called statically in %s on line %d -%string|unicode%(1) "x" +string(1) "x" array(1) { [0]=> object(Closure)#%d (1) { diff --git a/Zend/tests/get_required_files.phpt b/Zend/tests/get_required_files.phpt index c2ba3688848d9..eedd21b8758a2 100644 --- a/Zend/tests/get_required_files.phpt +++ b/Zend/tests/get_required_files.phpt @@ -12,5 +12,5 @@ var_dump($files); --EXPECTF-- array(1) { [0]=> - %string|unicode%(%d)%s + string(%d)%s } diff --git a/ext/curl/tests/bug48514.phpt b/ext/curl/tests/bug48514.phpt index 0ea25754f1fc9..66b81097ea29b 100644 --- a/ext/curl/tests/bug48514.phpt +++ b/ext/curl/tests/bug48514.phpt @@ -22,6 +22,6 @@ var_dump(get_resource_type($ch2)); ?> --EXPECTF-- resource(%d) of type (curl) -%string|unicode%(4) "curl" +string(4) "curl" resource(%d) of type (curl_multi) -%string|unicode%(10) "curl_multi" +string(10) "curl_multi" diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt index b7eba4bc2a252..539da71952301 100644 --- a/ext/curl/tests/curl_basic_007.phpt +++ b/ext/curl/tests/curl_basic_007.phpt @@ -20,5 +20,5 @@ curl_close($ch); ?> --EXPECTF-- -%string|unicode%(%d) "No URL set!%w" +string(%d) "No URL set!%w" int(3) diff --git a/ext/date/tests/bug46108.phpt b/ext/date/tests/bug46108.phpt index c423db3aa2564..08af3356d080b 100644 --- a/ext/date/tests/bug46108.phpt +++ b/ext/date/tests/bug46108.phpt @@ -11,9 +11,9 @@ var_dump(unserialize(serialize(new Datetime))); --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["timezone_type"]=> int(%d) ["timezone"]=> - %string|unicode%(%d) "America/Sao_Paulo" + string(%d) "America/Sao_Paulo" } diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt index 75f66978ab3d1..dec63af97bbba 100644 --- a/ext/date/tests/strtotime_basic.phpt +++ b/ext/date/tests/strtotime_basic.phpt @@ -38,9 +38,9 @@ var_dump(date('Y-m-d', strtotime('second Monday December 2008'))); var_dump(date('Y-m-d', strtotime('third Monday December 2008'))); ?> --EXPECTF-- -%string|unicode%(10) "2008-12-01" -%string|unicode%(10) "2008-12-08" -%string|unicode%(10) "2008-12-15" -%string|unicode%(10) "2008-12-08" -%string|unicode%(10) "2008-12-15" -%string|unicode%(10) "2008-12-22" +string(10) "2008-12-01" +string(10) "2008-12-08" +string(10) "2008-12-15" +string(10) "2008-12-08" +string(10) "2008-12-15" +string(10) "2008-12-22" diff --git a/ext/date/tests/strtotime_variation_scottish.phpt b/ext/date/tests/strtotime_variation_scottish.phpt index 0b21b2274188e..0cd642cc823d9 100644 --- a/ext/date/tests/strtotime_variation_scottish.phpt +++ b/ext/date/tests/strtotime_variation_scottish.phpt @@ -9,7 +9,7 @@ Checking whisky time var_dump(date('H:i:s', strtotime('front of 19'))); ?> --EXPECTF-- -%string|unicode%(8) "07:15:00" -%string|unicode%(8) "06:45:00" -%string|unicode%(8) "19:15:00" -%string|unicode%(8) "18:45:00" +string(8) "07:15:00" +string(8) "06:45:00" +string(8) "19:15:00" +string(8) "18:45:00" diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index 3deb51a6a6cdb..d0f17aebde8aa 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -38,11 +38,11 @@ var_dump(bin2hex($base64)); --EXPECTF-- *** Testing imap_binary() : basic functionality *** Encode as short string -%string|unicode%(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a" +string(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a" Encode a string which results in more than 60 charters of output -%string|unicode%(200) "56476870637942706379426849477876626d6367633352796157356e4948647064476767636d567a64577830637942706269427462334a6c4948526f0d0a595734674e6a416759326868636d466a64475679637942765a694276645852776458513d0d0a" +string(200) "56476870637942706379426849477876626d6367633352796157356e4948647064476767636d567a64577830637942706269427462334a6c4948526f0d0a595734674e6a416759326868636d466a64475679637942765a694276645852776458513d0d0a" Encode a string with special characters -%string|unicode%(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a" +string(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a" Encode some hexadecimal data -%string|unicode%(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a" +string(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a" ===Done=== diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt index bcccec6913d77..38fbccd7ec371 100644 --- a/ext/imap/tests/imap_fetch_overview_variation1.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt @@ -172,12 +172,12 @@ NULL Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d NULL --- Testing with first argument value: %string|unicode%(0) "" +-- Testing with first argument value: string(0) "" Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d NULL --- Testing with first argument value: %string|unicode%(0) "" +-- Testing with first argument value: string(0) "" Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d NULL @@ -188,17 +188,17 @@ NULL Warning: imap_fetch_overview() expects parameter 1 to be resource, array given in %s on line %d NULL --- Testing with first argument value: %string|unicode%(6) "string" +-- Testing with first argument value: string(6) "string" Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d NULL --- Testing with first argument value: %string|unicode%(6) "string" +-- Testing with first argument value: string(6) "string" Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d NULL --- Testing with first argument value: %string|unicode%(11) "hello world" +-- Testing with first argument value: string(11) "hello world" Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d NULL diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt index fbc0319fe84c6..a1b9d71b54213 100644 --- a/ext/imap/tests/imap_fetch_overview_variation2.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt @@ -192,10 +192,10 @@ udate is OK -- Testing with second argument value: bool(false) Sequence out of range --- Testing with second argument value: %string|unicode%(0) "" +-- Testing with second argument value: string(0) "" Sequence out of range --- Testing with second argument value: %string|unicode%(0) "" +-- Testing with second argument value: string(0) "" Sequence out of range -- Testing with second argument value: array(0) { @@ -204,13 +204,13 @@ Sequence out of range Warning: imap_fetch_overview() expects parameter 2 to be string, array given in %s on line %d Sequence out of range --- Testing with second argument value: %string|unicode%(6) "string" +-- Testing with second argument value: string(6) "string" Syntax error in sequence --- Testing with second argument value: %string|unicode%(6) "string" +-- Testing with second argument value: string(6) "string" Syntax error in sequence --- Testing with second argument value: %string|unicode%(11) "hello world" +-- Testing with second argument value: string(11) "hello world" Syntax error in sequence -- Testing with second argument value: object(classA)#1 (0) { diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index 7bd78d899efef..d33b44addb938 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -58,7 +58,7 @@ require_once(dirname(__FILE__).'/clean.inc'); Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -Testing with option value:%string|unicode%(1) "1" +Testing with option value:string(1) "1" imap_fetch_overview() returns an object Testing with option value:bool(true) diff --git a/ext/interbase/tests/ibase_close_001.phpt b/ext/interbase/tests/ibase_close_001.phpt index cb91e8a75a41f..80c17314d009f 100644 --- a/ext/interbase/tests/ibase_close_001.phpt +++ b/ext/interbase/tests/ibase_close_001.phpt @@ -19,5 +19,5 @@ bool(true) bool(true) bool(true) -Warning: ibase_close() expects parameter 1 to be resource,%string given in %s on line %d +Warning: ibase_close() expects parameter 1 to be resource, string given in %s on line %d NULL diff --git a/ext/pcre/tests/bug47229.phpt b/ext/pcre/tests/bug47229.phpt index 96b95a255df44..8edd1c0a5a4e7 100644 --- a/ext/pcre/tests/bug47229.phpt +++ b/ext/pcre/tests/bug47229.phpt @@ -20,18 +20,18 @@ var_dump($m); ?> --EXPECTF-- -%string|unicode%(13) "\-oh really\?" +string(13) "\-oh really\?" array(1) { [0]=> - %string|unicode%(4) "a---" + string(4) "a---" } array(1) { [0]=> - %string|unicode%(1) "a" + string(1) "a" } array(1) { [0]=> - %string|unicode%(5) "a----" + string(5) "a----" } array(0) { } diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt index ea6f22c054958..a538f56983b30 100644 --- a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt +++ b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt @@ -75,19 +75,19 @@ var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'inexistent'))); --EXPECTF-- object(PDOStatement)#%d (1) { ["queryString"]=> - %string|unicode%(21) "SELECT * FROM testing" + string(21) "SELECT * FROM testing" } data: 1, php object(PDOStatement)#%d (1) { ["queryString"]=> - %string|unicode%(21) "SELECT * FROM testing" + string(21) "SELECT * FROM testing" } data: 2, array(2) { [0]=> - %string|unicode%(3) "PHP" + string(3) "PHP" [1]=> - %string|unicode%(0) "" + string(0) "" } Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: function 'nothing' not found or invalid function name in %s on line %d @@ -106,24 +106,24 @@ Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: class 'PDOSta bool(false) array(2) { [0]=> - %string|unicode%(9) "--- 1 ---" + string(9) "--- 1 ---" [1]=> - %string|unicode%(9) "--- 2 ---" + string(9) "--- 2 ---" } array(2) { [0]=> - %string|unicode%(7) "1---php" + string(7) "1---php" [1]=> - %string|unicode%(4) "2---" + string(4) "2---" } Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: cannot access private method bar::test2() in %s on line %d bool(false) array(2) { [0]=> - %string|unicode%(7) "1===php" + string(7) "1===php" [1]=> - %string|unicode%(4) "2===" + string(4) "2===" } Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: class 'bar' does not have a method 'inexistent' in %s on line %d diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt index 975dcd96bdf59..54eb06411f959 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt @@ -25,7 +25,7 @@ $db->query('DROP TABLE foobar'); --EXPECTF-- array(2) { ["testing(name)"]=> - %string|unicode%(2) "12" + string(2) "12" [0]=> - %string|unicode%(2) "12" + string(2) "12" } diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt index b675879980612..13867ae25c0a6 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt @@ -26,13 +26,13 @@ $db->query('DROP TABLE foobar'); --EXPECTF-- array(2) { ["testing(name)"]=> - %string|unicode%(3) "php" + string(3) "php" [0]=> - %string|unicode%(3) "php" + string(3) "php" } array(2) { ["testing(name)"]=> - %string|unicode%(4) "php6" + string(4) "php6" [0]=> - %string|unicode%(4) "php6" + string(4) "php6" } diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt index 2ff0acd772daa..bb4d033ddab4d 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt @@ -19,14 +19,14 @@ $db->query('DROP TABLE foo'); --EXPECTF-- object(PDOStatement)#2 (1) { ["queryString"]=> - %string|unicode%(17) "SELECT * FROM foo" + string(17) "SELECT * FROM foo" } array(3) { [0]=> - %string|unicode%(5) "00000" + string(5) "00000" [1]=> NULL [2]=> NULL } -%string|unicode%(1) "2" +string(1) "2" diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index 8564d4f17e263..e8ddb1f62a894 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -145,13 +145,13 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --EXPECTF-- -Warning: Phar::mungServer() expects parameter 1 to be array, %string given in %sbadparameters.php on line %d +Warning: Phar::mungServer() expects parameter 1 to be array, string given in %sbadparameters.php on line %d Warning: Phar::createDefaultStub() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d Warning: Phar::loadPhar() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d -Warning: Phar::canCompress() expects parameter 1 to be int, %string given in %sbadparameters.php on line %d +Warning: Phar::canCompress() expects parameter 1 to be int, string given in %sbadparameters.php on line %d Exception: Phar::__construct() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt index a59ddadd43e5a..57f3fc2dafcd6 100644 --- a/ext/phar/tests/bug46032.phpt +++ b/ext/phar/tests/bug46032.phpt @@ -24,8 +24,8 @@ new phardata('0000000000000000000'); ?> ===DONE=== --EXPECTF-- -%string|unicode%(%d) "%smytest" -%string|unicode%(%d) "%smytest" +string(%d) "%smytest" +string(%d) "%smytest" Fatal error: Uncaught UnexpectedValueException: Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist in %sbug46032.php:%d Stack trace: diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt index 158c049b147b0..6e13088512e24 100644 --- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt @@ -10,5 +10,5 @@ phar.readonly=0 files/write17.phar --EXPECTF-- NULL -%string|unicode%(2) "hi" +string(2) "hi" ok \ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt index 6e03554d96caf..4870550c4d096 100644 --- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt @@ -10,5 +10,5 @@ phar.readonly=0 files/write19.phar --EXPECTF-- string(2) "hi" -%string|unicode%(3) "hi2" +string(3) "hi2" ok \ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt index 2769b01f2fb57..82a8389ad5fe2 100644 --- a/ext/phar/tests/cache_list/frontcontroller22.phpt +++ b/ext/phar/tests/cache_list/frontcontroller22.phpt @@ -14,8 +14,8 @@ files/frontcontroller13.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -%string|unicode%(4) "test" -%string|unicode%(12) "oof/test.php" +string(4) "test" +string(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt index 215140a45a9a9..f200ce297ca96 100644 --- a/ext/reflection/tests/bug49719.phpt +++ b/ext/reflection/tests/bug49719.phpt @@ -40,5 +40,5 @@ var_dump($prop->getValue(new b2)); bool(false) bool(false) bool(false) -%string|unicode%(25) "Property a does not exist" +string(25) "Property a does not exist" int(2) diff --git a/ext/session/tests/rfc1867.phpt b/ext/session/tests/rfc1867.phpt index be021007d3aff..21a70c8a28c55 100644 --- a/ext/session/tests/rfc1867.phpt +++ b/ext/session/tests/rfc1867.phpt @@ -58,11 +58,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -71,11 +71,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_cleanup.phpt b/ext/session/tests/rfc1867_cleanup.phpt index d18a2d267d63e..63b4e4bc0d3ad 100644 --- a/ext/session/tests/rfc1867_cleanup.phpt +++ b/ext/session/tests/rfc1867_cleanup.phpt @@ -58,11 +58,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -71,11 +71,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_disabled.phpt b/ext/session/tests/rfc1867_disabled.phpt index 973cd5bd5fe7c..55707f69073e7 100644 --- a/ext/session/tests/rfc1867_disabled.phpt +++ b/ext/session/tests/rfc1867_disabled.phpt @@ -51,11 +51,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -64,11 +64,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_disabled_2.phpt b/ext/session/tests/rfc1867_disabled_2.phpt index bc4b0e6c4038a..10afe8f19db81 100644 --- a/ext/session/tests/rfc1867_disabled_2.phpt +++ b/ext/session/tests/rfc1867_disabled_2.phpt @@ -51,11 +51,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -64,11 +64,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_inter.phpt b/ext/session/tests/rfc1867_inter.phpt index 431300b6bbb87..577591feda289 100644 --- a/ext/session/tests/rfc1867_inter.phpt +++ b/ext/session/tests/rfc1867_inter.phpt @@ -61,11 +61,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -74,11 +74,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_no_name.phpt b/ext/session/tests/rfc1867_no_name.phpt index 949e7aaf4b302..e34f776f12fa0 100644 --- a/ext/session/tests/rfc1867_no_name.phpt +++ b/ext/session/tests/rfc1867_no_name.phpt @@ -51,11 +51,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -64,11 +64,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_cookie.phpt b/ext/session/tests/rfc1867_sid_cookie.phpt index 28ac2605a6aa0..6a58172f90842 100644 --- a/ext/session/tests/rfc1867_sid_cookie.phpt +++ b/ext/session/tests/rfc1867_sid_cookie.phpt @@ -57,11 +57,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -70,11 +70,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_get.phpt b/ext/session/tests/rfc1867_sid_get.phpt index 93600b4834f39..089eefe9673c9 100644 --- a/ext/session/tests/rfc1867_sid_get.phpt +++ b/ext/session/tests/rfc1867_sid_get.phpt @@ -55,11 +55,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -68,11 +68,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_get_2.phpt b/ext/session/tests/rfc1867_sid_get_2.phpt index bb418c7bbf5ce..7cb2ffb17a766 100644 --- a/ext/session/tests/rfc1867_sid_get_2.phpt +++ b/ext/session/tests/rfc1867_sid_get_2.phpt @@ -57,11 +57,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -70,11 +70,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_invalid.phpt b/ext/session/tests/rfc1867_sid_invalid.phpt index 86cff6c089034..881b1d5bb4aa2 100644 --- a/ext/session/tests/rfc1867_sid_invalid.phpt +++ b/ext/session/tests/rfc1867_sid_invalid.phpt @@ -65,11 +65,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -78,11 +78,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_only_cookie.phpt b/ext/session/tests/rfc1867_sid_only_cookie.phpt index 167432a60d035..f8f20fc3d89c4 100644 --- a/ext/session/tests/rfc1867_sid_only_cookie.phpt +++ b/ext/session/tests/rfc1867_sid_only_cookie.phpt @@ -57,11 +57,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -70,11 +70,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt index e56c31e682f8a..e98f4c4e3f797 100644 --- a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt +++ b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt @@ -54,11 +54,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -67,11 +67,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/session/tests/rfc1867_sid_post.phpt b/ext/session/tests/rfc1867_sid_post.phpt index 858101c3b78ba..51a97b900e0d6 100644 --- a/ext/session/tests/rfc1867_sid_post.phpt +++ b/ext/session/tests/rfc1867_sid_post.phpt @@ -53,11 +53,11 @@ array(2) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -66,11 +66,11 @@ array(2) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/ext/snmp/tests/snmp-object-errno-errstr.phpt b/ext/snmp/tests/snmp-object-errno-errstr.phpt index b6047af857f9b..8ea5fe2416a5d 100644 --- a/ext/snmp/tests/snmp-object-errno-errstr.phpt +++ b/ext/snmp/tests/snmp-object-errno-errstr.phpt @@ -100,21 +100,21 @@ var_dump($session->close()); ?> --EXPECTF-- SNMP::ERRNO_NOERROR -%string|unicode%(%d) "%s" +string(%d) "%s" bool(true) -%string|unicode%(0) "" +string(0) "" SNMP::ERRNO_TIMEOUT bool(false) bool(true) -%string|unicode%(%d) "No response from %s" +string(%d) "No response from %s" SNMP::ERRNO_ERROR_IN_REPLY bool(false) bool(true) -%string|unicode%(%d) "Error in packet %s" +string(%d) "Error in packet %s" SNMP::ERRNO_GENERIC bool(false) bool(true) -%string|unicode%(%d) "Fatal error: Unknown user name" +string(%d) "Fatal error: Unknown user name" bool(false) SNMP::ERRNO_OID_PARSING_ERROR GET: Single wrong OID diff --git a/ext/snmp/tests/snmp-object-properties.phpt b/ext/snmp/tests/snmp-object-properties.phpt index 40b69683df49e..9e6b0d5956a06 100644 --- a/ext/snmp/tests/snmp-object-properties.phpt +++ b/ext/snmp/tests/snmp-object-properties.phpt @@ -71,7 +71,7 @@ object(SNMP)#%d (%d) { ["info"]=> array(4) { ["hostname"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["port"]=> int(%d) ["timeout"]=> @@ -98,7 +98,7 @@ object(SNMP)#%d (%d) { ["info"]=> array(4) { ["hostname"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["port"]=> int(%d) ["timeout"]=> @@ -125,7 +125,7 @@ object(SNMP)#%d (%d) { ["info"]=> array(4) { ["hostname"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["port"]=> int(%d) ["timeout"]=> @@ -155,7 +155,7 @@ object(SNMP)#%d (%d) { ["info"]=> array(4) { ["hostname"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["port"]=> int(%d) ["timeout"]=> @@ -197,7 +197,7 @@ int(3) Warning: main(): info property is read-only in %s on line %d array(4) { ["hostname"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["port"]=> int(%d) ["timeout"]=> diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt index 49d205fc424e3..b863d0e079be4 100644 --- a/ext/snmp/tests/snmp3.phpt +++ b/ext/snmp/tests/snmp3.phpt @@ -76,50 +76,50 @@ var_dump((snmp3_get($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $p --EXPECTF-- Working version GET single: noAuthNoPriv -%string|unicode%(%d) "%s" +string(%d) "%s" GET single: MD5 -%string|unicode%(%d) "%s" +string(%d) "%s" GET single: SHA -%string|unicode%(%d) "%s" +string(%d) "%s" GET single: MD5/AES -%string|unicode%(%d) "%s" +string(%d) "%s" GET single: MD5/DES -%string|unicode%(%d) "%s" +string(%d) "%s" GET single: MD5/AES128 -%string|unicode%(%d) "%s" +string(%d) "%s" GET multiple array(2) { ["%s"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["%s"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" } GETNEXT single -%string|unicode%(%d) "%s" +string(%d) "%s" WALK single on single OID -%string|unicode%(5) "array" +string(5) "array" int(1) array(1) { [0]=> - %string|unicode%(%d) "%s" + string(%d) "%s" } REALWALK single on single OID -%string|unicode%(5) "array" +string(5) "array" int(1) array(1) { ["%s"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" } WALK multiple on single OID -%string|unicode%(5) "array" +string(5) "array" int(%d) int(0) -%string|unicode%(%d) "%s" +string(%d) "%s" REALWALK multiple on single OID -%string|unicode%(5) "array" +string(5) "array" int(%d) -%string|unicode%(%d) "%s" -%string|unicode%(%d) "%s" +string(%d) "%s" +string(%d) "%s" SET single OID bool(true) bool(true) diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt index e98c6d13b983c..f9a68304b886b 100644 --- a/ext/soap/tests/bug48557.phpt +++ b/ext/soap/tests/bug48557.phpt @@ -59,7 +59,7 @@ array(6) { [1]=> int(123) [-1000]=> - %string|unicode%(3) "123" + string(3) "123" [2]=> float(123.5) [-2000]=> diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt index 3e09df848798c..7d8aa7e621498 100644 --- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt +++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt @@ -18,8 +18,8 @@ object(SplDoublyLinkedList)#1 (2) { ["dllist":"SplDoublyLinkedList":private]=> array(2) { [0]=> - %string|unicode%(3) "hai" + string(3) "hai" [1]=> - %string|unicode%(4) "thar" + string(4) "thar" } } diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt index a3482b319b744..ac3cade344b82 100644 --- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt +++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt @@ -18,8 +18,8 @@ object(SplDoublyLinkedList)#1 (2) { ["dllist":"SplDoublyLinkedList":private]=> array(2) { [0]=> - %string|unicode%(2) "oh" + string(2) "oh" [1]=> - %string|unicode%(3) "hai" + string(3) "hai" } } diff --git a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt index 034d45731887d..a511c63ad8fec 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt @@ -16,7 +16,7 @@ object(SplFixedArray)#1 (4) { [1]=> int(1) [2]=> - %string|unicode%(1) "2" + string(1) "2" [3]=> bool(false) } diff --git a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt index ecae2ab762e1a..79f74cd5e7ff2 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt @@ -15,7 +15,7 @@ object(SplFixedArray)#1 (3) { [0]=> int(1) [1]=> - %string|unicode%(1) "2" + string(1) "2" [2]=> bool(false) } diff --git a/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt b/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt index 659f61c80d84a..b669563db4bb3 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt @@ -12,6 +12,6 @@ object(SplFixedArray)#1 (1) { [0]=> array(1) { [0]=> - %string|unicode%(1) "1" + string(1) "1" } } diff --git a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt index 21976b552ca99..f422eef26497a 100644 --- a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt +++ b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt @@ -21,13 +21,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) --EXPECTF-- object(SplFixedArray)#1 (5) { [0]=> - %string|unicode%(14) "PHPNW Testfest" + string(14) "PHPNW Testfest" [1]=> - %string|unicode%(14) "PHPNW Testfest" + string(14) "PHPNW Testfest" [2]=> - %string|unicode%(14) "PHPNW Testfest" + string(14) "PHPNW Testfest" [3]=> - %string|unicode%(14) "PHPNW Testfest" + string(14) "PHPNW Testfest" [4]=> NULL } diff --git a/ext/spl/tests/SplFixedArray_setsize_001.phpt b/ext/spl/tests/SplFixedArray_setsize_001.phpt index 925912ceba2c6..d9c1469ee2734 100644 --- a/ext/spl/tests/SplFixedArray_setsize_001.phpt +++ b/ext/spl/tests/SplFixedArray_setsize_001.phpt @@ -16,7 +16,7 @@ var_dump($array); --EXPECTF-- object(SplFixedArray)#1 (2) { [0]=> - %string|unicode%(3) "one" + string(3) "one" [1]=> - %string|unicode%(3) "two" + string(3) "two" } diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt index 87f4b91625914..e6dce35dfe841 100644 --- a/ext/sqlite3/tests/sqlite3_02_open.phpt +++ b/ext/sqlite3/tests/sqlite3_02_open.phpt @@ -16,4 +16,4 @@ try { ?> --EXPECTF-- -%string|unicode%(60) "SQLite3::__construct() expects at least 1 parameter, 0 given" +string(60) "SQLite3::__construct() expects at least 1 parameter, 0 given" diff --git a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt index 6ea000adcd2ca..da48a4f943be0 100644 --- a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt +++ b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt @@ -22,8 +22,8 @@ var_dump($db->querySingle('SELECT strtoupper("tEst")')); ?> --EXPECTF-- bool(true) -%string|unicode%(4) "TEST" +string(4) "TEST" bool(true) -%string|unicode%(4) "test" +string(4) "test" bool(true) -%string|unicode%(4) "test" +string(4) "test" diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt index 47a08f25faa4f..64db2a79248b9 100644 --- a/ext/sqlite3/tests/sqlite3_31_open.phpt +++ b/ext/sqlite3/tests/sqlite3_31_open.phpt @@ -19,4 +19,4 @@ try { --CLEAN-- --EXPECTF-- -%string|unicode%(29) "Already initialised DB Object" +string(29) "Already initialised DB Object" diff --git a/ext/standard/tests/network/gethostbyname_error006.phpt b/ext/standard/tests/network/gethostbyname_error006.phpt index dc509a1132171..8a199f6286c4c 100644 --- a/ext/standard/tests/network/gethostbyname_error006.phpt +++ b/ext/standard/tests/network/gethostbyname_error006.phpt @@ -7,4 +7,4 @@ gethostbyname() function - basic invalid parameter test var_dump(gethostbyname(".toto.toto.toto")); ?> --EXPECTF-- -%string|unicode%(15) ".toto.toto.toto" +string(15) ".toto.toto.toto" diff --git a/ext/standard/tests/strings/bug46578.phpt b/ext/standard/tests/strings/bug46578.phpt index ba9fbbe46045d..a5eff1dbe25a3 100644 --- a/ext/standard/tests/strings/bug46578.phpt +++ b/ext/standard/tests/strings/bug46578.phpt @@ -17,9 +17,9 @@ var_dump(strip_tags(' --EXPECTF-- -%string|unicode%(6) "foobar" -%string|unicode%(6) "foobar" -%string|unicode%(6) "foobar" -%string|unicode%(4) "< ax" -%string|unicode%(0) "" -%string|unicode%(0) "" +string(6) "foobar" +string(6) "foobar" +string(6) "foobar" +string(4) "< ax" +string(0) "" +string(0) "" diff --git a/ext/standard/tests/strings/bug47443.phpt b/ext/standard/tests/strings/bug47443.phpt index e30acd80bfe55..033aeb4d795bc 100644 --- a/ext/standard/tests/strings/bug47443.phpt +++ b/ext/standard/tests/strings/bug47443.phpt @@ -9,6 +9,6 @@ var_dump(metaphone("scratc")); ?> --EXPECTF-- -%string|unicode%(4) "SKRX" -%string|unicode%(4) "SKR0" -%string|unicode%(5) "SKRTK" +string(4) "SKRX" +string(4) "SKR0" +string(5) "SKRTK" diff --git a/ext/standard/tests/strings/bug47481.phpt b/ext/standard/tests/strings/bug47481.phpt index 4c59a7c377b18..6cad98ac91b32 100644 --- a/ext/standard/tests/strings/bug47481.phpt +++ b/ext/standard/tests/strings/bug47481.phpt @@ -25,33 +25,33 @@ echo "Done"; -- Before sorting: -- array(6) { [0]=> - %string|unicode%(6) "Süden" + string(6) "Süden" [1]=> - %string|unicode%(7) "spielen" + string(7) "spielen" [2]=> - %string|unicode%(5) "Sonne" + string(5) "Sonne" [3]=> - %string|unicode%(4) "Wind" + string(4) "Wind" [4]=> - %string|unicode%(5) "Regen" + string(5) "Regen" [5]=> - %string|unicode%(4) "Meer" + string(4) "Meer" } -- After Sorting: -- bool(true) array(6) { [5]=> - %string|unicode%(4) "Meer" + string(4) "Meer" [4]=> - %string|unicode%(5) "Regen" + string(5) "Regen" [2]=> - %string|unicode%(5) "Sonne" + string(5) "Sonne" [1]=> - %string|unicode%(7) "spielen" + string(7) "spielen" [0]=> - %string|unicode%(6) "Süden" + string(6) "Süden" [3]=> - %string|unicode%(4) "Wind" + string(4) "Wind" } Done diff --git a/ext/xsl/tests/xsltprocessor_getParameter.phpt b/ext/xsl/tests/xsltprocessor_getParameter.phpt index 2430bc88a4469..ec6378df269b5 100644 --- a/ext/xsl/tests/xsltprocessor_getParameter.phpt +++ b/ext/xsl/tests/xsltprocessor_getParameter.phpt @@ -13,7 +13,7 @@ $proc->importStylesheet($xsl); $proc->setParameter('', 'key', 'value'); var_dump($proc->getParameter('', 'key')); --EXPECTF-- -%string|unicode%(5) "value" +string(5) "value" --CREDITS-- Christian Weiske, cweiske@php.net PHP Testfest Berlin 2009-05-09 diff --git a/run-tests.php b/run-tests.php index c17a235c1bef4..cbef1dc367c02 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2077,27 +2077,7 @@ function run_test($php, $file, $env) $startOffset = $end + 2; } $wanted_re = $temp; - - $wanted_re = str_replace( - array('%binary_string_optional%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%unicode_string_optional%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%unicode\|string%', '%string\|unicode%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%u\|b%', '%b\|u%'), - '', - $wanted_re - ); + // Stick to basics $wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re); $wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re); diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt index 1612d554cf6b3..5650b5cd5db09 100644 --- a/tests/basic/rfc1867_anonymous_upload.phpt +++ b/tests/basic/rfc1867_anonymous_upload.phpt @@ -27,11 +27,11 @@ array(2) { [%d]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -40,11 +40,11 @@ array(2) { [%d]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(16) "text/plain-file2" + string(16) "text/plain-file2" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt index bb6ccee896445..77fe53ea58f86 100644 --- a/tests/basic/rfc1867_empty_upload.phpt +++ b/tests/basic/rfc1867_empty_upload.phpt @@ -42,11 +42,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -55,11 +55,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(0) "" + string(0) "" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(4) ["size"]=> @@ -68,11 +68,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt index 61fd89f3d2c47..89406a407fd37 100644 --- a/tests/basic/rfc1867_max_file_size.phpt +++ b/tests/basic/rfc1867_max_file_size.phpt @@ -42,11 +42,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -55,11 +55,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(2) ["size"]=> @@ -68,11 +68,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -81,7 +81,7 @@ array(3) { } array(1) { ["MAX_FILE_SIZE"]=> - %string|unicode%(1) "1" + string(1) "1" } string(1) "1" string(1) "3" diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index 9cc847f7804e9..bdfe977428529 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -20,11 +20,11 @@ array(1) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(3) ["size"]=> diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt index 89115d07037fd..58e05319a1369 100644 --- a/tests/basic/rfc1867_post_max_filesize.phpt +++ b/tests/basic/rfc1867_post_max_filesize.phpt @@ -38,11 +38,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -51,11 +51,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(1) ["size"]=> @@ -64,11 +64,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt index f4d2bbfee99fc..627e69ffc5de0 100644 --- a/tests/lang/engine_assignExecutionOrder_001.phpt +++ b/tests/lang/engine_assignExecutionOrder_001.phpt @@ -77,7 +77,7 @@ var_dump(C::$string); Order with local assignment: in f() in g() -%string|unicode%(14) "assigned value" +string(14) "assigned value" Order with array assignment: @@ -85,7 +85,7 @@ in f() in g() array(1) { ["name"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } @@ -94,7 +94,7 @@ in f() in g() object(stdClass)#%d (1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } @@ -107,7 +107,7 @@ object(stdClass)#%d (1) { ["o2"]=> object(stdClass)#%d (1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } } } @@ -120,7 +120,7 @@ object(stdClass)#%d (1) { ["a"]=> array(1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } } @@ -128,7 +128,7 @@ object(stdClass)#%d (1) { Order with static property assignment: in f() in g() -%string|unicode%(14) "assigned value" +string(14) "assigned value" Order with static array property assignment: @@ -136,17 +136,17 @@ in f() in g() array(1) { ["name"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } Order with indexed string assignment: in getOffset() in newChar() -%string|unicode%(5) "jello" +string(5) "jello" Order with static string property assignment: in getOffset() in newChar() -%string|unicode%(5) "jello" +string(5) "jello"