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.

diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt
index aa2dbb8d33a1716b58d65b07ea1cfdc21406c459..1057c82b95242c3999b9927462339ce3c5a553c9 100644 (file)
--- a/Zend/tests/008.phpt
+++ b/Zend/tests/008.phpt
@@ -32,13 +32,13 @@ echo "Done\n";
 --EXPECTF--
 TypeError: define(): Argument #1 ($constant_name) must be of type string, array given
 
-Notice: Constant TRUE already defined in %s on line %d
+Warning: Constant TRUE already defined in %s on line %d
 bool(false)
 bool(true)
 bool(true)
 bool(true)
 
-Notice: Constant test const already defined in %s on line %d
+Warning: Constant test const already defined in %s on line %d
 bool(false)
 bool(true)
 bool(true)

diff --git a/Zend/tests/bug53305.phpt b/Zend/tests/bug53305.phpt
index c922ac63388237afdaf6c7b54d1455d4281893e7..c76b582e244a99b645efd2e97b832e1885c7f6c8 100644 (file)
--- a/Zend/tests/bug53305.phpt
+++ b/Zend/tests/bug53305.phpt
@@ -14,6 +14,6 @@ var_dump(constant('__COMPILER_HALT_OFFSET__1'.chr(0)));
 
 ?>
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
 int(1)
 int(4)

diff --git a/Zend/tests/constants_001.phpt b/Zend/tests/constants_001.phpt
index 8419eb6613de0d955d5d0ada217a8fe3fccdd2b3..7b274d6fd9c3a96ca036b424bbb2d9c355489cb3 100644 (file)
--- a/Zend/tests/constants_001.phpt
+++ b/Zend/tests/constants_001.phpt
@@ -17,7 +17,7 @@ var_dump(constant('1foo'));
 
 ?>
 --EXPECTF--
-Notice: Constant 1 already defined in %s on line %d
+Warning: Constant 1 already defined in %s on line %d
 int(2)
 int(2)
 int(2)

diff --git a/Zend/tests/constants_004.phpt b/Zend/tests/constants_004.phpt
index 69369aa3d9631696fd565c94794d25f5bcee46f2..e9814153612535ac174bccc61885e8bb2ae0a9a1 100644 (file)
--- a/Zend/tests/constants_004.phpt
+++ b/Zend/tests/constants_004.phpt
@@ -10,4 +10,4 @@ const foo = 2;
 
 ?>
 --EXPECTF--
-Notice: Constant foo\foo already defined in %s on line %d
+Warning: Constant foo\foo already defined in %s on line %d

diff --git a/Zend/tests/constants_008.phpt b/Zend/tests/constants_008.phpt
index 6a8f00edec23540348e4f769b066e5f975ab0dea..17c6904579caf55e1fe82e931d9a7b1ee7007165 100644 (file)
--- a/Zend/tests/constants_008.phpt
+++ b/Zend/tests/constants_008.phpt
@@ -13,5 +13,5 @@ if (defined('a')) {
 
 ?>
 --EXPECTF--
-Notice: Constant a already defined in %s on line %d
+Warning: Constant a already defined in %s on line %d
 2

diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/halt_compiler3.phpt
index f0a5323e66fee96900c32c447ef67ac230753d88..ff25b133336399f627b20c742280b2ab7692e239 100644 (file)
--- a/Zend/tests/halt_compiler3.phpt
+++ b/Zend/tests/halt_compiler3.phpt
@@ -5,4 +5,4 @@ __HALT_COMPILER(); bad define() of __COMPILER_HALT_OFFSET__ 1
 define ('__COMPILER_HALT_OFFSET__', 1);
 ?>
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d

diff --git a/Zend/tests/halt_compiler4.phpt b/Zend/tests/halt_compiler4.phpt
index 53a4fc76f9ef87b1f11a9fce8bb6502ad51d6ace..bb96f25ed96b786ebaa990ae7e679cf9cdb97322 100644 (file)
--- a/Zend/tests/halt_compiler4.phpt
+++ b/Zend/tests/halt_compiler4.phpt
@@ -7,4 +7,4 @@ __HALT_COMPILER();
 ?>
 ==DONE==
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 3ad32446ff56ced97b8234ab6b478fc3e818715e..f289cc5d9160d755a1db60c5241a4ab3152006eb 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -503,7 +503,7 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
                || (!persistent && zend_get_special_const(ZSTR_VAL(name), ZSTR_LEN(name)))
                || zend_hash_add_constant(EG(zend_constants), name, c) == NULL
        ) {
-               zend_error(E_NOTICE,"Constant %s already defined", ZSTR_VAL(name));
+               zend_error(E_WARNING, "Constant %s already defined", ZSTR_VAL(name));
                zend_string_release(c->name);
                if (!persistent) {
                        zval_ptr_dtor_nogc(&c->value);

diff --git a/ext/opcache/tests/bug71127.phpt b/ext/opcache/tests/bug71127.phpt
index 0c606097fead9fe52165525144ed4b688c65ded6..cc8886fc27aacfa21a37d13de9e726c93457641c 100644 (file)
--- a/ext/opcache/tests/bug71127.phpt
+++ b/ext/opcache/tests/bug71127.phpt
@@ -21,5 +21,5 @@ include($file);
 @unlink(__DIR__ . "/bug71127.inc");
 ?>
 --EXPECTF--
-Notice: Constant FOO already defined in %sbug71127.inc on line %d
+Warning: Constant FOO already defined in %sbug71127.inc on line %d
 okey