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

Commit dd82d16

Browse files
pinepainpinepain
committed
Cleanup ScriptOrigin and ScriptOriginOptions stubs and test
1 parent 89ded89 commit dd82d16

File tree

3 files changed

+102
-57
lines changed

3 files changed

+102
-57
lines changed

‎stubs/src/ScriptOrigin.php

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,55 +58,53 @@ class ScriptOrigin
5858
* @param bool $is_wasm
5959
* @param bool $is_module
6060
*/
61-
public function __construct(string $resource_name,
62-
int $resource_line_offset = Message::kNoLineNumberInfo,
63-
int $resource_column_offset = Message::kNoColumnInfo,
64-
bool $resource_is_shared_cross_origin = false,
65-
int $script_id = Message::kNoScriptIdInfo,
66-
string $source_map_url = '',
67-
bool $resource_is_opaque = false,
68-
bool $is_wasm = false,
69-
bool $is_module = false)
70-
{
71-
$this->resource_name = $resource_name;
72-
$this->resource_line_offset = $resource_line_offset;
61+
public function __construct(
62+
string $resource_name,
63+
int $resource_line_offset = Message::kNoLineNumberInfo,
64+
int $resource_column_offset = Message::kNoColumnInfo,
65+
bool $resource_is_shared_cross_origin = false,
66+
int $script_id = Message::kNoScriptIdInfo,
67+
string $source_map_url = '',
68+
bool $resource_is_opaque = false,
69+
bool $is_wasm = false,
70+
bool $is_module = false
71+
) {
72+
$this->resource_name = $resource_name;
73+
$this->resource_line_offset = $resource_line_offset;
7374
$this->resource_column_offset = $resource_column_offset;
7475

7576
$this->options = new ScriptOriginOptions($resource_is_shared_cross_origin, $resource_is_opaque, $is_wasm, $is_module);
7677

77-
$this->script_id = $script_id;
78+
$this->script_id = $script_id;
7879
$this->source_map_url = $source_map_url;
7980
}
8081

81-
public function ResourceName() : int
82+
public function ResourceName(): string
8283
{
8384
return $this->resource_name;
8485
}
8586

86-
public function ResourceLineOffset() : int
87+
public function ResourceLineOffset(): int
8788
{
8889
return $this->resource_line_offset;
8990
}
9091

91-
public function ResourceColumnOffset() : int
92+
public function ResourceColumnOffset(): int
9293
{
9394
return $this->resource_column_offset;
9495
}
9596

96-
public function ScriptID() : int
97+
public function ScriptID(): int
9798
{
9899
return $this->script_id;
99100
}
100101

101-
/**
102-
* @return string
103-
*/
104-
public function SourceMapUrl() : string
102+
public function SourceMapUrl(): string
105103
{
106104
return $this->source_map_url;
107105
}
108106

109-
public function Options() : ScriptOriginOptions
107+
public function Options(): ScriptOriginOptions
110108
{
111109
return $this->options;
112110
}

‎stubs/src/ScriptOriginOptions.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,46 +44,46 @@ class ScriptOriginOptions
4444
* @param bool $is_wasm
4545
* @param bool $is_module
4646
*/
47-
public function __construct(bool $is_shared_cross_origin = false,
48-
bool $is_opaque = false,
49-
bool $is_wasm = false,
50-
bool $is_module = false
51-
)
52-
{
47+
public function __construct(
48+
bool $is_shared_cross_origin = false,
49+
bool $is_opaque = false,
50+
bool $is_wasm = false,
51+
bool $is_module = false
52+
) {
5353
$this->is_shared_cross_origin = $is_shared_cross_origin;
54-
$this->is_opaque = $is_opaque;
55-
$this->is_wasm = $is_wasm;
56-
$this->is_module = $is_module;
54+
$this->is_opaque = $is_opaque;
55+
$this->is_wasm = $is_wasm;
56+
$this->is_module = $is_module;
5757
}
5858

5959
/**
6060
* @return bool
6161
*/
62-
public function IsSharedCrossOrigin() : bool
62+
public function IsSharedCrossOrigin(): bool
6363
{
6464
return $this->is_shared_cross_origin;
6565
}
6666

6767
/**
6868
* @return bool
6969
*/
70-
public function IsOpaque() : bool
70+
public function IsOpaque(): bool
7171
{
7272
return $this->is_opaque;
7373
}
7474

7575
/**
7676
* @return bool
7777
*/
78-
public function isIsWasm(): bool
78+
public function IsWasm(): bool
7979
{
8080
return $this->is_wasm;
8181
}
8282

8383
/**
8484
* @return bool
8585
*/
86-
public function isIsModule(): bool
86+
public function IsModule(): bool
8787
{
8888
return $this->is_module;
8989
}

‎tests/V8ScriptOrigin.phpt

Lines changed: 69 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,30 @@ $helper->method_matches_with_output($options, 'IsOpaque', false);
3232
$helper->space();
3333

3434

35-
$obj = new V8\ScriptOrigin('test', 1, 2, true, 3, 'map', true);
36-
//
37-
//$helper->header('Object representation');
38-
//$helper->dump($obj);
39-
//$helper->space();
40-
//
41-
//$helper->header('Test getters');
42-
//
43-
//$helper->method_matches_with_output($obj, 'ResourceName', 'test');
44-
//$helper->method_matches_with_output($obj, 'ResourceLineOffset', 1);
45-
//$helper->method_matches_with_output($obj, 'ResourceColumnOffset', 2);
46-
//$helper->method_matches_with_output($obj, 'ScriptID', 3);
47-
//$helper->method_matches_with_output($obj, 'SourceMapUrl', 'map');
48-
//$helper->method_matches_instanceof($obj, 'Options', V8\ScriptOriginOptions::class);
49-
//$helper->space();
50-
//
51-
//$options = $obj->Options();
52-
//
53-
//$helper->header('Test options getters');
54-
//$helper->method_matches_with_output($options, 'IsSharedCrossOrigin', true);
55-
//$helper->method_matches_with_output($options, 'IsOpaque', true);
56-
//$helper->space();
35+
$obj = new V8\ScriptOrigin('test', 1, 2, true, 3, 'map', true, true, true);
36+
37+
$helper->header('Object representation');
38+
$helper->dump($obj);
39+
$helper->space();
40+
41+
$helper->header('Test getters');
42+
43+
$helper->method_matches_with_output($obj, 'ResourceName', 'test');
44+
$helper->method_matches_with_output($obj, 'ResourceLineOffset', 1);
45+
$helper->method_matches_with_output($obj, 'ResourceColumnOffset', 2);
46+
$helper->method_matches_with_output($obj, 'ScriptID', 3);
47+
$helper->method_matches_with_output($obj, 'SourceMapUrl', 'map');
48+
$helper->method_matches_instanceof($obj, 'Options', V8\ScriptOriginOptions::class);
49+
$helper->space();
50+
51+
$options = $obj->Options();
52+
53+
$helper->header('Test options getters');
54+
$helper->method_matches_with_output($options, 'IsSharedCrossOrigin', true);
55+
$helper->method_matches_with_output($options, 'IsOpaque', true);
56+
$helper->method_matches_with_output($options, 'IsWasm', true);
57+
$helper->method_matches_with_output($options, 'IsModule', true);
58+
$helper->space();
5759

5860
?>
5961
--EXPECT--
@@ -98,3 +100,48 @@ Test options getters (default):
98100
-------------------------------
99101
V8\ScriptOriginOptions::IsSharedCrossOrigin() matches expected false
100102
V8\ScriptOriginOptions::IsOpaque() matches expected false
103+
104+
105+
Object representation:
106+
----------------------
107+
object(V8\ScriptOrigin)#4 (6) {
108+
["resource_name":"V8\ScriptOrigin":private]=>
109+
string(4) "test"
110+
["resource_line_offset":"V8\ScriptOrigin":private]=>
111+
int(1)
112+
["resource_column_offset":"V8\ScriptOrigin":private]=>
113+
int(2)
114+
["options":"V8\ScriptOrigin":private]=>
115+
object(V8\ScriptOriginOptions)#5 (4) {
116+
["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
117+
bool(true)
118+
["is_opaque":"V8\ScriptOriginOptions":private]=>
119+
bool(true)
120+
["is_wasm":"V8\ScriptOriginOptions":private]=>
121+
bool(true)
122+
["is_module":"V8\ScriptOriginOptions":private]=>
123+
bool(true)
124+
}
125+
["script_id":"V8\ScriptOrigin":private]=>
126+
int(3)
127+
["source_map_url":"V8\ScriptOrigin":private]=>
128+
string(3) "map"
129+
}
130+
131+
132+
Test getters:
133+
-------------
134+
V8\ScriptOrigin::ResourceName() matches expected 'test'
135+
V8\ScriptOrigin::ResourceLineOffset() matches expected 1
136+
V8\ScriptOrigin::ResourceColumnOffset() matches expected 2
137+
V8\ScriptOrigin::ScriptID() matches expected 3
138+
V8\ScriptOrigin::SourceMapUrl() matches expected 'map'
139+
V8\ScriptOrigin::Options() result is instance of V8\ScriptOriginOptions
140+
141+
142+
Test options getters:
143+
---------------------
144+
V8\ScriptOriginOptions::IsSharedCrossOrigin() matches expected true
145+
V8\ScriptOriginOptions::IsOpaque() matches expected true
146+
V8\ScriptOriginOptions::IsWasm() matches expected true
147+
V8\ScriptOriginOptions::IsModule() matches expected true

0 commit comments

Comments
 (0)