Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix GH-9905: constant() behaves inconsistent when class is undefined

Author: cmb69

NEWS

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

ext/standard/basic_functions.c

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

ext/standard/tests/general_functions/gh9905.phpt

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

tests/lang/bug44827.phpt

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