From a1815304b6a949a69f33dd92d8d7d65f84089cdb Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 27 Dec 2004 13:04:02 +0000 Subject: [PATCH] "Undefined variable: %s" noticies were fixed to use one space --- Zend/tests/bug22836.phpt | 18 +++++++++--------- Zend/zend_execute.c | 4 ++-- tests/classes/static_this.phpt | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt index 1edcaa5c17..ceaf6414b6 100644 --- a/Zend/tests/bug22836.phpt +++ b/Zend/tests/bug22836.phpt @@ -19,55 +19,55 @@ for ($i = 0; $i < 8; $i++) { string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d string(3) "foo" 'foo' -Notice: Undefined variable: a in %s on line %d +Notice: Undefined variable: a in %s on line %d Strict Standards: Only variable references should be returned by reference in %s on line %d diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 5328ec18ab..bbed710fce 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -763,13 +763,13 @@ static void zend_fetch_var_address(zend_op *opline, temp_variable *Ts, int type if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &retval) == FAILURE) { switch (type) { case BP_VAR_R: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_IS: retval = &EG(uninitialized_zval_ptr); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); /* break missing intentionally */ case BP_VAR_W: { zval *new_zval = &EG(uninitialized_zval); diff --git a/tests/classes/static_this.phpt b/tests/classes/static_this.phpt index 3b1bb3e604..12f4b6389b 100755 --- a/tests/classes/static_this.phpt +++ b/tests/classes/static_this.phpt @@ -29,10 +29,10 @@ TestClass::Test2(new stdClass); ===DONE=== --EXPECTF-- -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL -Notice: Undefined variable: this in %sstatic_this.php on line %d +Notice: Undefined variable: this in %sstatic_this.php on line %d NULL object(stdClass)#%d (0) { } -- 2.40.0