Merge branch 'PHP-8.5'

* PHP-8.5:
  NEWS entries for recent SPL bug fixes
  ext/spl: ignore leading namespace separator in spl_autoload() (#22323)
  ext/spl: fix class_parents for classes with leading slash in non-autoload mode (#22283)

Author: Girgias

ext/spl/php_spl.c

@@ -40,16 +40,7 @@ ZEND_TLS zend_string *spl_autoload_extensions;
 
 static zend_class_entry * spl_find_ce_by_name(zend_string *name, bool autoload)
 {
-	zend_class_entry *ce;
-
-	if (!autoload) {
-		zend_string *lc_name = zend_string_tolower(name);
-
-		ce = zend_hash_find_ptr(EG(class_table), lc_name);
-		zend_string_release(lc_name);
-	} else {
-		ce = zend_lookup_class(name);
-	}
+	zend_class_entry *ce = zend_lookup_class_ex(name, NULL, autoload ? 0 : ZEND_FETCH_CLASS_NO_AUTOLOAD);
 	if (ce == NULL) {
 		php_error_docref(NULL, E_WARNING, "Class %s does not exist%s", ZSTR_VAL(name), autoload ? " and could not be loaded" : "");
 		return NULL;
@@ -334,7 +325,12 @@ PHP_FUNCTION(spl_autoload)
 		pos_len = ZSTR_LEN(file_exts);
 	}
 
-	lc_name = zend_string_tolower(class_name);
+	if (ZSTR_VAL(class_name)[0] == '\\') {
+		lc_name = zend_string_alloc(ZSTR_LEN(class_name) - 1, 0);
+		zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(class_name) + 1, ZSTR_LEN(class_name) - 1);
+	} else {
+		lc_name = zend_string_tolower(class_name);
+	}
 	while (pos && *pos && !EG(exception)) {
 		pos1 = strchr(pos, ',');
 		if (pos1) {

ext/spl/tests/class_parents_leading_backslash.phpt

@@ -0,0 +1,72 @@
+--TEST--
+class_parents()/class_implements()/class_uses() accept a leading backslash regardless of $autoload
+--FILE--
+<?php
+
+namespace {
+    interface Iface {}
+    trait Tr {}
+    class ParentC implements Iface {}
+    class ChildC extends ParentC {
+        use Tr;
+    }
+}
+
+namespace MyNS {
+    interface NSIface {}
+    trait NSTr {}
+    class NSParentC implements NSIface {}
+    class NSChildC extends NSParentC {
+        use NSTr;
+    }
+}
+
+namespace {
+
+// The no-autoload path missed the leading-backslash strip before the fix.
+var_dump(class_parents('\ChildC', false));
+var_dump(class_parents('\ChildC'));
+var_dump(class_implements('\ParentC', false));
+var_dump(class_uses('\ChildC', false));
+
+// Same for namespaced classes.
+var_dump(class_parents('\MyNS\NSChildC', false));
+var_dump(class_parents('\MyNS\NSChildC'));
+var_dump(class_implements('\MyNS\NSParentC', false));
+var_dump(class_uses('\MyNS\NSChildC', false));
+
+}
+?>
+--EXPECT--
+array(1) {
+  ["ParentC"]=>
+  string(7) "ParentC"
+}
+array(1) {
+  ["ParentC"]=>
+  string(7) "ParentC"
+}
+array(1) {
+  ["Iface"]=>
+  string(5) "Iface"
+}
+array(1) {
+  ["Tr"]=>
+  string(2) "Tr"
+}
+array(1) {
+  ["MyNS\NSParentC"]=>
+  string(14) "MyNS\NSParentC"
+}
+array(1) {
+  ["MyNS\NSParentC"]=>
+  string(14) "MyNS\NSParentC"
+}
+array(1) {
+  ["MyNS\NSIface"]=>
+  string(12) "MyNS\NSIface"
+}
+array(1) {
+  ["MyNS\NSTr"]=>
+  string(9) "MyNS\NSTr"
+}

ext/spl/tests/spl_autoload_leading_backslash.phpt

@@ -0,0 +1,18 @@
+--TEST--
+spl_autoload(): a leading "\" in the class name is ignored
+--FILE--
+<?php
+
+set_include_path(__DIR__);
+spl_autoload_extensions(".inc");
+
+spl_autoload("DualIterator");
+var_dump(class_exists("DualIterator", false));
+
+spl_autoload("\\RecursiveDualIterator");
+var_dump(class_exists("RecursiveDualIterator", false));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)