summaryrefslogtreecommitdiff
path: root/ext/opcache
diff options
context:
space:
mode:
Diffstat (limited to 'ext/opcache')
-rw-r--r--ext/opcache/jit/zend_jit_helpers.c20
-rw-r--r--ext/opcache/jit/zend_jit_x86.dasc18
-rw-r--r--ext/opcache/tests/block_pass_001.phpt2
-rw-r--r--ext/opcache/tests/bug73668.phpt2
-rw-r--r--ext/opcache/tests/bug76446.phpt2
-rw-r--r--ext/opcache/tests/bug77058.phpt2
-rw-r--r--ext/opcache/tests/bug78015.phpt2
-rw-r--r--ext/opcache/tests/jit/assign_022.phpt2
-rw-r--r--ext/opcache/tests/jit/assign_023.phpt2
-rw-r--r--ext/opcache/tests/jit/assign_024.phpt2
-rw-r--r--ext/opcache/tests/jit/assign_025.phpt2
-rw-r--r--ext/opcache/tests/jit/fetch_dim_r_003.phpt8
-rw-r--r--ext/opcache/tests/jit/fetch_dim_r_004.phpt8
-rw-r--r--ext/opcache/tests/jit/fetch_dim_rw_001.phpt2
-rw-r--r--ext/opcache/tests/jit/fetch_obj_002.phpt2
-rw-r--r--ext/opcache/tests/jit/fetch_obj_003.phpt4
-rw-r--r--ext/opcache/tests/jmpz_jmp_elim.phpt2
-rw-r--r--ext/opcache/tests/wrong_inlining_003.phpt2
18 files changed, 42 insertions, 42 deletions
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
index c626a14ad8..206066930d 100644
--- a/ext/opcache/jit/zend_jit_helpers.c
+++ b/ext/opcache/jit/zend_jit_helpers.c
@@ -220,7 +220,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_NOTICE, "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)
@@ -250,7 +250,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim,
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
hval = Z_RES_HANDLE_P(dim);
goto num_index;
case IS_FALSE:
@@ -322,7 +322,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
hval = Z_RES_HANDLE_P(dim);
goto num_index;
case IS_FALSE:
@@ -391,7 +391,7 @@ static int ZEND_FASTCALL zend_jit_fetch_dim_isset_helper(zend_array *ht, zval *d
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- //zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ //zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
hval = Z_RES_HANDLE_P(dim);
goto num_index;
case IS_FALSE:
@@ -458,7 +458,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
hval = Z_RES_HANDLE_P(dim);
goto num_index;
case IS_FALSE:
@@ -526,7 +526,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim
hval = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
case IS_RESOURCE:
- zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
+ zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim));
hval = Z_RES_HANDLE_P(dim);
goto num_index;
case IS_FALSE:
@@ -584,7 +584,7 @@ try_string_offset:
case IS_NULL:
case IS_FALSE:
case IS_TRUE:
- zend_error(E_NOTICE, "String offset cast occurred");
+ zend_error(E_WARNING, "String offset cast occurred");
break;
case IS_REFERENCE:
dim = Z_REFVAL_P(dim);
@@ -600,7 +600,7 @@ try_string_offset:
}
if (UNEXPECTED(Z_STRLEN_P(container) < (size_t)((offset < 0) ? -offset : (offset + 1)))) {
- zend_error(E_NOTICE, "Uninitialized string offset: " ZEND_LONG_FMT, offset);
+ zend_error(E_WARNING, "Uninitialized string offset: " ZEND_LONG_FMT, offset);
ZVAL_EMPTY_STRING(result);
} else {
zend_uchar c;
@@ -731,7 +731,7 @@ try_again:
case IS_NULL:
case IS_FALSE:
case IS_TRUE:
- zend_error(E_NOTICE, "String offset cast occurred");
+ zend_error(E_WARNING, "String offset cast occurred");
break;
case IS_REFERENCE:
dim = Z_REFVAL_P(dim);
@@ -1424,5 +1424,5 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
{
const char *type = Z_ISUNDEF_P(container) ? "null" : zend_zval_type_name(container);
- zend_error(E_NOTICE, "Trying to access array offset on value of type %s", type);
+ zend_error(E_WARNING, "Trying to access array offset on value of type %s", type);
}
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 5bda3f5980..ba3d4b36fe 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -2879,7 +2879,7 @@ static int zend_jit_inc_dec(dasm_State **Dst, const zend_op *opline, zend_op_arr
| SAVE_VALID_OPLINE opline
if (op1_info & MAY_BE_UNDEF) {
| IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >2
- | // zend_error(E_NOTICE, "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
@@ -4373,7 +4373,7 @@ static int zend_jit_simple_assign(dasm_State **Dst,
|.cold_code
|1:
}
- | // zend_error(E_NOTICE, "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
}
@@ -6014,7 +6014,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in
| IF_Z_TYPE FCARG1a, IS_UNDEF, >1
|.cold_code
|1:
- | // zend_error(E_NOTICE, "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
| mov FCARG1d, opline->op1.var
| EXT_CALL zend_jit_undefined_op_helper, r0
@@ -6029,7 +6029,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in
| IF_Z_TYPE FCARG2a, IS_UNDEF, >1
|.cold_code
|1:
- | // zend_error(E_NOTICE, "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
| mov aword T1, FCARG1a // save
| mov FCARG1d, opline->op2.var
@@ -6048,7 +6048,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in
| IF_Z_TYPE FCARG1a, IS_UNDEF, >1
|.cold_code
|1:
- | // zend_error(E_NOTICE, "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
| mov FCARG1d, opline->op1.var
| EXT_CALL zend_jit_undefined_op_helper, r0
@@ -6068,7 +6068,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in
| IF_Z_TYPE FCARG2a, IS_UNDEF, >1
|.cold_code
|1:
- | // zend_error(E_NOTICE, "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
| mov FCARG1d, opline->op2.var
| EXT_CALL zend_jit_undefined_op_helper, r0
@@ -8535,7 +8535,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, zend
| SAVE_VALID_OPLINE opline
if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) {
| IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1
- | // zend_error(E_NOTICE, "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:
@@ -9414,7 +9414,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar
|1:
}
|.if X64
- | mov CARG1, E_NOTICE
+ | mov CARG1, E_WARNING
| LOAD_ADDR CARG2, "Trying to get property '%s' of non-object"
| LOAD_ADDR CARG3, Z_STRVAL_P(member)
| EXT_CALL zend_error, r0
@@ -9422,7 +9422,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar
| sub r4, 4
| push Z_STRVAL_P(member)
| push "Trying to get property '%s' of non-object"
- | push E_NOTICE
+ | push E_WARNING
| EXT_CALL zend_error, r0
| add r4, 16
|.endif
diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt
index c024b81ce8..7fab78bbe8 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--
-Notice: Undefined variable: x in %s on line %d
+Warning: Undefined variable: x in %s on line %d
diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt
index 379ba4a5ac..b2a0508aa5 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--
-Notice: 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 dfb676f4ba..98b1d3dc56 100644
--- a/ext/opcache/tests/bug76446.phpt
+++ b/ext/opcache/tests/bug76446.phpt
@@ -18,5 +18,5 @@ function test()
var_dump(test());
?>
--EXPECTF--
-Notice: Undefined variable: addlang in %sbug76446.php 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 a1962b7ade..22a36d1e3d 100644
--- a/ext/opcache/tests/bug77058.phpt
+++ b/ext/opcache/tests/bug77058.phpt
@@ -18,5 +18,5 @@ myfunc();
?>
--EXPECTF--
-Notice: 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/bug78015.phpt b/ext/opcache/tests/bug78015.phpt
index 0a03c9834f..aa4ba4db4b 100644
--- a/ext/opcache/tests/bug78015.phpt
+++ b/ext/opcache/tests/bug78015.phpt
@@ -103,7 +103,7 @@ array(1) {
}
bool(true)
-Notice: Array to string conversion in %s on line %d
+Warning: Array to string conversion in %s on line %d
string(11) "Arrayfoobar"
int(2)
array(2) {
diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt
index f054a6a4d7..ebe153f140 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--
-Notice: 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 3e18b19324..ebe5ff288f 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--
-Notice: 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 b0fc372139..4f48a3e75c 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--
-Notice: 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 402c923a5f..36b76dba09 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--
-Notice: 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_r_003.phpt b/ext/opcache/tests/jit/fetch_dim_r_003.phpt
index 0c213802ce..2e82cb926c 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_003.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_003.phpt
@@ -34,18 +34,18 @@ foo();
string(1) "A"
string(1) "C"
-Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 6
+Warning: String offset cast occurred in %s on line %d
string(1) "B"
string(1) "A"
string(1) "C"
-Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 9
+Warning: String offset cast occurred in %s on line %d
string(1) "A"
-Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 10
+Warning: String offset cast occurred in %s on line %d
string(1) "B"
-Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 11
+Warning: String offset cast occurred in %s on line %d
string(1) "A"
Warning: Illegal string offset 'ab' in %sfetch_dim_r_003.php on line 12
diff --git a/ext/opcache/tests/jit/fetch_dim_r_004.phpt b/ext/opcache/tests/jit/fetch_dim_r_004.phpt
index 6f3c730a8d..66a88977d9 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_004.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_004.phpt
@@ -34,18 +34,18 @@ foo($x.$y);
string(1) "A"
string(1) "C"
-Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4
+Warning: String offset cast occurred in %s on line %d
string(1) "B"
string(1) "A"
string(1) "C"
-Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4
+Warning: String offset cast occurred in %s on line %d
string(1) "A"
-Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4
+Warning: String offset cast occurred in %s on line %d
string(1) "B"
-Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4
+Warning: String offset cast occurred in %s on line %d
string(1) "A"
Warning: Illegal string offset 'ab' in %sfetch_dim_r_004.php on line 4
diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt
index 9e883aaf75..a828e0a5ea 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--
-Notice: Undefined variable: a in %sfetch_dim_rw_001.php on line 3
+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/fetch_obj_002.phpt b/ext/opcache/tests/jit/fetch_obj_002.phpt
index 95ad920ea8..463ff01b26 100644
--- a/ext/opcache/tests/jit/fetch_obj_002.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_002.phpt
@@ -35,7 +35,7 @@ bar();
--EXPECTF--
int(2)
-Notice: Undefined property: A::$y in %sfetch_obj_002.php on line 16
+Warning: Undefined property: A::$y in %s on line %d
NULL
int(3)
string(5) "__get"
diff --git a/ext/opcache/tests/jit/fetch_obj_003.phpt b/ext/opcache/tests/jit/fetch_obj_003.phpt
index 3f7f0beaf3..9232ccd64b 100644
--- a/ext/opcache/tests/jit/fetch_obj_003.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_003.phpt
@@ -31,13 +31,13 @@ foo();
bar();
?>
--EXPECTF--
-Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 9
+Warning: Undefined property: C::$a in %s on line %d
object(C)#1 (1) {
["a"]=>
int(2)
}
-Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 17
+Warning: Undefined property: C::$a in %s on line %d
object(C)#1 (2) {
["a"]=>
int(2)
diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt
index 8a343512dd..434897bf80 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--
-Notice: 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 a7e4a11b76..c83a4efc36 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--
-Notice: Undefined variable: undef in %swrong_inlining_003.php on line 7
+Warning: Undefined variable: undef in %s on line %d
int(42)
View Lorry Controller Status