Skip to content

Commit ebe1839

Browse files
GirgiasGirgias
committed
Add dedicated IO exceptions
1 parent 2d0291d commit ebe1839

11 files changed

+173
-5
lines changed

‎Zend/zend_exceptions.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ZEND_API zend_class_entry *zend_ce_value_error;
4242
ZEND_API zend_class_entry *zend_ce_arithmetic_error;
4343
ZEND_API zend_class_entry *zend_ce_division_by_zero_error;
4444
ZEND_API zend_class_entry *zend_ce_unhandled_match_error;
45+
ZEND_API zend_class_entry *zend_ce_io;
4546

4647
/* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does not* execute finally blocks. */
4748
static zend_class_entry zend_ce_unwind_exit;
@@ -783,6 +784,8 @@ void zend_register_default_exception(void) /* {{{ */
783784
INIT_CLASS_ENTRY(zend_ce_unwind_exit, "UnwindExit", NULL);
784785

785786
INIT_CLASS_ENTRY(zend_ce_graceful_exit, "GracefulExit", NULL);
787+
788+
zend_ce_io = register_class_IO(zend_ce_throwable);
786789
}
787790
/* }}} */
788791

‎Zend/zend_exceptions.stub.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,6 @@ class DivisionByZeroError extends ArithmeticError
156156
class UnhandledMatchError extends Error
157157
{
158158
}
159+
160+
interface IO extends Throwable {}
161+

‎Zend/zend_exceptions_arginfo.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 48d8444730a0e1fbc5d81965733deb3d3c11e122 */
2+
* Stub hash: a975a8c1ff566e589bc66f185dd0fb5aee2ffd57 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Throwable_getMessage, 0, 0, IS_STRING, 0)
55
ZEND_END_ARG_INFO()
@@ -187,6 +187,11 @@ static const zend_function_entry class_UnhandledMatchError_methods[] = {
187187
ZEND_FE_END
188188
};
189189

190+
191+
static const zend_function_entry class_IO_methods[] = {
192+
ZEND_FE_END
193+
};
194+
190195
static zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringable)
191196
{
192197
zend_class_entry ce, *class_entry;
@@ -395,3 +400,14 @@ static zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *cl
395400

396401
return class_entry;
397402
}
403+
404+
static zend_class_entry *register_class_IO(zend_class_entry *class_entry_Throwable)
405+
{
406+
zend_class_entry ce, *class_entry;
407+
408+
INIT_CLASS_ENTRY(ce, "IO", class_IO_methods);
409+
class_entry = zend_register_internal_interface(&ce);
410+
zend_class_implements(class_entry, 1, class_entry_Throwable);
411+
412+
return class_entry;
413+
}

‎ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,27 @@ $standard = new ReflectionExtension('standard');
88
var_dump($standard->getClassNames());
99
?>
1010
--EXPECT--
11-
array(4) {
11+
array(11) {
1212
[0]=>
1313
string(22) "__PHP_Incomplete_Class"
1414
[1]=>
1515
string(14) "AssertionError"
1616
[2]=>
17-
string(15) "php_user_filter"
17+
string(10) "FileSystem"
1818
[3]=>
19+
string(7) "Network"
20+
[4]=>
21+
string(15) "FileSystemError"
22+
[5]=>
23+
string(12) "FileNotFound"
24+
[6]=>
25+
string(12) "NotDirectory"
26+
[7]=>
27+
string(23) "InsufficientPermissions"
28+
[8]=>
29+
string(16) "TemporaryFailure"
30+
[9]=>
31+
string(15) "php_user_filter"
32+
[10]=>
1933
string(9) "Directory"
2034
}

‎ext/standard/basic_functions.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "ext/session/php_session.h"
3131
#include "zend_exceptions.h"
3232
#include "zend_operators.h"
33+
#include "io_exceptions.h"
3334
#include "ext/standard/php_dns.h"
3435
#include "ext/standard/php_uuencode.h"
3536
#include "ext/standard/php_mt_rand.h"
@@ -355,6 +356,8 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
355356
register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
356357
register_string_constants(INIT_FUNC_ARGS_PASSTHRU);
357358

359+
BASIC_MINIT_SUBMODULE(io_exceptions)
360+
358361
BASIC_MINIT_SUBMODULE(var)
359362
BASIC_MINIT_SUBMODULE(file)
360363
BASIC_MINIT_SUBMODULE(pack)

‎ext/standard/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
450450
http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
451451
var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
452452
filters.c proc_open.c streamsfuncs.c http.c password.c \
453-
random.c net.c hrtime.c crc32_x86.c,,,
453+
random.c net.c hrtime.c crc32_x86.c io_exceptions.c,,,
454454
-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
455455

456456
PHP_ADD_MAKEFILE_FRAGMENT

‎ext/standard/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
3535
url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
3636
php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
3737
user_filters.c uuencode.c filters.c proc_open.c password.c \
38-
streamsfuncs.c http.c flock_compat.c random.c hrtime.c", false /* never shared */,
38+
streamsfuncs.c http.c flock_compat.c random.c hrtime.c io_exceptions.c", false /* never shared */,
3939
'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
4040
PHP_STANDARD = "yes";
4141
ADD_MAKEFILE_FRAGMENT();

‎ext/standard/io_exceptions.c

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| Copyright (c) The PHP Group |
4+
+----------------------------------------------------------------------+
5+
| This source file is subject to version 3.01 of the PHP license, |
6+
| that is bundled with this package in the file LICENSE, and is |
7+
| available through the world-wide-web at the following url: |
8+
| http://www.php.net/license/3_01.txt |
9+
| If you did not receive a copy of the PHP license and are unable to |
10+
| obtain it through the world-wide-web, please send a note to |
11+
| [email protected] so we can mail you a copy immediately. |
12+
+----------------------------------------------------------------------+
13+
| Authors: George Peter Banyard <[email protected]> |
14+
+----------------------------------------------------------------------+
15+
*/
16+
17+
/* {{{ includes */
18+
#include "php.h"
19+
#include "zend_exceptions.h"
20+
#include "io_exceptions.h"
21+
#include "io_exceptions_arginfo.h"
22+
23+
/* Class entry pointers */
24+
PHPAPI zend_class_entry *zend_ce_filesystem;
25+
PHPAPI zend_class_entry *zend_ce_network;
26+
PHPAPI zend_class_entry *zend_ce_filesystem_error;
27+
PHPAPI zend_class_entry *zend_ce_insufficient_permissions;
28+
PHPAPI zend_class_entry *zend_ce_temporary_failure;
29+
30+
PHP_MINIT_FUNCTION(io_exceptions) {
31+
zend_class_entry ce;
32+
33+
/* Register interfaces */
34+
INIT_CLASS_ENTRY(ce, "FileSystem", class_FileSystem_methods);
35+
zend_ce_filesystem = zend_register_internal_interface(&ce);
36+
37+
INIT_CLASS_ENTRY(ce, "Network", class_Network_methods);
38+
zend_ce_network = zend_register_internal_interface(&ce);
39+
40+
/* Register exceptions */
41+
INIT_CLASS_ENTRY(ce, "FileSystemError", class_FileSystemError_methods);
42+
zend_ce_filesystem_error = zend_register_internal_class_ex(&ce, zend_ce_exception);
43+
zend_class_implements(zend_ce_filesystem_error, 1, zend_ce_filesystem);
44+
45+
INIT_CLASS_ENTRY(ce, "InsufficientPermissions", class_InsufficientPermissions_methods);
46+
zend_ce_insufficient_permissions = zend_register_internal_class_ex(&ce, zend_ce_exception);
47+
zend_class_implements(zend_ce_insufficient_permissions, 1, zend_ce_filesystem);
48+
49+
INIT_CLASS_ENTRY(ce, "TemporaryFailure", class_TemporaryFailure_methods);
50+
zend_ce_temporary_failure = zend_register_internal_class_ex(&ce, zend_ce_exception);
51+
zend_class_implements(zend_ce_temporary_failure, 1, zend_ce_network);
52+
53+
return SUCCESS;
54+
}

‎ext/standard/io_exceptions.h

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| Copyright (c) The PHP Group |
4+
+----------------------------------------------------------------------+
5+
| This source file is subject to version 3.01 of the PHP license, |
6+
| that is bundled with this package in the file LICENSE, and is |
7+
| available through the world-wide-web at the following url: |
8+
| http://www.php.net/license/3_01.txt |
9+
| If you did not receive a copy of the PHP license and are unable to |
10+
| obtain it through the world-wide-web, please send a note to |
11+
| [email protected] so we can mail you a copy immediately. |
12+
+----------------------------------------------------------------------+
13+
| Authors: George Peter Banyard <[email protected]> |
14+
+----------------------------------------------------------------------+
15+
*/
16+
17+
#ifndef PHP_IO_EXCEPTION
18+
#define PHP_IO_EXCEPTION
19+
20+
PHP_MINIT_FUNCTION(io_exceptions);
21+
22+
BEGIN_EXTERN_C()
23+
24+
extern PHPAPI zend_class_entry *zend_ce_filesystem;
25+
extern PHPAPI zend_class_entry *zend_ce_network;
26+
extern PHPAPI zend_class_entry *zend_ce_filesystem_error;
27+
extern PHPAPI zend_class_entry *zend_ce_insufficient_permissions;
28+
extern PHPAPI zend_class_entry *zend_ce_temporary_failure;
29+
30+
END_EXTERN_C()
31+
32+
#endif /* PHP_IO_EXCEPTION */

‎ext/standard/io_exceptions.stub.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
/** @generate-function-entries */
4+
5+
interface FileSystem extends IO {}
6+
7+
interface Network extends IO {}
8+
9+
/* Should use more specialized ones instead but for PoC will use this instead */
10+
class FileSystemError extends Exception implements FileSystem {}
11+
12+
class InsufficientPermissions extends Exception implements FileSystem {}
13+
14+
class TemporaryFailure extends Exception implements Network {}

‎ext/standard/io_exceptions_arginfo.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* This is a generated file, edit the .stub.php file instead.
2+
* Stub hash: 68880a94d8393c0d367cee9e9c18c8ac6d16d9f2 */
3+
4+
5+
6+
7+
static const zend_function_entry class_FileSystem_methods[] = {
8+
ZEND_FE_END
9+
};
10+
11+
12+
static const zend_function_entry class_Network_methods[] = {
13+
ZEND_FE_END
14+
};
15+
16+
17+
static const zend_function_entry class_FileSystemError_methods[] = {
18+
ZEND_FE_END
19+
};
20+
21+
22+
static const zend_function_entry class_InsufficientPermissions_methods[] = {
23+
ZEND_FE_END
24+
};
25+
26+
27+
static const zend_function_entry class_TemporaryFailure_methods[] = {
28+
ZEND_FE_END
29+
};

0 commit comments

Comments
 (0)