mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix GH-9905: constant() behaves inconsistent when class is undefined
This commit is contained in:
Christoph M. Becker 2022-11-09 15:22:45 +01:00
commit 4b1feda574
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.2.1
- Core:
. Fixed bug GH-9905 (constant() behaves inconsistent when class is undefined).
(cmb)
27 Nov 2022, PHP 8.2.0
- CLI:

2
ext/standard/basic_functions.c
View File

@ -525,7 +525,7 @@ PHP_FUNCTION(constant)
ZEND_PARSE_PARAMETERS_END();
scope = zend_get_executed_scope();
c = zend_get_constant_ex(const_name, scope, 0);
c = zend_get_constant_ex(const_name, scope, ZEND_FETCH_CLASS_EXCEPTION);
if (!c) {
RETURN_THROWS();
}

12
ext/standard/tests/general_functions/gh9905.phpt Normal file
View File

@ -0,0 +1,12 @@
--TEST--
GH-9905 (constant() behaves inconsistent when class is undefined)
--FILE--
<?php
try {
\constant("\NonExistantClass::non_existant_constant");
} catch (\Throwable|\Error|\Exception $e) {
echo($e->getMessage());
}
?>
--EXPECT--
Class "NonExistantClass" not found

3
tests/lang/bug44827.phpt
View File

@ -21,5 +21,4 @@ try {
?>
--EXPECTF--
define(): Argument #1 ($constant_name) cannot be a class constant
Fatal error: Class "" not found in %s on line %d
Class "" not found