Skip to content

Commit 746c197

Browse files
committed
stream: rename terminal errors to terminating
1 parent 8832e8f commit 746c197

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

ext/standard/tests/streams/stream_errors_mix_modes_storage.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ stream_test_errors('ALL', [
7373
]
7474
]);
7575

76-
stream_test_errors('NON TERMINAL', [
76+
stream_test_errors('NON TERMINATING', [
7777
'stream' => [
7878
'error_mode' => StreamErrorMode::Silent,
79-
'error_store' => StreamErrorStore::NonTerminal,
79+
'error_store' => StreamErrorStore::NonTerminating,
8080
]
8181
]);
8282

83-
stream_test_errors('TERMINAL', [
83+
stream_test_errors('TERMINATING', [
8484
'stream' => [
8585
'error_mode' => StreamErrorMode::Silent,
86-
'error_store' => StreamErrorStore::Terminal,
86+
'error_store' => StreamErrorStore::Terminating,
8787
]
8888
]);
8989

@@ -113,7 +113,7 @@ Error details:
113113
[0] NotImplemented: TestStream::stream_cast is not implemented!
114114
[1] CastNotSupported: Cannot represent a stream of type user-space as a select()able descriptor
115115

116-
NON TERMINAL
116+
NON TERMINATING
117117
Error details:
118118
- Message: TestStream::stream_read - read 10 bytes more data than requested (8202 read, 8192 max) - excess data will be lost
119119
- Code: UserspaceInvalidReturn (161)
@@ -122,7 +122,7 @@ Error details:
122122
- Count: 1
123123
[0] UserspaceInvalidReturn: TestStream::stream_read - read 10 bytes more data than requested (8202 read, 8192 max) - excess data will be lost
124124

125-
TERMINAL
125+
TERMINATING
126126
Error details:
127127
- Message: TestStream::stream_cast is not implemented!
128128
- Code: NotImplemented (70)

main/streams/stream_errors.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ static int php_stream_get_error_store_mode(php_stream_context *context, int erro
112112
return php_stream_auto_decide_error_store_mode(error_mode);
113113
} else if (zend_string_equals_literal(case_name, "None")) {
114114
return PHP_STREAM_ERROR_STORE_NONE;
115-
} else if (zend_string_equals_literal(case_name, "NonTerminal")) {
115+
} else if (zend_string_equals_literal(case_name, "NonTerminating")) {
116116
return PHP_STREAM_ERROR_STORE_NON_TERM;
117-
} else if (zend_string_equals_literal(case_name, "Terminal")) {
117+
} else if (zend_string_equals_literal(case_name, "Terminating")) {
118118
return PHP_STREAM_ERROR_STORE_TERMINAL;
119119
} else if (zend_string_equals_literal(case_name, "All")) {
120120
return PHP_STREAM_ERROR_STORE_ALL;

main/streams/stream_errors.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ enum StreamErrorStore
3838
{
3939
case Auto;
4040
case None;
41-
case NonTerminal;
42-
case Terminal;
41+
case NonTerminating;
42+
case Terminating;
4343
case All;
4444
}
4545

main/streams/stream_errors_arginfo.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)