php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make constant redeclaration a warning

Browse Source 
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.
This commit is contained in:
Nikita Popov
2020-09-21 11:02:09 +02:00
parent 54f03d31e0
commit edf22962ef
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/tests/008.phpt
View File

@@ -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)

2
Zend/tests/bug53305.phpt
View File

@@ -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)

2
Zend/tests/constants_001.phpt
View File

@@ -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)

2
Zend/tests/constants_004.phpt
View File

@@ -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

2
Zend/tests/constants_008.phpt
View File

@@ -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

2
Zend/tests/halt_compiler3.phpt
View File

@@ -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

2
Zend/tests/halt_compiler4.phpt
View File

@@ -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

2
Zend/zend_constants.c
View File

@@ -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);

2
ext/opcache/tests/bug71127.phpt
View File

@@ -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