gen_stub: fix invalid C variable name for namespaced types in union/intersection type list

When generating a union or intersection type list with multiple class
types, the variable holding each zend_string* was declared using
toVarEscapedName() (backslashes replaced by underscores), but the
subsequent ZEND_TYPE_INIT_CLASS() reference used toEscapedName()
(backslashes escaped as \\), producing an invalid C identifier.

Author: GromNaN

build/gen_stub.php

@@ -2375,8 +2375,8 @@ protected function getTypeCode(string $variableLikeName, string &$code): string
                     $code .= "\t{$variableLikeType}_{$variableLikeName}_type_list->num_types = $classTypeCount;\n";
 
                     foreach ($arginfoType->classTypes as $k => $classType) {
-                        $escapedClassName = $classType->toEscapedName();
-                        $code .= "\t{$variableLikeType}_{$variableLikeName}_type_list->types[$k] = (zend_type) ZEND_TYPE_INIT_CLASS({$variableLikeType}_{$variableLikeName}_class_{$escapedClassName}, 0, 0);\n";
+                        $varEscapedClassName = $classType->toVarEscapedName();
+                        $code .= "\t{$variableLikeType}_{$variableLikeName}_type_list->types[$k] = (zend_type) ZEND_TYPE_INIT_CLASS({$variableLikeType}_{$variableLikeName}_class_{$varEscapedClassName}, 0, 0);\n";
                     }
 
                     $typeMaskCode = $this->type->toArginfoType()->toTypeMask();

ext/zend_test/test.c

@@ -70,7 +70,10 @@ static zend_class_entry *zend_test_ns_foo_class;
 static zend_class_entry *zend_test_ns_unlikely_compile_error_class;
 static zend_class_entry *zend_test_ns_not_unlikely_compile_error_class;
 static zend_class_entry *zend_test_ns2_foo_class;
+static zend_class_entry *zend_test_ns2_foo_with_intersection_prop_class;
 static zend_class_entry *zend_test_ns2_ns_foo_class;
+static zend_class_entry *zend_test_ns2_ns_bar_class;
+static zend_class_entry *zend_test_ns2_ns_baz_class;
 static zend_class_entry *zend_test_unit_enum;
 static zend_class_entry *zend_test_string_enum;
 static zend_class_entry *zend_test_int_enum;
@@ -1573,6 +1576,9 @@ PHP_MINIT_FUNCTION(zend_test)
 	zend_test_ns_not_unlikely_compile_error_class = register_class_ZendTestNS_NotUnlikelyCompileError();
 	zend_test_ns2_foo_class = register_class_ZendTestNS2_Foo();
 	zend_test_ns2_ns_foo_class = register_class_ZendTestNS2_ZendSubNS_Foo();
+	zend_test_ns2_ns_bar_class = register_class_ZendTestNS2_ZendSubNS_Bar();
+	zend_test_ns2_ns_baz_class = register_class_ZendTestNS2_ZendSubNS_Baz();
+	zend_test_ns2_foo_with_intersection_prop_class = register_class_ZendTestNS2_FooWithIntersectionProp();
 
 	zend_test_unit_enum = register_class_ZendTestUnitEnum();
 	zend_test_string_enum = register_class_ZendTestStringEnum();

ext/zend_test/test.stub.php

@@ -387,6 +387,10 @@ class Foo {
         public function method(): void {}
     }
 
+    class FooWithIntersectionProp {
+        public ZendSubNS\Bar&ZendSubNS\Baz $prop;
+    }
+
     function namespaced_func(): bool {}
 
     /** @deprecated */
@@ -411,6 +415,10 @@ class Foo {
         public function method(): void {}
     }
 
+    interface Bar {}
+
+    interface Baz {}
+
     function namespaced_func(): bool {}
 
     /** @deprecated */

ext/zend_test/test_arginfo.h

@@ -0,0 +1,27 @@
+--TEST--
+gen_stub.php: intersection type property with namespaced classes
+--EXTENSIONS--
+zend_test
+--FILE--
+<?php
+
+$rp = new ReflectionProperty(ZendTestNS2\FooWithIntersectionProp::class, 'prop');
+$type = $rp->getType();
+
+var_dump($type instanceof ReflectionIntersectionType);
+
+foreach ($type->getTypes() as $t) {
+    var_dump($t->getName());
+    var_dump($t->allowsNull());
+    var_dump($t->isBuiltin());
+}
+
+?>
+--EXPECT--
+bool(true)
+string(25) "ZendTestNS2\ZendSubNS\Bar"
+bool(false)
+bool(false)
+string(25) "ZendTestNS2\ZendSubNS\Baz"
+bool(false)
+bool(false)