Skip to content

Commit 5deebb8

Browse files
robocoderrobocoder
committed
remove $legacy from constructors
1 parent 4e171e6 commit 5deebb8

File tree

9 files changed

+202
-99
lines changed

9 files changed

+202
-99
lines changed

‎lib/WebDriver/AbstractWebDriver.php‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ abstract class AbstractWebDriver
4141
*/
4242
protected $url;
4343

44-
/**
45-
* @var boolean
46-
*/
47-
protected $legacy = false;
48-
4944
/**
5045
* Curl service
5146
*
@@ -80,13 +75,11 @@ protected function obsoleteMethods()
8075
/**
8176
* Constructor
8277
*
83-
* @param string $url URL to Selenium server
84-
* @param boolean $legacy Is legacy driver?
78+
* @param string $url URL to Selenium server
8579
*/
86-
public function __construct($url = 'http://localhost:4444/wd/hub', $legacy = false)
80+
public function __construct($url = 'http://localhost:4444/wd/hub')
8781
{
8882
$this->url = $url;
89-
$this->legacy = $legacy;
9083
$this->transientOptions = array();
9184
$this->curlService = ServiceFactory::getInstance()->getService('service.curl');
9285
}
@@ -149,16 +142,6 @@ public function getTransientOptions()
149142
return $this->transientOptions;
150143
}
151144

152-
/**
153-
* Is legacy driver?
154-
*
155-
* @return boolean
156-
*/
157-
public function isLegacy()
158-
{
159-
return $this->legacy;
160-
}
161-
162145
/**
163146
* Curl request to webdriver server.
164147
*

‎lib/WebDriver/Container.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ abstract class Container extends AbstractWebDriver
4141
/**
4242
* {@inheritdoc}
4343
*/
44-
public function __construct($url, $legacy)
44+
public function __construct($url)
4545
{
46-
parent::__construct($url, $legacy);
46+
parent::__construct($url);
4747

4848
$locatorStrategy = new \ReflectionClass('WebDriver\LocatorStrategy');
4949
$this->strategies = $locatorStrategy->getConstants();
@@ -210,18 +210,20 @@ public function locate($using, $value)
210210
protected function webDriverElement($value)
211211
{
212212
if (array_key_exists(LegacyElement::LEGACY_ELEMENT_ID, (array) $value)) {
213+
$identifier = $value[LegacyElement::LEGACY_ELEMENT_ID];
214+
213215
return new LegacyElement(
214-
$this->getElementPath($value[LegacyElement::LEGACY_ELEMENT_ID]), // url
215-
$value[LegacyElement::LEGACY_ELEMENT_ID], // id
216-
$this->legacy
216+
$this->getElementPath($identifier),
217+
$identifier
217218
);
218219
}
219220

220221
if (array_key_exists(Element::WEB_ELEMENT_ID, (array) $value)) {
222+
$identifier = $value[Element::WEB_ELEMENT_ID];
223+
221224
return new Element(
222-
$this->getElementPath($value[Element::WEB_ELEMENT_ID]), // url
223-
$value[Element::WEB_ELEMENT_ID], // id
224-
$this->legacy
225+
$this->getElementPath($identifier),
226+
$identifier
225227
);
226228
}
227229

‎lib/WebDriver/Element.php‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ class Element extends Container
5151
{
5252
const WEB_ELEMENT_ID = 'element-6066-11e4-a52e-4f735466cecf';
5353

54+
/**
55+
* Element ID
56+
*
57+
* @var string
58+
*/
59+
private $id;
60+
5461
/**
5562
* {@inheritdoc}
5663
*/
@@ -97,23 +104,15 @@ protected function obsoleteMethods()
97104
);
98105
}
99106

100-
/**
101-
* Element ID
102-
*
103-
* @var string
104-
*/
105-
private $id;
106-
107107
/**
108108
* Constructor
109109
*
110-
* @param string $url URL
111-
* @param string $id element ID
112-
* @param boolean $legacy Is legacy?
110+
* @param string $url URL
111+
* @param string $id element ID
113112
*/
114-
public function __construct($url, $id, $legacy)
113+
public function __construct($url, $id)
115114
{
116-
parent::__construct($url, $legacy);
115+
parent::__construct($url);
117116

118117
$this->id = $id;
119118
}
@@ -147,8 +146,7 @@ public function shadow()
147146

148147
return new Shadow(
149148
preg_replace('/element/' . preg_quote($this->id, '/') . '$/', '/', $this->url), // remove /element/:elementid
150-
$shadowRootReference,
151-
$this->legacy
149+
$shadowRootReference
152150
);
153151
}
154152

‎lib/WebDriver/Execute.php‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @package WebDriver
2929
*/
30-
final class Execute extends AbstractWebDriver
30+
class Execute extends AbstractWebDriver
3131
{
3232
/**
3333
* {@inheritdoc}
@@ -48,7 +48,7 @@ public function async(array $jsonScript)
4848
{
4949
$jsonScript['args'] = $this->serializeArguments($jsonScript['args']);
5050

51-
$result = $this->curl('POST', '/execute_async', $jsonScript);
51+
$result = $this->curl('POST', '/async', $jsonScript);
5252

5353
return $this->unserializeResult($result['value']);
5454
}
@@ -64,7 +64,7 @@ public function sync(array $jsonScript)
6464
{
6565
$jsonScript['args'] = $this->serializeArguments($jsonScript['args']);
6666

67-
$result = $this->curl('POST', '/execute', $jsonScript);
67+
$result = $this->curl('POST', '/sync', $jsonScript);
6868

6969
return $this->unserializeResult($result['value']);
7070
}
@@ -78,7 +78,7 @@ public function sync(array $jsonScript)
7878
*
7979
* @return array
8080
*/
81-
private function serializeArguments(array $arguments)
81+
protected function serializeArguments(array $arguments)
8282
{
8383
foreach ($arguments as $key => $value) {
8484
switch (true) {
@@ -110,7 +110,7 @@ private function serializeArguments(array $arguments)
110110
*
111111
* @return mixed
112112
*/
113-
private function unserializeResult($result)
113+
protected function unserializeResult($result)
114114
{
115115
$element = is_array($result) ? $this->webDriverElement($result) : null;
116116

@@ -136,29 +136,30 @@ private function unserializeResult($result)
136136
*/
137137
protected function webDriverElement($value)
138138
{
139-
$basePath = preg_replace('~/execute$~', '', $this->url);
140-
141139
if (array_key_exists(LegacyElement::LEGACY_ELEMENT_ID, $value)) {
140+
$identifier = $value[LegacyElement::LEGACY_ELEMENT_ID];
141+
142142
return new LegacyElement(
143-
$basePath . '/element/' . $value[LegacyElement::LEGACY_ELEMENT_ID], // url
144-
$value[LegacyElement::LEGACY_ELEMENT_ID], // id
145-
$this->legacy
143+
$this->getElementPath('/element/' . $identifier),
144+
$identifier
146145
);
147146
}
148147

149148
if (array_key_exists(Element::WEB_ELEMENT_ID, $value)) {
149+
$identifier = $value[Element::WEB_ELEMENT_ID];
150+
150151
return new Element(
151-
$basePath . '/element/' . $value[Element::WEB_ELEMENT_ID], // url
152-
$value[Element::WEB_ELEMENT_ID], // id
153-
$this->legacy
152+
$this->getElementPath('/element/' . $identifier),
153+
$identifier
154154
);
155155
}
156156

157157
if (array_key_exists(Shadow::SHADOW_ROOT_ID, $value)) {
158+
$identifier = $value[Shadow::SHADOW_ROOT_ID];
159+
158160
return new Shadow(
159-
$basePath . '/shadow/' . $value[Shadow::SHADOW_ROOT_ID], // url
160-
$value[Shadow::SHADOW_ROOT_ID], // id
161-
$this->legacy
161+
$this->getElementPath('/shadow/' . $identifier),
162+
$identifier
162163
);
163164
}
164165

@@ -168,8 +169,8 @@ protected function webDriverElement($value)
168169
/**
169170
* {@inheritdoc}
170171
*/
171-
protected function getElementPath($unused)
172+
protected function getElementPath($identifier)
172173
{
173-
return $this->url;
174+
return preg_replace('~/execute$~', '', $this->url) . $identifier;
174175
}
175176
}

‎lib/WebDriver/LegacyExecute.php‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
3+
/**
4+
* Copyright 2022-2022 Anthon Pang. All Rights Reserved.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* @package WebDriver
19+
*
20+
* @author Anthon Pang <apang@softwaredevelopment.ca>
21+
*/
22+
23+
namespace WebDriver;
24+
25+
/**
26+
* WebDriver\LegacyExecute class
27+
*
28+
* @package WebDriver
29+
*/
30+
class LegacyExecute extends Execute
31+
{
32+
/**
33+
* {@inheritdoc}
34+
*/
35+
protected function methods()
36+
{
37+
return array();
38+
}
39+
40+
/**
41+
* Inject a snippet of JavaScript into the page for execution in the context of the currently selected frame. (asynchronous)
42+
*
43+
* @param array{script: string, args: array} $jsonScript
44+
*
45+
* @return mixed
46+
*/
47+
public function async(array $jsonScript)
48+
{
49+
$jsonScript['args'] = $this->serializeArguments($jsonScript['args']);
50+
51+
$result = $this->curl('POST', '/execute_async', $jsonScript);
52+
53+
return $this->unserializeResult($result['value']);
54+
}
55+
56+
/**
57+
* Inject a snippet of JavaScript into the page for execution in the context of the currently selected frame. (synchronous)
58+
*
59+
* @param array{script: string, args: array} $jsonScript
60+
*
61+
* @return mixed
62+
*/
63+
public function sync(array $jsonScript)
64+
{
65+
$jsonScript['args'] = $this->serializeArguments($jsonScript['args']);
66+
67+
$result = $this->curl('POST', '/execute', $jsonScript);
68+
69+
return $this->unserializeResult($result['value']);
70+
}
71+
72+
/**
73+
* {@inheritdoc}
74+
*/
75+
protected function getElementPath($identifier)
76+
{
77+
return $this->url . $identifier;
78+
}
79+
}

‎lib/WebDriver/LegacyWindow.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ public function getHandle()
7979
/**
8080
* Constructor
8181
*
82-
* @param string $url URL
83-
* @param string $windowHandle Window handle
84-
* @param boolean $legacy Is legacy?
82+
* @param string $url URL
83+
* @param string $windowHandle Window handle
8584
*/
86-
public function __construct($url, $windowHandle, $legacy = true)
85+
public function __construct($url, $windowHandle)
8786
{
8887
$this->windowHandle = $windowHandle;
8988

90-
parent::__construct($url . '/' . $windowHandle, $legacy);
89+
parent::__construct($url . '/' . $windowHandle);
9190
}
9291
}

0 commit comments

Comments
 (0)