Merge branch 'php:master' into readline-true

Author: DanielEScherzer

.github/CODEOWNERS

@@ -45,6 +45,7 @@
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
 /ext/simplexml @nielsdos
+/ext/soap @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka

EXTENSIONS

@@ -184,7 +184,8 @@ SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           soap
 PRIMARY MAINTAINER:  Dmitry Stogov <[email protected]> (2004 - 2018)
-MAINTENANCE:         Maintained
+                     Niels Dossche <[email protected]> (2024 - 2024)
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml

Zend/tests/gh16508.phpt

@@ -0,0 +1,20 @@
+--TEST--
+GH-16508: Missing lineno in inheritance errors of delayed early bound classes
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable_cli=1
+--FILE--
+<?php
+
+new Test2;
+
+class Test2 extends Test {}
+
+abstract class Test {
+    abstract function foo();
+}
+
+?>
+--EXPECTF--
+Fatal error: Class Test2 contains 1 abstract method and must therefore be declared abstract or implement the remaining method (Test::foo) in %s on line 5

Zend/tests/gh16509.inc

@@ -0,0 +1,7 @@
+<?php
+
+function test() {
+
+
+    echo 'foo';
+}

Zend/tests/gh16509.phpt

@@ -0,0 +1,11 @@
+--TEST--
+GH-16509: Incorrect lineno reported for function redeclaration
+--FILE--
+<?php
+
+include __DIR__ . '/gh16509.inc';
+include __DIR__ . '/gh16509.inc';
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare function test() (previously declared in %sgh16509.inc:3) in %sgh16509.inc on line 3

Zend/tests/gh16515.phpt

@@ -0,0 +1,16 @@
+--TEST--
+GH-16515: Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for call trampoline
+--FILE--
+<?php
+
+namespace Foo;
+
+class Foo {
+    public function &__call($method, $args) {}
+}
+
+call_user_func((new Foo)->bar(...));
+
+?>
+--EXPECTF--
+Notice: Only variable references should be returned by reference in %s on line %d

Zend/tests/lazy_objects/init_ast_const.phpt

@@ -0,0 +1,22 @@
+--TEST--
+oss-fuzz #71407
+--FILE--
+<?php
+
+class C {
+    public $x=x;
+}
+
+$reflector = new ReflectionClass(C::class);
+
+try {
+    $obj = $reflector->newLazyGhost(function() {});
+    clone $obj;
+} catch (Error $e) {
+    printf("%s: %s\n", $e::class, $e->getMessage());
+}
+
+
+?>
+--EXPECT--
+Error: Undefined constant "x"

Zend/tests/lazy_objects/init_ast_const_failure.phpt

@@ -871,7 +871,7 @@ void zend_closure_from_frame(zval *return_value, zend_execute_data *call) { /* {
 
 		memset(&trampoline, 0, sizeof(zend_internal_function));
 		trampoline.type = ZEND_INTERNAL_FUNCTION;
-		trampoline.fn_flags = mptr->common.fn_flags & (ZEND_ACC_STATIC | ZEND_ACC_VARIADIC);
+		trampoline.fn_flags = mptr->common.fn_flags & (ZEND_ACC_STATIC | ZEND_ACC_VARIADIC | ZEND_ACC_RETURN_REFERENCE);
 		trampoline.handler = zend_closure_call_magic;
 		trampoline.function_name = mptr->common.function_name;
 		trampoline.scope = mptr->common.scope;