Skip to content

Commit e729e8e

Browse files
committed
stream: drop error code category helpers
1 parent 1f7d321 commit e729e8e

File tree

5 files changed

+6
-176
lines changed

5 files changed

+6
-176
lines changed

ext/standard/tests/streams/stream_errors_error_code_helpers.phpt

Lines changed: 0 additions & 29 deletions
This file was deleted.

main/streams/stream_errors.c

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -902,82 +902,6 @@ PHP_METHOD(StreamException, getErrors)
902902
RETURN_COPY(errors);
903903
}
904904

905-
/* StreamErrorCode range helpers - case_id based */
906-
907-
static bool php_stream_error_code_in_range(zval *this_zv, int start, int end)
908-
{
909-
int case_id = zend_enum_fetch_case_id(Z_OBJ_P(this_zv));
910-
return case_id >= start && case_id < end;
911-
}
912-
913-
PHP_METHOD(StreamErrorCode, isIoError)
914-
{
915-
ZEND_PARSE_PARAMETERS_NONE();
916-
RETURN_BOOL(php_stream_error_code_in_range(ZEND_THIS, STREAM_EC_IO_START, STREAM_EC_IO_END));
917-
}
918-
919-
PHP_METHOD(StreamErrorCode, isFileSystemError)
920-
{
921-
ZEND_PARSE_PARAMETERS_NONE();
922-
RETURN_BOOL(php_stream_error_code_in_range(ZEND_THIS, STREAM_EC_FS_START, STREAM_EC_FS_END));
923-
}
924-
925-
PHP_METHOD(StreamErrorCode, isWrapperError)
926-
{
927-
ZEND_PARSE_PARAMETERS_NONE();
928-
RETURN_BOOL(php_stream_error_code_in_range(
929-
ZEND_THIS, STREAM_EC_WRAPPER_START, STREAM_EC_WRAPPER_END));
930-
}
931-
932-
PHP_METHOD(StreamErrorCode, isFilterError)
933-
{
934-
ZEND_PARSE_PARAMETERS_NONE();
935-
RETURN_BOOL(php_stream_error_code_in_range(
936-
ZEND_THIS, STREAM_EC_FILTER_START, STREAM_EC_FILTER_END));
937-
}
938-
939-
PHP_METHOD(StreamErrorCode, isCastError)
940-
{
941-
ZEND_PARSE_PARAMETERS_NONE();
942-
RETURN_BOOL(php_stream_error_code_in_range(
943-
ZEND_THIS, STREAM_EC_CAST_START, STREAM_EC_CAST_END));
944-
}
945-
946-
PHP_METHOD(StreamErrorCode, isNetworkError)
947-
{
948-
ZEND_PARSE_PARAMETERS_NONE();
949-
RETURN_BOOL(php_stream_error_code_in_range(
950-
ZEND_THIS, STREAM_EC_NETWORK_START, STREAM_EC_NETWORK_END));
951-
}
952-
953-
PHP_METHOD(StreamErrorCode, isEncodingError)
954-
{
955-
ZEND_PARSE_PARAMETERS_NONE();
956-
RETURN_BOOL(php_stream_error_code_in_range(
957-
ZEND_THIS, STREAM_EC_ENCODING_START, STREAM_EC_ENCODING_END));
958-
}
959-
960-
PHP_METHOD(StreamErrorCode, isResourceError)
961-
{
962-
ZEND_PARSE_PARAMETERS_NONE();
963-
RETURN_BOOL(php_stream_error_code_in_range(
964-
ZEND_THIS, STREAM_EC_RESOURCE_START, STREAM_EC_RESOURCE_END));
965-
}
966-
967-
PHP_METHOD(StreamErrorCode, isLockError)
968-
{
969-
ZEND_PARSE_PARAMETERS_NONE();
970-
RETURN_BOOL(php_stream_error_code_in_range(
971-
ZEND_THIS, STREAM_EC_LOCK_START, STREAM_EC_LOCK_END));
972-
}
973-
974-
PHP_METHOD(StreamErrorCode, isUserspaceError)
975-
{
976-
ZEND_PARSE_PARAMETERS_NONE();
977-
RETURN_BOOL(php_stream_error_code_in_range(
978-
ZEND_THIS, STREAM_EC_USERSPACE_START, STREAM_EC_USERSPACE_END));
979-
}
980-
981905
/* Module init */
982906

983907
PHP_MINIT_FUNCTION(stream_errors)

main/streams/stream_errors.stub.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,26 +105,6 @@ enum StreamErrorCode
105105
case UserspaceNotImplemented;
106106
case UserspaceInvalidReturn;
107107
case UserspaceCallFailed;
108-
109-
public function isIoError(): bool {}
110-
111-
public function isFileSystemError(): bool {}
112-
113-
public function isWrapperError(): bool {}
114-
115-
public function isFilterError(): bool {}
116-
117-
public function isCastError(): bool {}
118-
119-
public function isNetworkError(): bool {}
120-
121-
public function isEncodingError(): bool {}
122-
123-
public function isResourceError(): bool {}
124-
125-
public function isLockError(): bool {}
126-
127-
public function isUserspaceError(): bool {}
128108
}
129109

130110
enum StreamErrorMode

main/streams/stream_errors_arginfo.h

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

main/streams/stream_errors_decl.h

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

0 commit comments

Comments
 (0)