Skip to content
This repository was archived by the owner on Mar 29, 2024. It is now read-only.

Commit 7e11ab0

Browse files
pinepainpinepain
committed
Remove redundant ScriptOrigin is* methods, closes #61 
1 parent ea98957 commit 7e11ab0

7 files changed

+10
-143
lines changed

‎src/php_v8_message.cc

+2-49
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
101101
if (v8::Message::kNoColumnInfo != end_column) {
102102
zend_update_property_long(this_ce, return_value, ZEND_STRL("end_column"), static_cast<zend_long>(end_column));
103103
}
104-
105-
/* v8::Message::IsSharedCrossOrigin */
106-
zend_update_property_bool(this_ce, return_value, ZEND_STRL("is_shared_cross_origin"), static_cast<zend_bool>(message->IsSharedCrossOrigin()));
107-
/* v8::Message::IsOpaque */
108-
zend_update_property_bool(this_ce, return_value, ZEND_STRL("is_opaque"), static_cast<zend_bool>(message->IsOpaque()));
109104
}
110105

111106

@@ -123,13 +118,9 @@ static PHP_METHOD(Message, __construct) {
123118
zend_long start_column = -1;
124119
zend_long end_column = -1;
125120

126-
zend_bool is_shared_cross_origin = '\0';
127-
zend_bool is_opaque = '\0';
128-
129-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSoSo|lllllbb",
121+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSoSo|lllll",
130122
&message, &source_line, &script_origin, &resource_name, &stack_trace,
131-
&line_number, &start_position, &end_position, &start_column, &end_column,
132-
&is_shared_cross_origin, &is_opaque) == FAILURE) {
123+
&line_number, &start_position, &end_position, &start_column, &end_column) == FAILURE) {
133124
return;
134125
}
135126

@@ -154,9 +145,6 @@ static PHP_METHOD(Message, __construct) {
154145
if (end_column > 0) {
155146
zend_update_property_long(this_ce, getThis(), ZEND_STRL("end_column"), end_column);
156147
}
157-
158-
zend_update_property_bool(this_ce, getThis(), ZEND_STRL("is_shared_cross_origin"), is_shared_cross_origin);
159-
zend_update_property_bool(this_ce, getThis(), ZEND_STRL("is_opaque"), is_opaque);
160148
}
161149

162150
static PHP_METHOD(Message, get)
@@ -269,28 +257,6 @@ static PHP_METHOD(Message, getEndColumn)
269257
RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("end_column"), 0, &rv), 1, 0);
270258
}
271259

272-
static PHP_METHOD(Message, isSharedCrossOrigin)
273-
{
274-
zval rv;
275-
276-
if (zend_parse_parameters_none() == FAILURE) {
277-
return;
278-
}
279-
280-
RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("is_shared_cross_origin"), 0, &rv), 1, 0);
281-
}
282-
283-
static PHP_METHOD(Message, isOpaque)
284-
{
285-
zval rv;
286-
287-
if (zend_parse_parameters_none() == FAILURE) {
288-
return;
289-
}
290-
291-
RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("is_opaque"), 0, &rv), 1, 0);
292-
}
293-
294260
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 5)
295261
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
296262
ZEND_ARG_TYPE_INFO(0, source_line, IS_STRING, 0)
@@ -302,8 +268,6 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 5)
302268
ZEND_ARG_TYPE_INFO(0, end_position, IS_LONG, 1)
303269
ZEND_ARG_TYPE_INFO(0, start_column, IS_LONG, 1)
304270
ZEND_ARG_TYPE_INFO(0, end_column, IS_LONG, 1)
305-
ZEND_ARG_TYPE_INFO(0, is_shared_cross_origin, _IS_BOOL, 0)
306-
ZEND_ARG_TYPE_INFO(0, is_opaque, _IS_BOOL, 0)
307271
ZEND_END_ARG_INFO()
308272

309273
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get, ZEND_RETURN_VALUE, 0, IS_STRING, 0)
@@ -336,12 +300,6 @@ ZEND_END_ARG_INFO()
336300
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getEndColumn, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
337301
ZEND_END_ARG_INFO()
338302

339-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isSharedCrossOrigin, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
340-
ZEND_END_ARG_INFO()
341-
342-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isOpaque, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
343-
ZEND_END_ARG_INFO()
344-
345303

346304
static const zend_function_entry php_v8_message_methods[] = {
347305
PHP_V8_ME(Message, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
@@ -355,8 +313,6 @@ static const zend_function_entry php_v8_message_methods[] = {
355313
PHP_V8_ME(Message, getEndPosition, ZEND_ACC_PUBLIC)
356314
PHP_V8_ME(Message, getStartColumn, ZEND_ACC_PUBLIC)
357315
PHP_V8_ME(Message, getEndColumn, ZEND_ACC_PUBLIC)
358-
PHP_V8_ME(Message, isSharedCrossOrigin, ZEND_ACC_PUBLIC)
359-
PHP_V8_ME(Message, isOpaque, ZEND_ACC_PUBLIC)
360316

361317
PHP_FE_END
362318
};
@@ -379,8 +335,5 @@ PHP_MINIT_FUNCTION (php_v8_message) {
379335
zend_declare_property_null(this_ce, ZEND_STRL("start_column"), ZEND_ACC_PRIVATE);
380336
zend_declare_property_null(this_ce, ZEND_STRL("end_column"), ZEND_ACC_PRIVATE);
381337

382-
zend_declare_property_bool(this_ce, ZEND_STRL("is_shared_cross_origin"), static_cast<zend_bool>(false), ZEND_ACC_PRIVATE);
383-
zend_declare_property_bool(this_ce, ZEND_STRL("is_opaque"), static_cast<zend_bool>(false), ZEND_ACC_PRIVATE);
384-
385338
return SUCCESS;
386339
}

‎stubs/src/Message.php

+1-44
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ class Message
6060
* @var int|null
6161
*/
6262
private $end_column;
63-
/**
64-
* @var bool
65-
*/
66-
private $is_shared_cross_origin;
67-
/**
68-
* @var bool
69-
*/
70-
private $is_opaque;
7163

7264
/**
7365
* @param string $message
@@ -80,8 +72,6 @@ class Message
8072
* @param int $end_position
8173
* @param int $start_column
8274
* @param int $end_column
83-
* @param bool $is_shared_cross_origin
84-
* @param bool $is_opaque
8575
*/
8676
public function __construct(
8777
string $message,
@@ -93,22 +83,8 @@ public function __construct(
9383
?int $start_position = null,
9484
?int $end_position = null,
9585
?int $start_column = null,
96-
?int $end_column = null,
97-
bool $is_shared_cross_origin = false,
98-
bool $is_opaque = false
86+
?int $end_column = null
9987
) {
100-
$this->message = $message;
101-
$this->source_line = $source_line;
102-
$this->script_origin = $script_origin;
103-
$this->resource_name = $resource_name;
104-
$this->stack_trace = $stack_trace;
105-
$this->line_number = $line_number;
106-
$this->start_position = $start_position;
107-
$this->end_position = $end_position;
108-
$this->start_column = $start_column;
109-
$this->end_column = $end_column;
110-
$this->is_shared_cross_origin = $is_shared_cross_origin;
111-
$this->is_opaque = $is_opaque;
11288
}
11389

11490

@@ -120,8 +96,6 @@ public function get(): string
12096
}
12197

12298
/**
123-
* TODO: should be return simple string?
124-
*
12599
* @return string
126100
*/
127101
public function getSourceLine(): string
@@ -207,21 +181,4 @@ public function getStartColumn(): ?int
207181
public function getEndColumn(): ?int
208182
{
209183
}
210-
211-
/**
212-
* Passes on the value set by the embedder when it fed the script from which
213-
* this Message was generated to V8.
214-
*
215-
* @return bool
216-
*/
217-
public function isSharedCrossOrigin(): bool
218-
{
219-
}
220-
221-
/**
222-
* @return bool
223-
*/
224-
public function isOpaque(): bool
225-
{
226-
}
227184
}

‎tests/001-verify_extension_entities.phpt

+1-5
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,7 @@ class V8\Message
447447
private $end_position
448448
private $start_column
449449
private $end_column
450-
private $is_shared_cross_origin
451-
private $is_opaque
452-
public function __construct(string $message, string $source_line, V8\ScriptOrigin $script_origin, string $resource_name, V8\StackTrace $stack_trace, ?int $line_number, ?int $start_position, ?int $end_position, ?int $start_column, ?int $end_column, bool $is_shared_cross_origin, bool $is_opaque)
450+
public function __construct(string $message, string $source_line, V8\ScriptOrigin $script_origin, string $resource_name, V8\StackTrace $stack_trace, ?int $line_number, ?int $start_position, ?int $end_position, ?int $start_column, ?int $end_column)
453451
public function get(): string
454452
public function getSourceLine(): string
455453
public function getScriptOrigin(): V8\ScriptOrigin
@@ -460,8 +458,6 @@ class V8\Message
460458
public function getEndPosition(): ?int
461459
public function getStartColumn(): ?int
462460
public function getEndColumn(): ?int
463-
public function isSharedCrossOrigin(): bool
464-
public function isOpaque(): bool
465461

466462
class V8\StackFrame
467463
private $line_number

‎tests/ExceptionManager_createCreateMessage.phpt

+2-6
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,13 @@ V8\Message->getStartPosition(): int(231)
114114
V8\Message->getEndPosition(): int(232)
115115
V8\Message->getStartColumn(): int(8)
116116
V8\Message->getEndColumn(): int(9)
117-
V8\Message->isSharedCrossOrigin(): bool(false)
118-
V8\Message->isOpaque(): bool(false)
119117

120118
Message created from created value:
121119
-----------------------------------
122120
V8\Message->get(): string(13) "Uncaught test"
123121
V8\Message->getSourceLine(): string(24) " test(exception);"
124122
V8\Message->getScriptOrigin():
125-
object(V8\ScriptOrigin)#35 (6) {
123+
object(V8\ScriptOrigin)#33 (6) {
126124
["resource_name":"V8\ScriptOrigin":private]=>
127125
string(7) "test.js"
128126
["resource_line_offset":"V8\ScriptOrigin":private]=>
@@ -134,7 +132,7 @@ V8\Message->getScriptOrigin():
134132
["source_map_url":"V8\ScriptOrigin":private]=>
135133
string(0) ""
136134
["options":"V8\ScriptOrigin":private]=>
137-
object(V8\ScriptOriginOptions)#34 (1) {
135+
object(V8\ScriptOriginOptions)#32 (1) {
138136
["flags":"V8\ScriptOriginOptions":private]=>
139137
int(0)
140138
}
@@ -146,8 +144,6 @@ V8\Message->getStartPosition(): int(231)
146144
V8\Message->getEndPosition(): int(232)
147145
V8\Message->getStartColumn(): int(8)
148146
V8\Message->getEndColumn(): int(9)
149-
V8\Message->isSharedCrossOrigin(): bool(false)
150-
V8\Message->isOpaque(): bool(false)
151147

152148

153149
Checks on V8\ObjectValue:

‎tests/Message.phpt

+3-19
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ $helper->method_matches_with_output($obj, 'getStartPosition', null);
3333
$helper->method_matches_with_output($obj, 'getEndPosition', null);
3434
$helper->method_matches_with_output($obj, 'getStartColumn', null);
3535
$helper->method_matches_with_output($obj, 'getEndColumn', null);
36-
$helper->method_matches_with_output($obj, 'isSharedCrossOrigin', false);
37-
$helper->method_matches_with_output($obj, 'isOpaque', false);
3836
$helper->space();
3937

4038

41-
$obj = new V8\Message('message', 'source_line', $origin, 'resource_name', $trace, 1, 2, 3, 4, 5, true, true);
39+
$obj = new V8\Message('message', 'source_line', $origin, 'resource_name', $trace, 1, 2, 3, 4, 5);
4240

4341
$helper->header('Object representation');
4442
$helper->dump($obj);
@@ -55,15 +53,13 @@ $helper->method_matches_with_output($obj, 'getStartPosition', 2);
5553
$helper->method_matches_with_output($obj, 'getEndPosition', 3);
5654
$helper->method_matches_with_output($obj, 'getStartColumn', 4);
5755
$helper->method_matches_with_output($obj, 'getEndColumn', 5);
58-
$helper->method_matches_with_output($obj, 'isSharedCrossOrigin', true);
59-
$helper->method_matches_with_output($obj, 'isOpaque', true);
6056
$helper->space();
6157

6258
?>
6359
--EXPECT--
6460
Object representation (default):
6561
--------------------------------
66-
object(V8\Message)#7 (12) {
62+
object(V8\Message)#7 (10) {
6763
["message":"V8\Message":private]=>
6864
string(7) "message"
6965
["script_origin":"V8\Message":private]=>
@@ -104,10 +100,6 @@ object(V8\Message)#7 (12) {
104100
NULL
105101
["end_column":"V8\Message":private]=>
106102
NULL
107-
["is_shared_cross_origin":"V8\Message":private]=>
108-
bool(false)
109-
["is_opaque":"V8\Message":private]=>
110-
bool(false)
111103
}
112104

113105

@@ -123,13 +115,11 @@ V8\Message::getStartPosition() matches expected NULL
123115
V8\Message::getEndPosition() matches expected NULL
124116
V8\Message::getStartColumn() matches expected NULL
125117
V8\Message::getEndColumn() matches expected NULL
126-
V8\Message::isSharedCrossOrigin() matches expected false
127-
V8\Message::isOpaque() matches expected false
128118

129119

130120
Object representation:
131121
----------------------
132-
object(V8\Message)#8 (12) {
122+
object(V8\Message)#8 (10) {
133123
["message":"V8\Message":private]=>
134124
string(7) "message"
135125
["script_origin":"V8\Message":private]=>
@@ -170,10 +160,6 @@ object(V8\Message)#8 (12) {
170160
int(4)
171161
["end_column":"V8\Message":private]=>
172162
int(5)
173-
["is_shared_cross_origin":"V8\Message":private]=>
174-
bool(true)
175-
["is_opaque":"V8\Message":private]=>
176-
bool(true)
177163
}
178164

179165

@@ -189,5 +175,3 @@ V8\Message::getStartPosition() matches expected 2
189175
V8\Message::getEndPosition() matches expected 3
190176
V8\Message::getStartColumn() matches expected 4
191177
V8\Message::getEndColumn() matches expected 5
192-
V8\Message::isSharedCrossOrigin() matches expected true
193-
V8\Message::isOpaque() matches expected true

‎tests/ScriptOrigin.phpt

-15
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,6 @@ $helper->method_matches_with_output($obj, 'sourceMapUrl', '');
2626
$helper->method_matches_instanceof($obj, 'options', V8\ScriptOriginOptions::class);
2727
$helper->space();
2828

29-
$options = $obj->options();
30-
31-
$helper->header('Test options getters (default)');
32-
$helper->method_matches_with_output($options, 'isSharedCrossOrigin', false);
33-
$helper->method_matches_with_output($options, 'isOpaque', false);
34-
$helper->space();
35-
36-
37-
3829
$obj = new V8\ScriptOrigin('test', 1, 2, 3,'map', new \V8\ScriptOriginOptions());
3930

4031
$helper->header('Object representation');
@@ -84,12 +75,6 @@ V8\ScriptOrigin::sourceMapUrl() matches expected ''
8475
V8\ScriptOrigin::options() result is instance of V8\ScriptOriginOptions
8576

8677

87-
Test options getters (default):
88-
-------------------------------
89-
V8\ScriptOriginOptions::isSharedCrossOrigin() matches expected false
90-
V8\ScriptOriginOptions::isOpaque() matches expected false
91-
92-
9378
Object representation:
9479
----------------------
9580
object(V8\ScriptOrigin)#4 (6) {

‎tests/TryCatch.phpt

+1-5
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ object(V8\TryCatch)#11 (8) {
142142
}
143143
}
144144
["message":"V8\TryCatch":private]=>
145-
object(V8\Message)#6 (12) {
145+
object(V8\Message)#6 (10) {
146146
["message":"V8\Message":private]=>
147147
string(7) "message"
148148
["script_origin":"V8\Message":private]=>
@@ -183,10 +183,6 @@ object(V8\TryCatch)#11 (8) {
183183
NULL
184184
["end_column":"V8\Message":private]=>
185185
NULL
186-
["is_shared_cross_origin":"V8\Message":private]=>
187-
bool(false)
188-
["is_opaque":"V8\Message":private]=>
189-
bool(false)
190186
}
191187
["can_continue":"V8\TryCatch":private]=>
192188
bool(true)

0 commit comments

Comments
 (0)