stream: return array of errors instead of linked list

Author: bukka

ext/standard/basic_functions.stub.php

@@ -3556,8 +3556,11 @@ function stream_get_wrappers(): array {}
 
 /**
  * @refcount 1
+ * @return list<StreamError>
  */
-function stream_get_last_error(): ?StreamError {}
+function stream_last_errors(): array {}
+
+function stream_clear_errors(): void {}
 
 /**
  * @return array<int, string>

ext/standard/basic_functions_arginfo.h

@@ -634,25 +634,16 @@ PHP_FUNCTION(stream_get_wrappers)
 }
 /* }}} */
 
-/* Retrieves the last stored stream error */
-PHP_FUNCTION(stream_get_last_error)
+PHP_FUNCTION(stream_last_errors)
 {
-    ZEND_PARSE_PARAMETERS_NONE();
-    
-    /* Check if we have any stored errors */
-    if (!FG(stream_error_state).stored_errors) {
-        RETURN_NULL();
-    }
-    
-    /* Get the most recent stored error (head of list) */
-    php_stream_stored_error *stored = FG(stream_error_state).stored_errors;
-    
-    if (!stored->first_error) {
-        RETURN_NULL();
-    }
-    
-    /* Create StreamError object from the error chain */
-    php_stream_error_create_object(return_value, stored->first_error);
+	ZEND_PARSE_PARAMETERS_NONE();
+	php_stream_error_get_last(return_value);
+}
+
+PHP_FUNCTION(stream_clear_errors)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+	php_stream_error_clear_stored();
 }
 
 /* {{{ stream_select related functions */

ext/standard/basic_functions_decl.h

@@ -12,8 +12,9 @@ $context = stream_context_create([
 // Generate a network error
 $stream = fopen('php://nonexistent', 'r', false, $context);
 
-$error = stream_get_last_error();
-if ($error) {
+$errors = stream_last_errors();
+if (!empty($errors)) {
+    $error = $errors[0];
     echo "Is I/O error: " . ($error->code->isIoError() ? 'yes' : 'no') . "\n";
     echo "Is filesystem error: " . ($error->code->isFileSystemError() ? 'yes' : 'no') . "\n";
     echo "Is network error: " . ($error->code->isNetworkError() ? 'yes' : 'no') . "\n";

ext/standard/streamsfuncs.c

@@ -12,11 +12,11 @@ $context = stream_context_create([
 
 // First operation
 $stream1 = fopen('php://nonexistent1', 'r', false, $context);
-$error1 = stream_get_last_error();
+$error1 = stream_last_errors()[0];
 
 // Second operation
 $stream2 = fopen('php://nonexistent2', 'r', false, $context);
-$error2 = stream_get_last_error();
+$error2 = stream_last_errors()[0];
 
 // Should get the most recent error (second operation)
 if ($error2) {

ext/standard/tests/streams/stream_errors_error_code_helpers.phpt

@@ -15,8 +15,9 @@ try {
     echo "Caught: " . $e->getMessage() . "\n";
     echo "Code: " . $e->getCode() . "\n";
 
-    $error = $e->getError();
-    if ($error) {
+    $errors = $e->getErrors();
+    if (!empty($errors)) {
+        $error = $errors[0];
         echo "Wrapper: " . $error->wrapperName . "\n";
         echo "Error code name: " . $error->code->name . "\n";
     }

ext/standard/tests/streams/stream_errors_error_has_code.phpt

@@ -28,6 +28,7 @@ class TestStream {
 stream_wrapper_register('test', 'TestStream');
 
 function stream_test_errors($title, $contextOptions) {
+    stream_clear_errors();
     $context = stream_context_create($contextOptions);
     $stream = fopen('test://foo', 'r', false, $context);
     try {
@@ -43,22 +44,18 @@ function stream_test_errors($title, $contextOptions) {
         echo 'EXCEPTION: ' . $e->getMessage() . "\n";
     }
 
-    $error = stream_get_last_error();
-    if ($error) {
+    $errors = stream_last_errors();
+    if ($errors) {
+        $first = $errors[0];
         echo "Error details:\n";
-        echo "- Message: $error->message\n";
-        echo "- Code: " . $error->code->name . "\n";
-        echo "- Wrapper: $error->wrapperName\n";
-        echo "- Terminating: " . ($error->terminating ? 'yes' : 'no') . "\n";
-        echo "- Count: " . $error->count() . "\n";
-        
-        // Show all errors in chain
-        $current = $error;
-        $idx = 0;
-        while ($current) {
-            echo "  [$idx] " . $current->code->name . ": " . $current->message . "\n";
-            $current = $current->next;
-            $idx++;
+        echo "- Message: $first->message\n";
+        echo "- Code: " . $first->code->name . "\n";
+        echo "- Wrapper: $first->wrapperName\n";
+        echo "- Terminating: " . ($first->terminating ? 'yes' : 'no') . "\n";
+        echo "- Count: " . count($errors) . "\n";
+
+        foreach ($errors as $idx => $error) {
+            echo "  [$idx] " . $error->code->name . ": " . $error->message . "\n";
         }
     } else {
         echo "No errors stored\n";
@@ -149,10 +146,4 @@ Warning: fread(): TestStream::stream_read - read 10 bytes more data than request
 Warning: stream_select(): TestStream::stream_cast is not implemented! in %s on line %d
 
 Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s on line %d
-Error details:
-- Message: TestStream::stream_read - read 10 bytes more data than requested (8202 read, 8192 max) - excess data will be lost
-- Code: UserspaceInvalidReturn
-- Wrapper: user-space
-- Terminating: no
-- Count: 1
-  [0] UserspaceInvalidReturn: TestStream::stream_read - read 10 bytes more data than requested (8202 read, 8192 max) - excess data will be lost
+No errors stored

ext/standard/tests/streams/stream_errors_exception_mode_terminal.phpt

@@ -12,8 +12,8 @@ $context1 = stream_context_create([
 ]);
 
 @fopen('php://nonexistent', 'r', false, $context1);
-$error1 = stream_get_last_error();
-echo "ERROR mode AUTO: " . ($error1 ? "has error" : "no error") . "\n";
+$errors1 = stream_last_errors();
+echo "ERROR mode AUTO: " . (!empty($errors1) ? "has error" : "no error") . "\n";
 
 // AUTO with EXCEPTION mode should store NON_TERM
 $context2 = stream_context_create([
@@ -27,8 +27,8 @@ try {
     fopen('php://nonexistent2', 'r', false, $context2);
 } catch (StreamException $e) {}
 
-$error2 = stream_get_last_error();
-echo "EXCEPTION mode AUTO: " . ($error2 ? "has error" : "no error") . "\n";
+$errors2 = stream_last_errors();
+echo "EXCEPTION mode AUTO: " . (!empty($errors2) ? "has error" : "no error") . "\n";
 
 // AUTO with SILENT mode should store ALL
 $context3 = stream_context_create([
@@ -39,8 +39,8 @@ $context3 = stream_context_create([
 ]);
 
 fopen('php://nonexistent3', 'r', false, $context3);
-$error3 = stream_get_last_error();
-echo "SILENT mode AUTO: " . ($error3 ? "has error" : "no error") . "\n";
+$errors3 = stream_last_errors();
+echo "SILENT mode AUTO: " . (!empty($errors3) ? "has error" : "no error") . "\n";
 
 ?>
 --EXPECTF--