archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Fix GH-9905: constant() behaves inconsistent when class is undefined
This commit is contained in:
Christoph M. Becker 2022-11-09 15:23:51 +01:00
commit 75f372295e
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/basic_functions.c
View file

@ -519,7 +519,7 @@ PHP_FUNCTION(constant)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
scope = zend_get_executed_scope(); 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) { if (!c) {
RETURN_THROWS(); 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-- --EXPECTF--
define(): Argument #1 ($constant_name) cannot be a class constant define(): Argument #1 ($constant_name) cannot be a class constant
Class "" not found
Fatal error: Class "" not found in %s on line %d