diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-03-30 17:23:03 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-03-31 13:02:32 +0200 |
| commit | 36935e42eac054a422b7edade69923db7727f268 (patch) | |
| tree | e8d08101f42f5e8ee60ed423833df08725130807 /ext | |
| parent | 6bf483a94abcac24a3f1fc09feed2c6fbf5d648f (diff) | |
| download | php-git-36935e42eac054a422b7edade69923db7727f268.tar.gz | |
Improve undefined variable error messages
Closes GH-5312
Diffstat (limited to 'ext')
61 files changed, 136 insertions, 136 deletions
diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index 8c166e1eca..13467e0e54 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -53,7 +53,7 @@ echo "Done\n"; Warning: ocifetchinto() expects at least 2 parameters, 1 given in %s on line %d NULL -Notice: Undefined variable: all in %s on line %d +Notice: Undefined variable $all in %s on line %d NULL Warning: ocifetchinto() expects at most 3 parameters, 4 given in %s on line %d diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c index 21c325bf5b..3bfce1a854 100644 --- a/ext/opcache/jit/zend_jit_helpers.c +++ b/ext/opcache/jit/zend_jit_helpers.c @@ -247,7 +247,7 @@ static void ZEND_FASTCALL zend_jit_undefined_op_helper(uint32_t var) const zend_execute_data *execute_data = EG(current_execute_data); zend_string *cv = EX(func)->op_array.vars[EX_VAR_TO_NUM(var)]; - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(cv)); } static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim, zval *result) diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index b7792d41e1..3029d911ba 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -3414,7 +3414,7 @@ static int zend_jit_inc_dec(dasm_State **Dst, const zend_op *opline, const zend_ | SAVE_VALID_OPLINE opline, r0 if (op1_info & MAY_BE_UNDEF) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >2 - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 | SET_ZVAL_TYPE_INFO op1_addr, IS_NULL @@ -4877,7 +4877,7 @@ static int zend_jit_simple_assign(dasm_State **Dst, |.cold_code |1: } - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); if (Z_REG(var_addr) != ZREG_FP) { | mov aword T1, Ra(Z_REG(var_addr)) // save } @@ -6632,7 +6632,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6647,7 +6647,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov aword T1, FCARG1a // save | mov FCARG1d, opline->op2.var @@ -6666,7 +6666,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6686,7 +6686,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op2.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -9718,7 +9718,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, cons | SAVE_VALID_OPLINE opline, r0 if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1 - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 |1: diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt index 7fab78bbe8..2fe17a857a 100644 --- a/ext/opcache/tests/block_pass_001.phpt +++ b/ext/opcache/tests/block_pass_001.phpt @@ -9,4 +9,4 @@ Block pass: Bugs in BOOL/QM_ASSIGN elision (bool) new stdClass; ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d diff --git a/ext/opcache/tests/bool_not_cv.phpt b/ext/opcache/tests/bool_not_cv.phpt index cc28edcc01..926dc58af9 100644 --- a/ext/opcache/tests/bool_not_cv.phpt +++ b/ext/opcache/tests/bool_not_cv.phpt @@ -26,9 +26,9 @@ undef_bool_cast(); --EXPECTF-- In undef_negation -Warning: Undefined variable: v in %s on line 4 +Warning: Undefined variable $v in %s on line 4 true In undef_bool_cast -Warning: Undefined variable: v in %s on line 10 +Warning: Undefined variable $v in %s on line 10 false diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt index b2a0508aa5..a94204d7b5 100644 --- a/ext/opcache/tests/bug73668.phpt +++ b/ext/opcache/tests/bug73668.phpt @@ -7,4 +7,4 @@ Bug #73668: "SIGFPE Arithmetic exception" in opcache when divide by minus 1 $a/-1; ?> --EXPECTF-- -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d diff --git a/ext/opcache/tests/bug76446.phpt b/ext/opcache/tests/bug76446.phpt index a2b02de032..41802747cd 100644 --- a/ext/opcache/tests/bug76446.phpt +++ b/ext/opcache/tests/bug76446.phpt @@ -18,5 +18,5 @@ function test() var_dump(test()); ?> --EXPECTF-- -Warning: Undefined variable: addlang in %s on line %d +Warning: Undefined variable $addlang in %s on line %d int(0) diff --git a/ext/opcache/tests/bug77058.phpt b/ext/opcache/tests/bug77058.phpt index 18d510bbde..0583b3b170 100644 --- a/ext/opcache/tests/bug77058.phpt +++ b/ext/opcache/tests/bug77058.phpt @@ -18,5 +18,5 @@ myfunc(); ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d '2' is expected to be 2 diff --git a/ext/opcache/tests/bug79412.phpt b/ext/opcache/tests/bug79412.phpt index 6c9232ff85..327da1fea2 100644 --- a/ext/opcache/tests/bug79412.phpt +++ b/ext/opcache/tests/bug79412.phpt @@ -20,6 +20,6 @@ foreach ($foo as $bar) { } ?> --EXPECTF-- -Warning: Undefined variable: foo in %s on line %d +Warning: Undefined variable $foo in %s on line %d Warning: foreach() argument must be of type array|object, null given in %s on line %d diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt index 8298c28b22..062b2f8950 100644 --- a/ext/opcache/tests/jit/assign_022.phpt +++ b/ext/opcache/tests/jit/assign_022.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_023.phpt b/ext/opcache/tests/jit/assign_023.phpt index e1211f5569..5007917c1f 100644 --- a/ext/opcache/tests/jit/assign_023.phpt +++ b/ext/opcache/tests/jit/assign_023.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_024.phpt b/ext/opcache/tests/jit/assign_024.phpt index f77296f84d..5bc63887ab 100644 --- a/ext/opcache/tests/jit/assign_024.phpt +++ b/ext/opcache/tests/jit/assign_024.phpt @@ -19,5 +19,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_025.phpt b/ext/opcache/tests/jit/assign_025.phpt index 9bafa43cb6..79000baf0e 100644 --- a/ext/opcache/tests/jit/assign_025.phpt +++ b/ext/opcache/tests/jit/assign_025.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: ref in %s on line %d +Warning: Undefined variable $ref in %s on line %d ok diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt index 39b9fd33ff..c5772220cb 100644 --- a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt +++ b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt @@ -16,7 +16,7 @@ function foo() { } var_dump(foo()); --EXPECTF-- -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d Notice: Undefined offset: 0 in %sfetch_dim_rw_001.php on line 3 diff --git a/ext/opcache/tests/jit/type_check_001.phpt b/ext/opcache/tests/jit/type_check_001.phpt index 6573f0ebdc..5b5afc870b 100644 --- a/ext/opcache/tests/jit/type_check_001.phpt +++ b/ext/opcache/tests/jit/type_check_001.phpt @@ -22,4 +22,4 @@ try { } ?> --EXPECT-- -Exception: Undefined variable: a +Exception: Undefined variable $a diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt index 434897bf80..546275dcde 100644 --- a/ext/opcache/tests/jmpz_jmp_elim.phpt +++ b/ext/opcache/tests/jmpz_jmp_elim.phpt @@ -14,5 +14,5 @@ echo "done\n"; ?> --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d done diff --git a/ext/opcache/tests/wrong_inlining_003.phpt b/ext/opcache/tests/wrong_inlining_003.phpt index c83a4efc36..12082e70e4 100644 --- a/ext/opcache/tests/wrong_inlining_003.phpt +++ b/ext/opcache/tests/wrong_inlining_003.phpt @@ -19,5 +19,5 @@ function test() { test(); ?> --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d int(42) diff --git a/ext/pdo_sqlite/tests/bug43831.phpt b/ext/pdo_sqlite/tests/bug43831.phpt index 1909d88033..bcb09c95a7 100644 --- a/ext/pdo_sqlite/tests/bug43831.phpt +++ b/ext/pdo_sqlite/tests/bug43831.phpt @@ -49,5 +49,5 @@ object(PDO)#%d (0) { object(MyPDO)#%d (0) { } -Warning: Undefined variable: bar in %s on line %d +Warning: Undefined variable $bar in %s on line %d NULL diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt index 8396eeb97c..16a422caa4 100644 --- a/ext/reflection/tests/ReflectionParameter_003.phpt +++ b/ext/reflection/tests/ReflectionParameter_003.phpt @@ -56,7 +56,7 @@ foreach($refParameters as $parameter) { hello from test third is jack -Warning: Undefined variable: theIncrement in %s on line %d +Warning: Undefined variable $theIncrement in %s on line %d parameter names from staticMethod method: object(ReflectionParameter)#%d (1) { diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt index b926de323e..1c89fac0bb 100644 --- a/ext/session/tests/session_decode_variation3.phpt +++ b/ext/session/tests/session_decode_variation3.phpt @@ -37,7 +37,7 @@ ob_end_flush(); Warning: session_start(): Cannot find serialization handler 'blah' - session startup failed in %s on line %d bool(false) -Warning: Undefined variable: _SESSION in %s on line %d +Warning: Undefined variable $_SESSION in %s on line %d NULL array(3) { ["foo"]=> diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index f81207d2a7..854c9fb8e1 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -52,7 +52,7 @@ Open Warning: session_start(): Failed to initialize storage module: user (path: ) in %s on line %d SessionHandler::open() expects exactly 2 parameters, 0 given -Warning: Undefined variable: _SESSION in %s on line %d +Warning: Undefined variable $_SESSION in %s on line %d string(0) "" string(5) "files" string(4) "user" diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt index c050ca2dd4..b389bcfc58 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt @@ -11,7 +11,7 @@ $xml = simplexml_load_string("XXXXXXX^",$x,0x6000000000000001); var_dump($xml); ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d Warning: simplexml_load_string(): Invalid options in %s on line %d bool(false) diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt index 1dc93ceaa9..d05a635500 100644 --- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt +++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt @@ -83,7 +83,7 @@ array(2) { --> exchangeArray() with no arg: Exception: ArrayObject::exchangeArray() expects exactly 1 parameter, 0 given -Warning: Undefined variable: copy in %s on line %d +Warning: Undefined variable $copy in %s on line %d object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> object(C)#3 (2) { @@ -105,7 +105,7 @@ NULL --> exchangeArray() with bad arg type: Exception:Passed variable is not an array or object -Warning: Undefined variable: copy in %s on line %d +Warning: Undefined variable $copy in %s on line %d object(ArrayObject)#3 (1) { ["storage":"ArrayObject":private]=> object(C)#2 (2) { diff --git a/ext/spl/tests/array_026.phpt b/ext/spl/tests/array_026.phpt index 7a1784e30e..268b39d5e8 100644 --- a/ext/spl/tests/array_026.phpt +++ b/ext/spl/tests/array_026.phpt @@ -8,7 +8,7 @@ $test['d1']['d3'] = 'world'; var_dump($test, $test3['mmmmm']); ?> --EXPECTF-- -Warning: Undefined variable: test3 in %s on line %d +Warning: Undefined variable $test3 in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d object(ArrayObject)#1 (1) { diff --git a/ext/spl/tests/bug62978.phpt b/ext/spl/tests/bug62978.phpt index 7e61d27b89..01ce807031 100644 --- a/ext/spl/tests/bug62978.phpt +++ b/ext/spl/tests/bug62978.phpt @@ -31,7 +31,7 @@ NULL Notice: Undefined index: epic_magic in %sbug62978.php on line %d NULL -Warning: Undefined variable: c in %s on line %d +Warning: Undefined variable $c in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d NULL diff --git a/ext/spl/tests/bug72888.phpt b/ext/spl/tests/bug72888.phpt index 5e1aa2344b..5ca99a40a5 100644 --- a/ext/spl/tests/bug72888.phpt +++ b/ext/spl/tests/bug72888.phpt @@ -14,5 +14,5 @@ var_dump($y); --EXPECTF-- string(60) "Trying to clone an uncloneable object of class SplFileObject" -Warning: Undefined variable: y in %s on line %d +Warning: Undefined variable $y in %s on line %d NULL diff --git a/ext/standard/array.c b/ext/standard/array.c index 6178be61f2..17c7f29d9a 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2484,7 +2484,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu zend_hash_update(Z_ARRVAL_P(return_value), Z_STR_P(entry), &data); } } else { - php_error_docref(NULL, E_NOTICE, "Undefined variable: %s", ZSTR_VAL(Z_STR_P(entry))); + php_error_docref(NULL, E_NOTICE, "Undefined variable $%s", ZSTR_VAL(Z_STR_P(entry))); } } else if (Z_TYPE_P(entry) == IS_ARRAY) { if (Z_REFCOUNTED_P(entry)) { diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 9edc4e4a9c..d40e600c7e 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -83,7 +83,7 @@ array(1) { -- Testing array_fill_keys() function with unset var -- -Warning: Undefined variable: unset_var in %s on line %d +Warning: Undefined variable $unset_var in %s on line %d array(1) { ["one"]=> NULL diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index e0309bac1f..05546f3d1d 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -7,7 +7,7 @@ var_dump(array($a)); echo "Done\n"; ?> --EXPECTF-- -Warning: Undefined variable: undefined in %s on line %d +Warning: Undefined variable $undefined in %s on line %d array(1) { [0]=> NULL diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt index d4f5210760..02d74875d3 100644 --- a/ext/standard/tests/array/bug31158.phpt +++ b/ext/standard/tests/array/bug31158.phpt @@ -14,7 +14,7 @@ __(); echo "ok\n"; ?> --EXPECTF-- -Warning: Undefined variable: GLOBALS in %s on line %d +Warning: Undefined variable $GLOBALS in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d ok diff --git a/ext/standard/tests/array/bug69198.phpt b/ext/standard/tests/array/bug69198.phpt index 3441bee5d7..1231c44c93 100644 --- a/ext/standard/tests/array/bug69198.phpt +++ b/ext/standard/tests/array/bug69198.phpt @@ -9,7 +9,7 @@ $result = compact('willNeverBeDefined'); var_dump($result, empty($result), $result === array(), empty($willNeverBeDefined)); ?> --EXPECTF-- -Notice: compact(): Undefined variable: willNeverBeDefined in %s on line %d +Notice: compact(): Undefined variable $willNeverBeDefined in %s on line %d array(0) { } bool(true) diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt index d18f3d83e9..8c3ee9a160 100644 --- a/ext/standard/tests/array/compact.phpt +++ b/ext/standard/tests/array/compact.phpt @@ -13,7 +13,7 @@ $result = compact("event", $location_vars); var_dump($result); ?> --EXPECTF-- -Notice: compact(): Undefined variable: c\u0327ity in %s on line %d +Notice: compact(): Undefined variable $c\u0327ity in %s on line %d array(2) { ["event"]=> string(8) "SIGGRAPH" diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt index c71215fe1b..adeae03a7b 100644 --- a/ext/standard/tests/array/compact_basic.phpt +++ b/ext/standard/tests/array/compact_basic.phpt @@ -81,7 +81,7 @@ array(0) { array(0) { } -Notice: compact(): Undefined variable: g in %s on line %d +Notice: compact(): Undefined variable $g in %s on line %d array(0) { } Done diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt index fb186ae002..7ee9c7d0d2 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -25,7 +25,7 @@ f(); --EXPECTF-- *** Testing compact() : usage variations - variables outside of current scope *** -Notice: compact(): Undefined variable: a in %s on line %d +Notice: compact(): Undefined variable $a in %s on line %d array(2) { ["b"]=> string(3) "f.b" @@ -33,7 +33,7 @@ array(2) { string(3) "f.c" } -Notice: compact(): Undefined variable: a in %s on line %d +Notice: compact(): Undefined variable $a in %s on line %d array(2) { ["b"]=> string(3) "f.b" diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 2fc98396b1..bae4a470f2 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -89,380 +89,380 @@ echo "Done"; --- Testing sizeof() for all kinds of unset variables in default, Normal and Recursive Modes --- -- Iteration 1 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 2 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 3 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 4 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 5 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 6 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 7 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 8 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 9 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 10 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 11 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 12 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 13 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 14 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 15 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 16 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 17 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 18 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 19 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 20 -- Default Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Warning: Undefined variable: value in %s on line %d +Warning: Undefined variable $value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index e44a3d1fd9..5c2df9785b 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -83,8 +83,8 @@ echo "Done"; ?> --EXPECT-- *** Testing get_class_methods() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var Arg value 0 NULL diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt index 985a468680..a4f20cd807 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -80,9 +80,9 @@ echo "Done"; --EXPECTF-- *** Testing get_class() : usage variations *** -Warning: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable $undefined_var in %s on line %d -Warning: Undefined variable: unset_var in %s on line %d +Warning: Undefined variable $unset_var in %s on line %d Arg value: 0 (type: integer) get_class(): Argument #1 ($object) must be of type object, int given diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index d564ad3cd0..c2b9694746 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -85,8 +85,8 @@ echo "Done"; ?> --EXPECT-- *** Testing get_parent_class() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var Arg value 0 bool(false) diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index e9dfe0db6d..406d09c1f2 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -77,9 +77,9 @@ echo "Done"; --EXPECTF-- *** Testing is_a() : usage variations *** -Warning: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable $undefined_var in %s on line %d -Warning: Undefined variable: unset_var in %s on line %d +Warning: Undefined variable $unset_var in %s on line %d Arg value 0 bool(false) diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index 37743f393e..40af5d4468 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -86,8 +86,8 @@ echo "Done"; ?> --EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var Arg value 0 bool(false) diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt index c9409dcac8..eeec54af0d 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt @@ -86,8 +86,8 @@ echo "Done"; ?> --EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var Arg value 0 bool(false) diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index 0f2293cf7b..3ad49456c6 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -85,8 +85,8 @@ echo "Done"; ?> --EXPECT-- *** Testing method_exists() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var Arg value 0 bool(false) diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 9e4f07f0b5..d60ade5716 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -67,7 +67,7 @@ unlink($filename); fscanf(): supplied resource is not a valid File-Handle resource Different numbers of variable names and field specifiers -Warning: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable $undefined_var in %s on line %d array(0) { } Bad scan conversion character " diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index 799a264e34..f6a13e6534 100644 --- a/ext/standard/tests/file/pathinfo_variaton.phpt +++ b/ext/standard/tests/file/pathinfo_variaton.phpt @@ -90,7 +90,7 @@ echo "Done\n"; --EXPECTF-- *** Testing pathinfo() with miscellaneous input arguments *** -Warning: Undefined variable: fp in %s on line %d +Warning: Undefined variable $fp in %s on line %d -- Iteration 1 -- array(3) { ["dirname"]=> diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt index 4f5697a0d4..ff7bf9f056 100644 --- a/ext/standard/tests/general_functions/bug32647.phpt +++ b/ext/standard/tests/general_functions/bug32647.phpt @@ -30,11 +30,11 @@ register_shutdown_function(array($obj,'barfoo')); // Valid ?> --EXPECTF-- -Warning: Undefined variable: obj in %s on line %d +Warning: Undefined variable $obj in %s on line %d Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d -Warning: Undefined variable: obj in %s on line %d +Warning: Undefined variable $obj in %s on line %d Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d diff --git a/ext/standard/tests/general_functions/bug60723.phpt b/ext/standard/tests/general_functions/bug60723.phpt index 93381d246c..fff1b78790 100644 --- a/ext/standard/tests/general_functions/bug60723.phpt +++ b/ext/standard/tests/general_functions/bug60723.phpt @@ -14,6 +14,6 @@ readfile($log); unlink($log); ?> --EXPECTF-- -Warning: Undefined variable: aa in %s on line %d -[%s ASIA/Chongqing] PHP Warning: Undefined variable: aa in %s on line %d +Warning: Undefined variable $aa in %s on line %d +[%s ASIA/Chongqing] PHP Warning: Undefined variable $aa in %s on line %d [%s ASIA/Chongqing] dummy diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index 1b0a919e03..b893d80246 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -147,7 +147,7 @@ int(10) -- Value of $ref_first_var -- -Warning: Undefined variable: ref_first_var in %s on line %d +Warning: Undefined variable $ref_first_var in %s on line %d NULL -- Value of $first_var -- @@ -166,7 +166,7 @@ int(10) -- Value of $var_3: (after unsetting var_3) -- -Warning: Undefined variable: var_3 in %s on line %d +Warning: Undefined variable $var_3 in %s on line %d NULL -- Value of $var_2: -- @@ -177,7 +177,7 @@ int(10) -- Value of $var_1: (after unsetting variable_1) -- -Warning: Undefined variable: var_1 in %s on line %d +Warning: Undefined variable $var_1 in %s on line %d NULL -- Value of $var_2: -- diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt index 2cfd17793a..88a59d949a 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -22,7 +22,7 @@ array(4) { ["type"]=> int(2) ["message"]=> - string(21) "Undefined variable: b" + string(21) "Undefined variable $b" ["file"]=> string(%d) "%s" ["line"]=> diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index a4cae412b5..9bdefc334b 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -22,12 +22,12 @@ NULL error_get_last() expects exactly 0 parameters, 1 given NULL -Warning: Undefined variable: b in %s on line %d +Warning: Undefined variable $b in %s on line %d array(4) { ["type"]=> int(2) ["message"]=> - string(21) "Undefined variable: b" + string(21) "Undefined variable $b" ["file"]=> string(%d) "%s" ["line"]=> diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 7799303c62..50cc3c0561 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -80,8 +80,8 @@ foreach($values as $key => $value) { ?> --EXPECT-- *** Testing getimagesize() : usage variations *** -Error: 2 - Undefined variable: undefined_var -Error: 2 - Undefined variable: unset_var +Error: 2 - Undefined variable $undefined_var +Error: 2 - Undefined variable $unset_var -- Arg value 0 -- string(28) "4a46494600010201006000600000" diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt Binary files differindex fd71292e89..369087b3ce 100644 --- a/ext/standard/tests/serialize/serialization_objects_002.phpt +++ b/ext/standard/tests/serialize/serialization_objects_002.phpt diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index bc219c43e9..44ab68d1ed 100644 --- a/ext/standard/tests/strings/crc32_variation3.phpt +++ b/ext/standard/tests/strings/crc32_variation3.phpt @@ -77,9 +77,9 @@ echo "Done"; --EXPECTF-- *** Testing crc32() : with different strings in double quotes *** -Warning: Undefined variable: hello in %s on line %d +Warning: Undefined variable $hello in %s on line %d -Warning: Undefined variable: world in %s on line %d +Warning: Undefined variable $world in %s on line %d -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt Binary files differindex 5f754d7b2b..359d210e74 100644 --- a/ext/standard/tests/strings/lcfirst.phpt +++ b/ext/standard/tests/strings/lcfirst.phpt diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 2245ca422c..fba241924f 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -223,7 +223,7 @@ int(0) string(5) "FOUND" string(5) "FOUND" -Warning: Undefined variable: strS in %s on line %d +Warning: Undefined variable $strS in %s on line %d string(0) "" string(5) "FOUND" string(5) "FOUND" diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt index ad00c1480f..c4f8ecf40a 100644 --- a/ext/standard/tests/strings/str_word_count1.phpt +++ b/ext/standard/tests/strings/str_word_count1.phpt @@ -23,8 +23,8 @@ var_dump($a); int(0) str_word_count(): Argument #2 ($format) must be a valid format value -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d str_word_count(): Argument #2 ($format) must be a valid format value -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d NULL diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt Binary files differindex 4258f11ee3..95a25bd699 100644 --- a/ext/standard/tests/strings/strcasecmp.phpt +++ b/ext/standard/tests/strings/strcasecmp.phpt diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt Binary files differindex d4110601af..824d7ed101 100644 --- a/ext/standard/tests/strings/strcmp.phpt +++ b/ext/standard/tests/strings/strcmp.phpt diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt Binary files differindex 282db2da2d..468dd9acfe 100644 --- a/ext/standard/tests/strings/strlen.phpt +++ b/ext/standard/tests/strings/strlen.phpt diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex 7617536346..2d44cd9212 100644 --- a/ext/standard/tests/strings/strpos.phpt +++ b/ext/standard/tests/strings/strpos.phpt diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex 796a3476e9..46f411f876 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt Binary files differindex 48fd772a04..a54b984b88 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt |