@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also |
8 | 8 | // write a specific file to disk. |
9 | 9 | // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file |
10 | -$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt'; |
|
10 | +$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt'; |
|
11 | 11 | $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : ''; |
12 | 12 | $fileId = file_exists($idFile) ? file_get_contents($idFile) : ''; |
13 | 13 | if ($randId == '' || $fileId == '' || $fileId !== $randId) { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
32 | 32 | } |
33 | 33 | |
34 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
34 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $targetFile = null; |
@@ -54,5 +54,5 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
57 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
57 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
58 | 58 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
6 | 6 | use PHPUnit\Framework\TestResult; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function _run($result = NULL) |
32 | 32 | { |
33 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
33 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
34 | 34 | |
35 | 35 | if ($result === NULL) { |
36 | 36 | $result = $this->createResult(); |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | |
63 | 63 | // Set up a database connection or other fixture which needs to be available. |
64 | 64 | self::$randId = uniqid(); |
65 | - file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', self::$randId); |
|
65 | + file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', self::$randId); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function tear_down_after_class() |
69 | 69 | { |
70 | - if (is_file(sys_get_temp_dir() . '/phpunit_rand_id.txt')) { |
|
71 | - unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt'); |
|
70 | + if (is_file(sys_get_temp_dir().'/phpunit_rand_id.txt')) { |
|
71 | + unlink(sys_get_temp_dir().'/phpunit_rand_id.txt'); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | parent::tear_down_after_class(); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | parent::set_up(); |
80 | 80 | |
81 | 81 | // assumes HTTPURI to be in the form /tests/index.php?etc... |
82 | - $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
83 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
82 | + $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']); |
|
83 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
84 | 84 | } |
85 | 85 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase |
6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
17 | 17 | { |
18 | - $url = $this->baseUrl . $path; |
|
18 | + $url = $this->baseUrl.$path; |
|
19 | 19 | |
20 | 20 | $ch = curl_init($url); |
21 | 21 | curl_setopt_array($ch, array( |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | CURLOPT_POSTFIELDS => $payload |
30 | 30 | )); |
31 | 31 | } |
32 | - $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId; |
|
32 | + $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId; |
|
33 | 33 | if ($this->collectCodeCoverageInformation) |
34 | 34 | { |
35 | - $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId; |
|
35 | + $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId; |
|
36 | 36 | } |
37 | 37 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
38 | 38 | |
39 | - if ($this->args['DEBUG'] > 0) { |
|
39 | + if ($this->args['DEBUG']>0) { |
|
40 | 40 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
41 | 41 | } |
42 | 42 | $page = curl_exec($ch); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | */ |
62 | 62 | protected function newClient($path) |
63 | 63 | { |
64 | - $client = new \PhpXmlRpc\Client($this->baseUrl . $path); |
|
64 | + $client = new \PhpXmlRpc\Client($this->baseUrl.$path); |
|
65 | 65 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId); |
66 | 66 | if ($this->collectCodeCoverageInformation) { |
67 | 67 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |