Skip to content

Commit 70a5fd3

Browse files
robocoderrobocoder
committed
Refs #86 change order of constructor params
1 parent e0d07cf commit 70a5fd3

File tree

7 files changed

+38
-37
lines changed

7 files changed

+38
-37
lines changed

‎lib/WebDriver/AbstractWebDriver.php‎

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

43+
/**
44+
* @var boolean
45+
*/
46+
private $w3c;
47+
4348
/**
4449
* Curl service
4550
*
@@ -54,11 +59,6 @@ abstract class AbstractWebDriver
5459
*/
5560
private $transientOptions;
5661

57-
/**
58-
* @var boolean
59-
*/
60-
private $w3c;
61-
6262
/**
6363
* Return array of supported method names and corresponding HTTP request methods
6464
*
@@ -79,10 +79,10 @@ protected function obsoleteMethods()
7979
/**
8080
* Constructor
8181
*
82-
* @param boolean $w3c Is w3c driver?
8382
* @param string $url URL to Selenium server
83+
* @param boolean $w3c Is w3c driver?
8484
*/
85-
public function __construct($w3c, $url = 'http://localhost:4444/wd/hub')
85+
public function __construct($url = 'http://localhost:4444/wd/hub', $w3c = false)
8686
{
8787
$this->url = $url;
8888
$this->w3c = $w3c;

‎lib/WebDriver/Container.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ abstract class Container extends AbstractWebDriver
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function __construct($w3c, $url = 'http://localhost:4444/wd/hub')
41+
public function __construct($url = 'http://localhost:4444/wd/hub', $w3c = false)
4242
{
43-
parent::__construct($w3c, $url);
43+
parent::__construct($url, $w3c);
4444

4545
$locatorStrategy = new \ReflectionClass('WebDriver\LocatorStrategy');
4646
$this->strategies = $locatorStrategy->getConstants();
@@ -208,17 +208,17 @@ protected function webDriverElement($value)
208208
{
209209
if (array_key_exists(self::LEGACY_ELEMENT_ID, (array) $value)) {
210210
return new Element(
211-
$this->w3c,
212211
$this->getElementPath($value[self::LEGACY_ELEMENT_ID]), // url
213-
$value[self::LEGACY_ELEMENT_ID] // id
212+
$value[self::LEGACY_ELEMENT_ID], // id
213+
$this->w3c
214214
);
215215
}
216216

217217
if (array_key_exists(self::WEBDRIVER_ELEMENT_ID, (array) $value)) {
218218
return new Element(
219-
$this->w3c,
220219
$this->getElementPath($value[self::WEBDRIVER_ELEMENT_ID]), // url
221-
$value[self::WEBDRIVER_ELEMENT_ID] // id
220+
$value[self::WEBDRIVER_ELEMENT_ID], // id
221+
$this->w3c
222222
);
223223
}
224224
}

‎lib/WebDriver/Element.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ protected function obsoleteMethods()
104104
/**
105105
* Constructor
106106
*
107-
* @param boolean $w3c Is w3c?
108107
* @param string $url URL
109108
* @param string $id element ID
109+
* @param boolean $w3c Is w3c?
110110
*/
111-
public function __construct($w3c, $url, $id)
111+
public function __construct($url, $id, $w3c = false)
112112
{
113-
parent::__construct($w3c, $url);
113+
parent::__construct($url, $w3c);
114114

115115
$this->id = $id;
116116
}

‎lib/WebDriver/LegacyWindow.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ public function getHandle()
7878
/**
7979
* Constructor
8080
*
81-
* @param boolean $w3c Is W3C?
8281
* @param string $url URL
8382
* @param string $windowHandle Window handle
83+
* @param boolean $w3c Is W3C?
8484
*/
85-
public function __construct($w3c, $url, $windowHandle)
85+
public function __construct($url, $windowHandle, $w3c = false)
8686
{
8787
$this->windowHandle = $windowHandle;
8888

89-
parent::__construct($w3c, $url . '/' . $windowHandle);
89+
parent::__construct($url . '/' . $windowHandle, $w3c);
9090
}
9191
}

‎lib/WebDriver/Session.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public function window()
237237
return call_user_func_array(array($this, 'legacyWindow'), func_get_args());
238238
}
239239

240-
return new Window($this->w3c, $this->url . '/window');
240+
return new Window($this->url . '/window', $this->w3c);
241241
}
242242

243243
/**
@@ -267,7 +267,7 @@ public function legacyWindow()
267267
}
268268

269269
// chaining
270-
return new LegacyWindow($this->w3c, $this->url . '/window', $arg);
270+
return new LegacyWindow($this->url . '/window', $arg, $this->w3c);
271271
}
272272

273273
/**
@@ -314,7 +314,7 @@ public function frame()
314314
}
315315

316316
// chaining
317-
return new Frame($this->w3c, $this->url . '/frame');
317+
return new Frame($this->url . '/frame', $this->w3c);
318318
}
319319

320320
/**
@@ -347,7 +347,7 @@ public function timeouts()
347347
}
348348

349349
// chaining
350-
return new Timeouts($this->w3c, $this->url . '/timeouts');
350+
return new Timeouts($this->url . '/timeouts', $this->w3c);
351351
}
352352

353353
/**
@@ -358,7 +358,7 @@ public function timeouts()
358358
*/
359359
public function ime()
360360
{
361-
return new Ime($this->w3c, $this->url . '/ime');
361+
return new Ime($this->url . '/ime', $this->w3c);
362362
}
363363

364364
/**
@@ -383,7 +383,7 @@ public function activeElement()
383383
*/
384384
public function touch()
385385
{
386-
return new Touch($this->w3c, $this->url . '/touch');
386+
return new Touch($this->url . '/touch', $this->w3c);
387387
}
388388

389389
/**
@@ -394,7 +394,7 @@ public function touch()
394394
*/
395395
public function local_storage()
396396
{
397-
return Storage::factory('local', $this->url . '/local_storage');
397+
return Storage::factory('local', $this->url . '/local_storage', $this->w3c);
398398
}
399399

400400
/**
@@ -405,7 +405,7 @@ public function local_storage()
405405
*/
406406
public function session_storage()
407407
{
408-
return Storage::factory('session', $this->url . '/session_storage');
408+
return Storage::factory('session', $this->url . '/session_storage', $this->w3c);
409409
}
410410

411411
/**
@@ -416,7 +416,7 @@ public function session_storage()
416416
*/
417417
public function application_cache()
418418
{
419-
return new ApplicationCache($this->w3c, $this->url . '/application_cache');
419+
return new ApplicationCache($this->url . '/application_cache', $this->w3c);
420420
}
421421

422422
/**
@@ -444,7 +444,7 @@ public function log()
444444
}
445445

446446
// chaining
447-
return new Log($this->w3c, $this->url . '/log');
447+
return new Log($this->url . '/log', $this->w3c);
448448
}
449449

450450
/**
@@ -455,7 +455,7 @@ public function log()
455455
*/
456456
public function alert()
457457
{
458-
return new Alert($this->w3c, $this->url . '/alert');
458+
return new Alert($this->url . '/alert', $this->w3c);
459459
}
460460

461461
/**
@@ -474,7 +474,7 @@ public function execute()
474474
return $result['value'];
475475
}
476476

477-
return new Execute($this->w3c, $this->url . '/execute');
477+
return new Execute($this->url . '/execute', $this->w3c);
478478
}
479479

480480
/**

‎lib/WebDriver/Storage.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,13 @@ public function delete()
124124
/**
125125
* Factory method to create Storage objects
126126
*
127-
* @param string $type 'local' or 'session' storage
128-
* @param string $url URL
127+
* @param string $type 'local' or 'session' storage
128+
* @param string $url URL
129+
* @param boolean $w3c Is W3C?
129130
*
130131
* @return \WebDriver\Storage
131132
*/
132-
public static function factory($type, $url)
133+
public static function factory($type, $url, $w3c = false)
133134
{
134135
// dynamically define custom storage classes
135136
$className = ucfirst(strtolower($type));
@@ -141,6 +142,6 @@ public static function factory($type, $url)
141142
);
142143
}
143144

144-
return new $namespacedClassName($this->w3c, $url);
145+
return new $namespacedClassName($url, $w3c);
145146
}
146147
}

‎lib/WebDriver/WebDriver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
7373
$capabilities = isset($result['value']['capabilities']) ? $result['value']['capabilities'] : null;
7474
$this->w3c = !! $capabilities;
7575

76-
$session = new Session($this->w3c, $result['sessionUrl']);
76+
$session = new Session($result['sessionUrl'], $this->w3c);
7777
$session->setCapabilities($capabilities);
7878

7979
return $session;
@@ -89,7 +89,7 @@ public function sessions()
8989

9090
// @todo initialize $this->w3c if sessions() is called before session()
9191
foreach ($result['value'] as $session) {
92-
$sessions[] = new Session($this->w3c, $this->url . '/session/' . $session['id']);
92+
$sessions[] = new Session($this->url . '/session/' . $session['id'], $this->w3c);
9393
}
9494

9595
return $sessions;

0 commit comments

Comments
 (0)