Stdlib: stream_filter_append/prepend Reflection Zend names (#28908)

ext/standard/stream_filter_append.php

@@ -35,15 +35,15 @@ public function execute(Frame $frame): void
             $frame->calledArgs[1],
             'stream_filter_append',
             1,
-            'filtername'
+            'filter_name'
         );
         $readWrite = VmStreamFilterChain::ALL;
         if ($argc >= 3) {
             $readWrite = VmMath::parseIntBuiltinArg(
                 $frame->calledArgs[2]->resolveIndirect(),
                 'stream_filter_append',
                 3,
-                'read_write'
+                'mode'
             );
         }
         if (null === $frame->returnVar) {

ext/standard/stream_filter_prepend.php

@@ -35,15 +35,15 @@ public function execute(Frame $frame): void
             $frame->calledArgs[1],
             'stream_filter_prepend',
             1,
-            'filtername'
+            'filter_name'
         );
         $readWrite = VmStreamFilterChain::ALL;
         if ($argc >= 3) {
             $readWrite = VmMath::parseIntBuiltinArg(
                 $frame->calledArgs[2]->resolveIndirect(),
                 'stream_filter_prepend',
                 3,
-                'read_write'
+                'mode'
             );
         }
         if (null === $frame->returnVar) {

lib/BuiltinInternalArgInfo.php

@@ -125,6 +125,8 @@ public static function stubReturnTypeLabelForFunction(string $callableLc): ?stri
             'stream_socket_client' => '',
             // ext/standard/streamsfuncs.stub.php — no return type; InternalArgInfo says resource (#28857)
             'stream_socket_server' => '',
+            // ext/standard/basic_functions.stub.php — no return type; InternalArgInfo says resource (#28908)
+            'stream_filter_append', 'stream_filter_prepend' => '',
             // ext/standard/proc_open.stub.php — no return type; InternalArgInfo says resource (#27847)
             'proc_open' => '',
             // ext/standard/streamsfuncs.stub.php — InternalArgInfo return int (missing |bool) (#27684)

lib/BuiltinParamNames.php

@@ -1055,6 +1055,10 @@ public static function forFunction(string $name): ?array
                 return ['protocol', 'class', 'flags'];
             case 'stream_filter_register':
                 return ['filter_name', 'class'];
+            // php-src ext/standard/basic_functions.stub.php — InternalArgInfo filtername/read_write/filterparams (#28908)
+            case 'stream_filter_append':
+            case 'stream_filter_prepend':
+                return ['stream', 'filter_name', 'mode=', 'params='];
             // php-src ext/standard/basic_functions.stub.php — InternalArgInfo still says context (#24584)
             case 'stream_context_get_options':
                 return ['stream_or_context'];

phpunit.xml.dist

@@ -106,6 +106,7 @@
             <file>./test/compliance/StreamCopyToStreamReflectionVMTest.php</file>
             <file>./test/compliance/StreamBucketReflectionStreamBucketVMTest.php</file>
             <file>./test/compliance/StreamBucketNewReflectionObjectVMTest.php</file>
+            <file>./test/compliance/StreamFilterAppendPrependReflectionVMTest.php</file>
             <file>./test/compliance/StreamContextSetOptionReturnTrueVMTest.php</file>
             <file>./test/compliance/StreamSocketEnableCryptoReflectionVMTest.php</file>
             <file>./test/compliance/HtmlDecodeFlagsNamedReflectionVMTest.php</file>

test/compliance/StreamFilterAppendPrependReflectionVMTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PHPCompiler;
+
+require_once __DIR__.'/../BaseTest.php';
+
+/** VM compliance for stream_filter_append/prepend Reflection (#28908). */
+final class StreamFilterAppendPrependReflectionVMTest extends BaseTest
+{
+    protected static string $DIR = __DIR__;
+
+    public static function providePHPTests(): \Generator
+    {
+        $file = 'stream_filter_append_prepend_reflection_28908.phpt';
+        yield $file => self::parsePHPT(
+            __DIR__.'/cases/stdlib/'.$file,
+            $file
+        );
+    }
+
+    public function setUp(): void
+    {
+        $this->BIN = realpath(__DIR__.'/../../bin/vm.php');
+    }
+}

test/compliance/cases/stdlib/stream_filter_append_prepend_reflection_28908.phpt

@@ -0,0 +1,23 @@
+--TEST--
+stdlib stream_filter_append/prepend Reflection Zend names + no return (#28908)
+--FILE--
+<?php
+foreach (['stream_filter_append', 'stream_filter_prepend'] as $f) {
+    $r = new ReflectionFunction($f);
+    $ps = [];
+    foreach ($r->getParameters() as $p) {
+        $ps[] = $p->getName();
+    }
+    echo $f, ' [', implode(', ', $ps), '] ret=', $r->hasReturnType() ? (string) $r->getReturnType() : '(none)', PHP_EOL;
+}
+$fp = fopen('php://memory', 'r+');
+stream_filter_append(stream: $fp, filter_name: 'string.toupper');
+echo "named_append_ok\n";
+stream_filter_prepend(stream: $fp, filter_name: 'string.tolower', mode: 0);
+echo "named_prepend_ok\n";
+?>
+--EXPECT--
+stream_filter_append [stream, filter_name, mode, params] ret=(none)
+stream_filter_prepend [stream, filter_name, mode, params] ret=(none)
+named_append_ok
+named_prepend_ok

test/repro/issue_28908_stream_filter_append_reflection.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * #28908 — stream_filter_append/prepend Reflection filter_name/mode/params + no return.
+ */
+foreach (['stream_filter_append', 'stream_filter_prepend'] as $f) {
+    $r = new ReflectionFunction($f);
+    $ps = [];
+    foreach ($r->getParameters() as $p) {
+        $ps[] = $p->getName();
+    }
+    echo $f, ' [', implode(', ', $ps), '] ret=', $r->hasReturnType() ? (string) $r->getReturnType() : '(none)', PHP_EOL;
+}
+$fp = fopen('php://memory', 'r+');
+try {
+    stream_filter_append(stream: $fp, filter_name: 'string.toupper');
+    echo "named_ok\n";
+} catch (Throwable $e) {
+    echo get_class($e), ': ', $e->getMessage(), PHP_EOL;
+}

test/unit/BuiltinParamNamesAliasTest.php

@@ -568,6 +568,23 @@ public function testStreamWrapperFilterRegisterNamedParameters(): void
         self::assertFalse(BuiltinParamNames::lookupNamedParamIndex($filter, 'filtername', 'stream_filter_register'));
     }
 
+    /** @covers issue #28908 */
+    public function testStreamFilterAppendPrependZendStubNamedParamsAndReturn(): void
+    {
+        foreach (['stream_filter_append', 'stream_filter_prepend'] as $fn) {
+            $names = BuiltinParamNames::forFunction($fn);
+            self::assertSame(['stream', 'filter_name', 'mode=', 'params='], $names, $fn);
+            self::assertSame(0, BuiltinParamNames::lookupNamedParamIndex($names, 'stream', $fn));
+            self::assertSame(1, BuiltinParamNames::lookupNamedParamIndex($names, 'filter_name', $fn));
+            self::assertSame(2, BuiltinParamNames::lookupNamedParamIndex($names, 'mode', $fn));
+            self::assertSame(3, BuiltinParamNames::lookupNamedParamIndex($names, 'params', $fn));
+            self::assertFalse(BuiltinParamNames::lookupNamedParamIndex($names, 'filtername', $fn));
+            self::assertFalse(BuiltinParamNames::lookupNamedParamIndex($names, 'read_write', $fn));
+            self::assertFalse(BuiltinParamNames::lookupNamedParamIndex($names, 'filterparams', $fn));
+            self::assertNull(BuiltinInternalArgInfo::returnTypeLabelForFunction($fn), $fn);
+        }
+    }
+
     /** @covers issue #24534 */
     public function testFtruncateNamedParameters(): void
     {