Skip to content

Commit 1c30c5e

Browse files
iluuu1994iluuu1994
committed
Print location on class redeclaration
Fixes GH-13950 Closes GH-13999
1 parent d52605d commit 1c30c5e

30 files changed

+67
-43
lines changed

‎Zend/tests/class_alias_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class_alias('foo', 'FOO');
99

1010
?>
1111
--EXPECTF--
12-
Warning: Cannot declare class FOO, because the name is already in use in %s on line %d
12+
Warning: Cannot redeclare class FOO (previously declared in %s:%d) in %s on line %d

‎Zend/tests/class_alias_004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ class_alias('foo', 'test');
1212

1313
?>
1414
--EXPECTF--
15-
Warning: Cannot declare class test, because the name is already in use in %s on line %d
15+
Warning: Cannot redeclare class test (previously declared in %s:%d) in %s on line %d

‎Zend/tests/class_alias_010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ class b { }
1111

1212
?>
1313
--EXPECTF--
14-
Warning: Cannot declare interface b, because the name is already in use in %s on line %d
14+
Warning: Cannot redeclare interface b (previously declared in %s:%d) in %s on line %d

‎Zend/tests/class_alias_019.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ class_alias('\foo', 'foo');
1414

1515
?>
1616
--EXPECTF--
17-
Warning: Cannot declare class foo, because the name is already in use in %s on line %d
17+
Warning: Cannot redeclare class foo (previously declared in %s:%d) in %s on line %d

‎Zend/tests/declare_already_in_use.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Cannot declare class, because the name is already in use
2+
Cannot redeclare class
33
--FILE--
44
<?php
55

@@ -11,4 +11,4 @@ test();
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot declare class A, because the name is already in use in %s on line %d
14+
Fatal error: Cannot redeclare class A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/delayed_early_binding_redeclaration.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ include __DIR__ . '/delayed_early_binding_redeclaration-2.inc';
1010
var_dump(class_exists(Bar::class));
1111
?>
1212
--EXPECTF--
13-
Fatal error: Cannot declare class Bar, because the name is already in use in %sdelayed_early_binding_redeclaration-2.inc on line %d
13+
Fatal error: Cannot redeclare class Bar (previously declared in %sdelayed_early_binding_redeclaration-1.inc:2) in %sdelayed_early_binding_redeclaration-2.inc on line %d

‎Zend/tests/errmsg_026.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class stdclass {
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot declare class stdclass, because the name is already in use in %s on line %d
12+
Fatal error: Cannot redeclare class stdClass in %s on line %d

‎Zend/tests/function_redecl.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ function f() {}
66
function f() {}
77
?>
88
--EXPECTF--
9-
Fatal error: Cannot redeclare f() (previously declared in %s:%d) in %s on line %d
9+
Fatal error: Cannot redeclare function f() (previously declared in %s:%d) in %s on line %d

‎Zend/tests/inter_06.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ interface stdClass { }
77

88
?>
99
--EXPECTF--
10-
Fatal error: Cannot declare interface stdClass, because the name is already in use in %s on line %d
10+
Fatal error: Cannot redeclare class stdClass in %s on line %d

‎Zend/tests/name_collision_01.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ class A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare class A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare class A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_02.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ interface A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare interface A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare class A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_03.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ trait A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare trait A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare class A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_04.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ interface A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare interface A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare interface A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_05.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ trait A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare trait A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare interface A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_06.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ trait A { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Cannot declare trait A, because the name is already in use in %s on line %d
11+
Fatal error: Cannot redeclare trait A (previously declared in %s:%d) in %s on line %d

‎Zend/tests/name_collision_07.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ namespace Bazzle {
1313
}
1414
?>
1515
--EXPECTF--
16-
Fatal error: Cannot declare class Bazzle\Bar because the name is already in use in %s on line %d
16+
Fatal error: Cannot redeclare class Bazzle\Bar (previously declared as local import) in %s on line %d

‎Zend/tests/name_collision_08.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ namespace Bazzle {
1313
}
1414
?>
1515
--EXPECTF--
16-
Fatal error: Cannot declare function Bazzle\bar because the name is already in use in %s on line %d
16+
Fatal error: Cannot redeclare function Bazzle\bar() (previously declared as local import) in %s on line %d

‎Zend/tests/ns_029.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class Foo {
1010
new Foo();
1111
?>
1212
--EXPECTF--
13-
Fatal error: Cannot declare class Foo because the name is already in use in %sns_029.php on line 4
13+
Fatal error: Cannot redeclare class Foo (previously declared as local import) in %sns_029.php on line 4

‎Zend/tests/use_function/define_imported.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ namespace {
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot declare function bar because the name is already in use in %s on line %d
14+
Fatal error: Cannot redeclare function bar() (previously declared as local import) in %s on line %d

‎Zend/zend_API.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,26 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
438438
}
439439
/* }}} */
440440

441+
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce)
442+
{
443+
if (old_ce->type == ZEND_INTERNAL_CLASS) {
444+
zend_error(type, "Cannot redeclare %s %s",
445+
zend_get_object_type(old_ce),
446+
ZSTR_VAL(new_name));
447+
} else {
448+
zend_error(type, "Cannot redeclare %s %s (previously declared in %s:%d)",
449+
zend_get_object_type(old_ce),
450+
ZSTR_VAL(new_name),
451+
ZSTR_VAL(old_ce->info.user.filename),
452+
old_ce->info.user.line_start);
453+
}
454+
}
455+
456+
ZEND_API ZEND_COLD void zend_class_redeclaration_error(int type, zend_class_entry *old_ce)
457+
{
458+
zend_class_redeclaration_error_ex(type, old_ce->name, old_ce);
459+
}
460+
441461
ZEND_API bool ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **pce, uint32_t num, bool check_null) /* {{{ */
442462
{
443463
zend_class_entry *ce_base = *pce;

‎Zend/zend_API.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,8 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_en
15631563
ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
15641564
ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);
15651565
ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *format, ...);
1566+
ZEND_API ZEND_COLD void zend_class_redeclaration_error(int type, zend_class_entry *old_ce);
1567+
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, zend_class_entry *old_ce);
15661568

15671569
#define ZPP_ERROR_OK 0
15681570
#define ZPP_ERROR_FAILURE 1

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ ZEND_FUNCTION(class_alias)
11521152
if (zend_register_class_alias_ex(ZSTR_VAL(alias_name), ZSTR_LEN(alias_name), ce, false) == SUCCESS) {
11531153
RETURN_TRUE;
11541154
} else {
1155-
zend_error(E_WARNING, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(ce), ZSTR_VAL(alias_name));
1155+
zend_class_redeclaration_error_ex(E_WARNING, alias_name, ce);
11561156
RETURN_FALSE;
11571157
}
11581158
} else {

‎Zend/zend_compile.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,12 +1217,12 @@ static zend_never_inline ZEND_COLD ZEND_NORETURN void do_bind_function_error(zen
12171217
old_function = (zend_function*)Z_PTR_P(zv);
12181218
if (old_function->type == ZEND_USER_FUNCTION
12191219
&& old_function->op_array.last > 0) {
1220-
zend_error_noreturn(error_level, "Cannot redeclare %s() (previously declared in %s:%d)",
1220+
zend_error_noreturn(error_level, "Cannot redeclare function %s() (previously declared in %s:%d)",
12211221
op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name),
12221222
ZSTR_VAL(old_function->op_array.filename),
12231223
old_function->op_array.opcodes[0].lineno);
12241224
} else {
1225-
zend_error_noreturn(error_level, "Cannot redeclare %s()",
1225+
zend_error_noreturn(error_level, "Cannot redeclare function %s()",
12261226
op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name));
12271227
}
12281228
}
@@ -1260,7 +1260,9 @@ ZEND_API zend_class_entry *zend_bind_class_in_slot(
12601260
success = zend_hash_add_ptr(EG(class_table), Z_STR_P(lcname), ce) != NULL;
12611261
}
12621262
if (UNEXPECTED(!success)) {
1263-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(ce), ZSTR_VAL(ce->name));
1263+
zend_class_entry *old_class = zend_hash_find_ptr(EG(class_table), Z_STR_P(lcname));
1264+
ZEND_ASSERT(old_class);
1265+
zend_class_redeclaration_error(E_COMPILE_ERROR, old_class);
12641266
return NULL;
12651267
}
12661268

@@ -1298,7 +1300,7 @@ ZEND_API zend_result do_bind_class(zval *lcname, zend_string *lc_parent_name) /*
12981300
if (UNEXPECTED(!zv)) {
12991301
ce = zend_hash_find_ptr(EG(class_table), Z_STR_P(lcname));
13001302
ZEND_ASSERT(ce);
1301-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(ce), ZSTR_VAL(ce->name));
1303+
zend_class_redeclaration_error(E_COMPILE_ERROR, ce);
13021304
return FAILURE;
13031305
}
13041306

@@ -7752,8 +7754,8 @@ static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array,
77527754
zend_string *import_name =
77537755
zend_hash_find_ptr_lc(FC(imports_function), unqualified_name);
77547756
if (import_name && !zend_string_equals_ci(lcname, import_name)) {
7755-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare function %s "
7756-
"because the name is already in use", ZSTR_VAL(name));
7757+
zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare function %s() (previously declared as local import)",
7758+
ZSTR_VAL(name));
77577759
}
77587760
}
77597761

@@ -8318,8 +8320,8 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
83188320
zend_string *import_name =
83198321
zend_hash_find_ptr_lc(FC(imports), unqualified_name);
83208322
if (import_name && !zend_string_equals_ci(lcname, import_name)) {
8321-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s "
8322-
"because the name is already in use", ZSTR_VAL(name));
8323+
zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare class %s "
8324+
"(previously declared as local import)", ZSTR_VAL(name));
83238325
}
83248326
}
83258327

‎Zend/zend_inheritance.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3331,7 +3331,9 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
33313331
return true;
33323332
}
33333333
}
3334-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(ce), ZSTR_VAL(ce->name));
3334+
zend_class_entry *old_ce = zend_hash_find_ptr(EG(class_table), lcname);
3335+
ZEND_ASSERT(old_ce);
3336+
zend_class_redeclaration_error(E_COMPILE_ERROR, old_ce);
33353337
return false;
33363338
}
33373339
if (zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL) {

‎ext/opcache/tests/bug67215.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ unlink($file_c);
2525
unlink($file_p);
2626
?>
2727
--EXPECTF--
28-
Fatal error: Cannot declare class p, because the name is already in use in %sbug67215.p.php on line %d
28+
Fatal error: Cannot redeclare class p (previously declared in %sbug67215.p.php:%d) in %sbug67215.p.php on line %d

‎ext/opcache/tests/bug73583.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ if (true) {
1616
}
1717
?>
1818
--EXPECTF--
19-
Fatal error: Cannot redeclare A() (previously declared in %sbug73583.php:4) in %sbug73583.php on line 5
19+
Fatal error: Cannot redeclare function A() (previously declared in %sbug73583.php:4) in %sbug73583.php on line 5

‎ext/opcache/tests/gh8846.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/gh8846-index.php?s
3333
--EXPECTF--
3434
bool(true)
3535
<br />
36-
<b>Fatal error</b>: Cannot declare class Foo, because the name is already in use in <b>%sgh8846-2.inc</b> on line <b>%d</b><br />
36+
<b>Fatal error</b>: Cannot redeclare class Foo (previously declared in %sgh8846-1.inc:2) in <b>%sgh8846-2.inc</b> on line <b>%d</b><br />
3737

3838
bool(true)
3939
Ok

‎ext/opcache/zend_accelerator_util_funcs.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ static zend_always_inline void _zend_accel_function_hash_copy(HashTable *target,
178178
CG(zend_lineno) = function1->op_array.opcodes[0].lineno;
179179
if (function2->type == ZEND_USER_FUNCTION
180180
&& function2->op_array.last > 0) {
181-
zend_error_noreturn(E_ERROR, "Cannot redeclare %s() (previously declared in %s:%d)",
181+
zend_error_noreturn(E_ERROR, "Cannot redeclare function %s() (previously declared in %s:%d)",
182182
ZSTR_VAL(function1->common.function_name),
183183
ZSTR_VAL(function2->op_array.filename),
184184
(int)function2->op_array.opcodes[0].lineno);
185185
} else {
186-
zend_error_noreturn(E_ERROR, "Cannot redeclare %s()", ZSTR_VAL(function1->common.function_name));
186+
zend_error_noreturn(E_ERROR, "Cannot redeclare function %s()", ZSTR_VAL(function1->common.function_name));
187187
}
188188
}
189189

@@ -227,9 +227,7 @@ static zend_always_inline void _zend_accel_class_hash_copy(HashTable *target, Ha
227227
CG(in_compilation) = 1;
228228
zend_set_compiled_filename(ce1->info.user.filename);
229229
CG(zend_lineno) = ce1->info.user.line_start;
230-
zend_error_noreturn(E_ERROR,
231-
"Cannot declare %s %s, because the name is already in use",
232-
zend_get_object_type(ce1), ZSTR_VAL(ce1->name));
230+
zend_class_redeclaration_error(E_ERROR, Z_PTR_P(t));
233231
return;
234232
}
235233
continue;

‎ext/pcre/tests/preg_replace_callback_fatal_error_leak.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ preg_replace_callback('/a/', function($matches) {
1515

1616
?>
1717
--EXPECTF--
18-
Fatal error: Cannot redeclare test() (previously declared in %s on line %d
18+
Fatal error: Cannot redeclare function test() (previously declared in %s:%d) in %s on line %d

‎scripts/dev/bless_tests.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ function getFiles(array $dirsOrFiles): \Iterator {
6262
}
6363

6464
function normalizeOutput(string $out): string {
65-
$out = preg_replace('/in (\/|[A-Z]:\\\\).+ on line \d+/m', 'in %s on line %d', $out);
66-
$out = preg_replace('/in (\/|[A-Z]:\\\\).+:\d+$/m', 'in %s:%d', $out);
67-
$out = preg_replace('/\{closure:(\/|[A-Z]:\\\\).+:\d+\}/', '{closure:%s:%d}', $out);
65+
$out = preg_replace('/in (\/|[A-Z]:\\\\)\S+ on line \d+/m', 'in %s on line %d', $out);
66+
$out = preg_replace('/in (\/|[A-Z]:\\\\)\S+:\d+/m', 'in %s:%d', $out);
67+
$out = preg_replace('/\{closure:(\/|[A-Z]:\\\\)\S+:\d+\}/', '{closure:%s:%d}', $out);
6868
$out = preg_replace('/object\(([A-Za-z0-9]*)\)#\d+/', 'object($1)#%d', $out);
69-
$out = preg_replace('/^#(\d+) (\/|[A-Z]:\\\\).+\(\d+\):/m', '#$1 %s(%d):', $out);
69+
$out = preg_replace('/^#(\d+) (\/|[A-Z]:\\\\)\S+\(\d+\):/m', '#$1 %s(%d):', $out);
7070
$out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out);
7171
$out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out);
7272
$out = preg_replace(

0 commit comments

Comments
 (0)