Skip to content

Commit 7b00cc1

Browse files
authored
Merge pull request php-webdriver#1069 from php-webdriver/fix/chromedriver-path
Fix path to chromedriver in tests on latest Ubuntu
2 parents 24b2216 + 2c1b0e8 commit 7b00cc1

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
# When running directly against Firefox, we test only using geckodriver (not against legacy Firefox =<45), so we must declare GECKODRIVER=1
161161
GECKODRIVER: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '1' || '0' }}"
162162
# Provide CHROMEDRIVER_PATH and GECKODRIVER_PATH so that tests for local web drivers are able to start the browser
163-
CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chrome_driver/chromedriver' || '' }}"
163+
CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chromedriver-linux64/chromedriver' || '' }}"
164164
GECKODRIVER_PATH: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '/usr/local/share/gecko_driver/geckodriver' || '' }}"
165165
DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
166166
SELENIUM_SERVER: "${{ matrix.selenium-server && '1' || '0' }}"

lib/Interactions/Internal/WebDriverCoordinates.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
class WebDriverCoordinates
1212
{
1313
/**
14-
* @var null
14+
* @var mixed
15+
* @todo remove in next major version (if it is unused)
1516
*/
1617
private $onScreen;
1718
/**
@@ -28,7 +29,7 @@ class WebDriverCoordinates
2829
private $auxiliary;
2930

3031
/**
31-
* @param null $on_screen
32+
* @param mixed $on_screen
3233
* @param string $auxiliary
3334
*/
3435
public function __construct($on_screen, callable $in_view_port, callable $on_page, $auxiliary)

lib/Local/LocalWebDriver.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,7 @@
1212
*/
1313
abstract class LocalWebDriver extends RemoteWebDriver
1414
{
15-
/**
16-
* @param string $selenium_server_url
17-
* @param null $desired_capabilities
18-
* @param null $connection_timeout_in_ms
19-
* @param null $request_timeout_in_ms
20-
* @param null $http_proxy
21-
* @param null $http_proxy_port
22-
* @throws LogicException
23-
* @return RemoteWebDriver
24-
* @todo Remove in next major version (should not be inherited)
25-
*/
15+
// @todo Remove in next major version (should not be inherited)
2616
public static function create(
2717
$selenium_server_url = 'http://localhost:4444/wd/hub',
2818
$desired_capabilities = null,
@@ -35,15 +25,7 @@ public static function create(
3525
throw LogicException::forError('Use start() method to start local WebDriver.');
3626
}
3727

38-
/**
39-
* @param string $session_id
40-
* @param string $selenium_server_url
41-
* @param null $connection_timeout_in_ms
42-
* @param null $request_timeout_in_ms
43-
* @throws LogicException
44-
* @return RemoteWebDriver
45-
* @todo Remove in next major version (should not be inherited)
46-
*/
28+
// @todo Remove in next major version (should not be inherited)
4729
public static function createBySessionID(
4830
$session_id,
4931
$selenium_server_url = 'http://localhost:4444/wd/hub',

0 commit comments

Comments
 (0)