Deprecate constant redeclaration

alexandre-daubois · alexandre-daubois · commit a3ac5411489b · 2025-08-13T16:40:14.000+02:00
diff --git a/Zend/tests/attributes/constants/constant_redefined_addition.phpt b/Zend/tests/attributes/constants/constant_redefined_addition.phpt
@@ -15,7 +15,7 @@ var_dump($reflection->getAttributes())
 
 ?>
 --EXPECTF--
-Warning: Constant MY_CONST already defined in %s on line %d
+Warning: Constant MY_CONST already defined, this will be an error in PHP 9 in %s on line %d
 No attributes
 array(0) {
 }
diff --git a/Zend/tests/attributes/constants/constant_redefined_change.phpt b/Zend/tests/attributes/constants/constant_redefined_change.phpt
@@ -16,7 +16,7 @@ var_dump($reflection->getAttributes())
 
 ?>
 --EXPECTF--
-Warning: Constant MY_CONST already defined in %s on line %d
+Warning: Constant MY_CONST already defined, this will be an error in PHP 9 in %s on line %d
 Has attributes (1)
 array(1) {
   [0]=>
diff --git a/Zend/tests/attributes/constants/constant_redefined_removal.phpt b/Zend/tests/attributes/constants/constant_redefined_removal.phpt
@@ -15,7 +15,7 @@ var_dump($reflection->getAttributes())
 
 ?>
 --EXPECTF--
-Warning: Constant MY_CONST already defined in %s on line %d
+Warning: Constant MY_CONST already defined, this will be an error in PHP 9 in %s on line %d
 Has attributes
 array(1) {
   [0]=>
diff --git a/Zend/tests/bug29890.phpt b/Zend/tests/bug29890.phpt
@@ -20,4 +20,4 @@ define("TEST",3);
 
 ?>
 --EXPECT--
-error :Constant TEST already defined
+error :Constant TEST already defined, this will be an error in PHP 9
diff --git a/Zend/tests/constants/008.phpt b/Zend/tests/constants/008.phpt
@@ -27,13 +27,13 @@ echo "Done\n";
 --EXPECTF--
 TypeError: define(): Argument #1 ($constant_name) must be of type string, array given
 
-Warning: Constant TRUE already defined in %s on line %d
+Warning: Constant TRUE already defined, this will be an error in PHP 9 in %s on line %d
 bool(false)
 bool(true)
 bool(true)
 bool(true)
 
-Warning: Constant test const already defined in %s on line %d
+Warning: Constant test const already defined, this will be an error in PHP 9 in %s on line %d
 bool(false)
 bool(true)
 bool(true)
diff --git a/Zend/tests/constants/constants_001.phpt b/Zend/tests/constants/constants_001.phpt
@@ -17,7 +17,7 @@ var_dump(constant('1foo'));
 
 ?>
 --EXPECTF--
-Warning: Constant 1 already defined in %s on line %d
+Warning: Constant 1 already defined, this will be an error in PHP 9 in %s on line %d
 int(2)
 int(2)
 int(2)
diff --git a/Zend/tests/constants/constants_004.phpt b/Zend/tests/constants/constants_004.phpt
@@ -10,4 +10,4 @@ const foo = 2;
 
 ?>
 --EXPECTF--
-Warning: Constant foo\foo already defined in %s on line %d
+Warning: Constant foo\foo already defined, this will be an error in PHP 9 in %s on line %d
diff --git a/Zend/tests/constants/constants_008.phpt b/Zend/tests/constants/constants_008.phpt
@@ -13,5 +13,5 @@ if (defined('a')) {
 
 ?>
 --EXPECTF--
-Warning: Constant a already defined in %s on line %d
+Warning: Constant a already defined, this will be an error in PHP 9 in %s on line %d
 2
diff --git a/Zend/tests/constants/halt_compiler/bug53305.phpt b/Zend/tests/constants/halt_compiler/bug53305.phpt
@@ -14,6 +14,6 @@ var_dump(constant('__COMPILER_HALT_OFFSET__1'.chr(0)));
 
 ?>
 --EXPECTF--
-Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined, this will be an error in PHP 9 in %s on line %d
 int(1)
 int(4)
diff --git a/Zend/tests/constants/halt_compiler/halt_compiler3.phpt b/Zend/tests/constants/halt_compiler/halt_compiler3.phpt
@@ -5,4 +5,4 @@ __HALT_COMPILER(); bad define() of __COMPILER_HALT_OFFSET__ 1
 define ('__COMPILER_HALT_OFFSET__', 1);
 ?>
 --EXPECTF--
-Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined, this will be an error in PHP 9 in %s on line %d
diff --git a/Zend/tests/constants/halt_compiler/halt_compiler4.phpt b/Zend/tests/constants/halt_compiler/halt_compiler4.phpt
@@ -7,4 +7,4 @@ __HALT_COMPILER();
 ?>
 ==DONE==
 --EXPECTF--
-Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined, this will be an error in PHP 9 in %s on line %d
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
@@ -541,7 +541,7 @@ ZEND_API zend_constant *zend_register_constant(zend_constant *c)
 		|| (!persistent && zend_get_special_const(ZSTR_VAL(name), ZSTR_LEN(name)))
 		|| (ret = zend_hash_add_constant(EG(zend_constants), name, c)) == NULL
 	) {
-		zend_error(E_WARNING, "Constant %s already defined", ZSTR_VAL(name));
+		zend_error(E_WARNING, "Constant %s already defined, this will be an error in PHP 9", ZSTR_VAL(name));
 		zend_string_release(c->name);
 		if (c->filename) {
 			zend_string_release(c->filename);
diff --git a/ext/opcache/tests/bug71127.phpt b/ext/opcache/tests/bug71127.phpt
@@ -21,5 +21,5 @@ include($file);
 @unlink(__DIR__ . "/bug71127.inc");
 ?>
 --EXPECTF--
-Warning: Constant FOO already defined in %sbug71127.inc on line %d
+Warning: Constant FOO already defined, this will be an error in PHP 9 in %sbug71127.inc on line %d
 okey
diff --git a/ext/phar/tests/bug77432.phpt b/ext/phar/tests/bug77432.phpt
@@ -39,7 +39,7 @@ include("phar://" . $filename);
 hello world
 --- Include 2 ---
 
-Warning: Constant  already defined in %s on line %d
+Warning: Constant  already defined, this will be an error in PHP 9 in %s on line %d
 hello world
 --- After unlink ---
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var_dump($reflection->getAttributes())`
`15`	`15`
`16`	`16`	`?>`
`17`	`17`	`--EXPECTF--`
`18`		`-Warning: Constant MY_CONST already defined in %s on line %d`
	`18`	`+Warning: Constant MY_CONST already defined, this will be an error in PHP 9 in %s on line %d`
`19`	`19`	`No attributes`
`20`	`20`	`array(0) {`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ if (defined('a')) {`
`13`	`13`
`14`	`14`	`?>`
`15`	`15`	`--EXPECTF--`
`16`		`-Warning: Constant a already defined in %s on line %d`
	`16`	`+Warning: Constant a already defined, this will be an error in PHP 9 in %s on line %d`
`17`	`17`	`2`