Skip to content

Commit 4b2f5e3

Browse files
authored
Removed the usage of getenv, fixed #1237 (#1247)
* Removed the usage of getenv, fixed #1237 * Added getenv() as fallback condition
1 parent 1890f9d commit 4b2f5e3

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/Elasticsearch/ClientBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,9 @@ public function build(): Client
637637
if (! isset($this->connectionParams['client']['headers'])) {
638638
$this->connectionParams['client']['headers'] = [];
639639
}
640-
$apiVersioning = getenv('ELASTIC_CLIENT_APIVERSIONING');
640+
$apiVersioning = $_SERVER['ELASTIC_CLIENT_APIVERSIONING']
641+
?? $_ENV['ELASTIC_CLIENT_APIVERSIONING']
642+
?? getenv('ELASTIC_CLIENT_APIVERSIONING');
641643
if (! isset($this->connectionParams['client']['headers']['Content-Type'])) {
642644
if ($apiVersioning === 'true' || $apiVersioning === '1') {
643645
$this->connectionParams['client']['headers']['Content-Type'] = ['application/vnd.elasticsearch+json;compatible-with=7'];

tests/Elasticsearch/Tests/ClientIntegrationTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ private function getClient(): Client
5959
->setHosts([$this->host])
6060
->setLogger($this->logger);
6161

62-
if (getenv('TEST_SUITE') === 'platinum') {
62+
$testSuite = $_SERVER['TEST_SUITE']
63+
?? $_ENV['TEST_SUITE']
64+
?? getenv('TEST_SUITE');
65+
if ($testSuite === 'platinum') {
6366
$client->setSSLVerification(false);
6467
}
6568
return $client->build();

tests/Elasticsearch/Tests/Utility.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ class Utility
6060
*/
6161
public static function getHost(): ?string
6262
{
63-
$url = getenv('ELASTICSEARCH_URL');
63+
$url = $_SERVER['ELASTICSEARCH_URL']
64+
?? $_ENV['ELASTICSEARCH_URL']
65+
?? getenv('ELASTICSEARCH_URL');
6466
if (false !== $url) {
6567
return $url;
6668
}

util/build_tests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
exit(1);
4444
}
4545

46-
$stack = getenv('TEST_SUITE');
46+
$stack = $_SERVER['TEST_SUITE'] ?? $_ENV['TEST_SUITE'];
4747
printf ("*****************************************\n");
4848
printf ("** Bulding YAML tests for %s suite\n", strtoupper($stack));
4949
printf ("*****************************************\n");

0 commit comments

Comments
 (0)