Merge branch 'PHP-8.3'

* PHP-8.3: streams: Checking if a stream is castable should not emit warnings for user defined streams
MaxSem · Sep 8, 2023 · 8f8f31a · 8f8f31a
2 parents 7723718 + d68073c
commit 8f8f31a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
@@ -1384,6 +1384,8 @@ static int php_userstreamop_cast(php_stream *stream, int castas, void **retptr)
 	php_stream * intstream = NULL;
 	int call_result;
 	int ret = FAILURE;
+	/* If we are checking if the stream can cast, no return pointer is provided, so do not emit errors */
+	bool report_errors = retptr;
 
 	ZVAL_STRINGL(&func_name, USERSTREAM_CAST, sizeof(USERSTREAM_CAST)-1);
 
@@ -1400,22 +1402,28 @@ static int php_userstreamop_cast(php_stream *stream, int castas, void **retptr)
 
 	do {
 		if (call_result == FAILURE) {
-			php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " is not implemented!",
-					ZSTR_VAL(us->wrapper->ce->name));
+			if (report_errors) {
+				php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " is not implemented!",
+						ZSTR_VAL(us->wrapper->ce->name));
+			}
 			break;
 		}
 		if (!zend_is_true(&retval)) {
 			break;
 		}
 		php_stream_from_zval_no_verify(intstream, &retval);
 		if (!intstream) {
-			php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " must return a stream resource",
-					ZSTR_VAL(us->wrapper->ce->name));
+			if (report_errors) {
+				php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " must return a stream resource",
+						ZSTR_VAL(us->wrapper->ce->name));
+			}
 			break;
 		}
 		if (intstream == stream) {
-			php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " must not return itself",
-					ZSTR_VAL(us->wrapper->ce->name));
+			if (report_errors) {
+				php_error_docref(NULL, E_WARNING, "%s::" USERSTREAM_CAST " must not return itself",
+						ZSTR_VAL(us->wrapper->ce->name));
+			}
 			intstream = NULL;
 			break;
 		}

diff --git a/tests/output/stream_isatty_non_castable_userwrapper.phpt b/tests/output/stream_isatty_non_castable_userwrapper.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Non castable user-space streams (stream_cast())
+--FILE--
+<?php
+class test_wrapper {
+    public $context;
+    public $return_value;
+    function stream_open($path, $mode, $openedpath) {
+        return true;
+    }
+    function stream_eof() {
+        return false;
+    }
+}
+
+stream_wrapper_register('test', 'test_wrapper');
+$fd = fopen("test://foo","r");
+var_dump(stream_isatty($fd));
+
+?>
+--EXPECT--
+bool(false)