Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-12558 Escape \N in generated stubs

Author: kocsismate

NEWS

@@ -10,6 +10,8 @@ PHP                                                                        NEWS
     property via trait). (ilutov)
   . Fixed segfault caused by weak references to FFI objects. (sj-i)
   . Fixed max_execution_time: don't delete an unitialized timer. (Kévin Dunglas)
+  . Fixed bug GH-12558 (Arginfo soft-breaks with namespaced class return type
+    if the class name starts with N). (kocsismate)
 
 - DOM:
   . Fix registerNodeClass with abstract class crashing. (nielsdos)

build/gen_stub.php

@@ -524,10 +524,10 @@ public function toOptimizerTypeMask(): string {
     }
 
     public function toEscapedName(): string {
-        // Escape backslashes, and also encode \u and \U to avoid compilation errors in generated macros
+        // Escape backslashes, and also encode \u, \U, and \N to avoid compilation errors in generated macros
         return str_replace(
-            ['\\', '\\u', '\\U'],
-            ['\\\\', '\\\\165', '\\\\125'],
+            ['\\', '\\u', '\\U', '\\N'],
+            ['\\\\', '\\\\165', '\\\\125', '\\\\116'],
             $this->name
         );
     }

ext/zend_test/test.c

@@ -57,6 +57,7 @@ static zend_class_entry *zend_test_class_with_property_attribute;
 static zend_class_entry *zend_test_forbid_dynamic_call;
 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_ns_foo_class;
 static zend_class_entry *zend_test_unit_enum;
@@ -796,6 +797,13 @@ static ZEND_METHOD(ZendTestNS_UnlikelyCompileError, method)
 	RETURN_NULL();
 }
 
+static ZEND_METHOD(ZendTestNS_NotUnlikelyCompileError, method)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	RETURN_NULL();
+}
+
 static ZEND_METHOD(ZendTestNS2_Foo, method)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
@@ -1050,6 +1058,7 @@ PHP_MINIT_FUNCTION(zend_test)
 
 	zend_test_ns_foo_class = register_class_ZendTestNS_Foo();
 	zend_test_ns_unlikely_compile_error_class = register_class_ZendTestNS_UnlikelyCompileError();
+	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();
 

ext/zend_test/test.stub.php

@@ -254,6 +254,11 @@ class UnlikelyCompileError {
         public function method(): ?UnlikelyCompileError {}
     }
 
+    class NotUnlikelyCompileError {
+        /* This method signature would create a compile error due to the string
+         * "ZendTestNS\NotUnlikelyCompileError" in the generated macro call */
+        public function method(): ?NotUnlikelyCompileError {}
+    }
 }
 
 namespace ZendTestNS2 {

ext/zend_test/test_arginfo.h

@@ -11,6 +11,8 @@ $foo->foo = new \ZendTestNS2\ZendSubNS\Foo();
 var_dump($foo);
 $foo = new \ZendTestNS\UnlikelyCompileError();
 var_dump($foo);
+$foo = new \ZendTestNS\NotUnlikelyCompileError();
+var_dump($foo);
 ?>
 --EXPECTF--
 object(ZendTestNS2\Foo)#%d (%d) {
@@ -24,3 +26,5 @@ object(ZendTestNS2\Foo)#%d (%d) {
 }
 object(ZendTestNS\UnlikelyCompileError)#%d (%d) {
 }
+object(ZendTestNS\NotUnlikelyCompileError)#%d (%d) {
+}