Skip to content

Commit edf2296

Browse files
committed
Make constant redeclaration a warning
We missed the change to make this an Error exception in PHP 8, but at least elevate it to a warning, to avoid a notice -> exception jump at a later time.
1 parent 54f03d3 commit edf2296

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

Zend/tests/008.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ echo "Done\n";
3232
--EXPECTF--
3333
TypeError: define(): Argument #1 ($constant_name) must be of type string, array given
3434

35-
Notice: Constant TRUE already defined in %s on line %d
35+
Warning: Constant TRUE already defined in %s on line %d
3636
bool(false)
3737
bool(true)
3838
bool(true)
3939
bool(true)
4040

41-
Notice: Constant test const already defined in %s on line %d
41+
Warning: Constant test const already defined in %s on line %d
4242
bool(false)
4343
bool(true)
4444
bool(true)

Zend/tests/bug53305.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ var_dump(constant('__COMPILER_HALT_OFFSET__1'.chr(0)));
1414

1515
?>
1616
--EXPECTF--
17-
Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
17+
Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
1818
int(1)
1919
int(4)

Zend/tests/constants_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var_dump(constant('1foo'));
1717

1818
?>
1919
--EXPECTF--
20-
Notice: Constant 1 already defined in %s on line %d
20+
Warning: Constant 1 already defined in %s on line %d
2121
int(2)
2222
int(2)
2323
int(2)

Zend/tests/constants_004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ const foo = 2;
1010

1111
?>
1212
--EXPECTF--
13-
Notice: Constant foo\foo already defined in %s on line %d
13+
Warning: Constant foo\foo already defined in %s on line %d

Zend/tests/constants_008.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ if (defined('a')) {
1313

1414
?>
1515
--EXPECTF--
16-
Notice: Constant a already defined in %s on line %d
16+
Warning: Constant a already defined in %s on line %d
1717
2

Zend/tests/halt_compiler3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ __HALT_COMPILER(); bad define() of __COMPILER_HALT_OFFSET__ 1
55
define ('__COMPILER_HALT_OFFSET__', 1);
66
?>
77
--EXPECTF--
8-
Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
8+
Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d

Zend/tests/halt_compiler4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ __HALT_COMPILER();
77
?>
88
==DONE==
99
--EXPECTF--
10-
Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
10+
Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d

Zend/zend_constants.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
503503
|| (!persistent && zend_get_special_const(ZSTR_VAL(name), ZSTR_LEN(name)))
504504
|| zend_hash_add_constant(EG(zend_constants), name, c) == NULL
505505
) {
506-
zend_error(E_NOTICE,"Constant %s already defined", ZSTR_VAL(name));
506+
zend_error(E_WARNING, "Constant %s already defined", ZSTR_VAL(name));
507507
zend_string_release(c->name);
508508
if (!persistent) {
509509
zval_ptr_dtor_nogc(&c->value);

ext/opcache/tests/bug71127.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ include($file);
2121
@unlink(__DIR__ . "/bug71127.inc");
2222
?>
2323
--EXPECTF--
24-
Notice: Constant FOO already defined in %sbug71127.inc on line %d
24+
Warning: Constant FOO already defined in %sbug71127.inc on line %d
2525
okey

0 commit comments

Comments
 (0)