Skip to content

Commit bf8c89f

Browse files
committed
Replace getenv to $_ENV
Let's not use / anymore as they are not thread safe. laravel/framework#7354
1 parent 94049d9 commit bf8c89f

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

config.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
$env->required($requiredEnvFields)->notEmpty();
4040

4141
// First, convert "true/false" string from phpdotenv to boolean
42-
$debugMode = filter_var(getenv('DEBUG_MODE'), FILTER_VALIDATE_BOOLEAN);
43-
$cacheStatus = filter_var(getenv('CACHE'), FILTER_VALIDATE_BOOLEAN);
42+
$debugMode = filter_var($_ENV['DEBUG_MODE'], FILTER_VALIDATE_BOOLEAN);
43+
$cacheStatus = filter_var($_ENV['CACHE'], FILTER_VALIDATE_BOOLEAN);
4444
define('DEBUG_MODE', $debugMode);
4545
define('CACHE_ENABLED', $cacheStatus);
4646

src/ApiCrypter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ApiCrypter
88
{
99
public function encrypt($input, $key): string
1010
{
11-
$iv = getenv('ENCRYPTION_KEY_IV');
11+
$iv = $_ENV['ENCRYPTION_KEY_IV'];
1212
$plaintext = $input;
1313
$password = $key;
1414
$method = 'aes-256-cbc';
@@ -29,7 +29,7 @@ public function encrypt($input, $key): string
2929

3030
public function decrypt($crypt, $sKey): string
3131
{
32-
$iv = getenv('ENCRYPTION_KEY_IV');
32+
$iv = $_ENV['ENCRYPTION_KEY_IV'];
3333
$method = 'aes-256-cbc';
3434
$password = $sKey;
3535
$password = substr(hash('sha256', $password, true), 0, 32);

src/Database.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ private function getDetails(): array
3434
{
3535
return [
3636
'db_type' => self::DSN_MYSQL_PREFIX,
37-
'host' => getenv('DB_HOST'),
38-
'name' => getenv('DB_NAME'),
39-
'user' => getenv('DB_USER'),
40-
'password' => getenv('DB_PWD'),
37+
'host' => $_ENV['DB_HOST'],
38+
'name' => $_ENV['DB_NAME'],
39+
'user' => $_ENV['DB_USER'],
40+
'password' => $_ENV['DB_PWD'],
4141
'charset' => self::DBMS_CHARSET
4242
];
4343
}

src/Email.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public function __construct()
3131
*/
3232
public function sendMail(string $message, string $subject, string $userEmailId): bool
3333
{
34-
$sName = getenv('SENDER_EMAIL_NAME');
35-
$senderEmailId = getenv('SENDER_EMAIL_ID');
36-
$senderEmailPassword = getenv('SENDER_EMAIL_PASSWORD');
34+
$sName = $_ENV['SENDER_EMAIL_NAME'];
35+
$senderEmailId = $_ENV['SENDER_EMAIL_ID'];
36+
$senderEmailPassword = $_ENV['SENDER_EMAIL_PASSWORD'];
3737

3838
// Server settings
3939
$this->oMail->isSMTP();

src/Product.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public function getOpenFoodDetails($product_name, $scan_type)
343343
$product_array = [];
344344
switch ($scan_type) {
345345
case ScanningMethod::PRODUCT_NAME:
346-
$url = getenv('URL_OPEN_FOOD_NAME_API') . urlencode($product_name) . '&page=1';
346+
$url = $_ENV['URL_OPEN_FOOD_NAME_API'] . urlencode($product_name) . '&page=1';
347347
$tempArr = curlRequestLoad($url);
348348
if (count($tempArr['products']) > 0) {
349349
foreach ($tempArr['products'] as $key => $value) {
@@ -382,7 +382,7 @@ public function getOpenFoodDetails($product_name, $scan_type)
382382
}
383383
break;
384384
case ScanningMethod::BARCODE:
385-
$url = getenv('URL_OPEN_FOOD_BARCODE_API') . urlencode($product_name) . ".json";
385+
$url = $_ENV['URL_OPEN_FOOD_BARCODE_API'] . urlencode($product_name) . ".json";
386386
$tempArr = curlRequestLoad($url);
387387
if (count($tempArr['product']) > 0) {
388388
$value = $tempArr['product'];
@@ -419,7 +419,7 @@ public function getUSAFoodDetails($product_name)
419419
$temp = -1;
420420
$skip = false;
421421
$selected_index = -1;
422-
$url = getenv('URL_USA_FOOD_API') . getenv('USA_FOOD_KEY') . '&query=' . urlencode($product_name);
422+
$url = $_ENV['URL_USA_FOOD_API'] . $_ENV['USA_FOOD_KEY'] . '&query=' . urlencode($product_name);
423423
$tempArr = curlRequestLoad($url);
424424

425425
if (!empty($tempArr['foods'])) {
@@ -482,14 +482,14 @@ public function getSwissFoodDetails($product_name)
482482
{
483483
$ch = curl_init();
484484
curl_setopt_array($ch, [
485-
CURLOPT_URL => getenv('URL_SWISS_FOOD_API'),
485+
CURLOPT_URL => $_ENV['URL_SWISS_FOOD_API'],
486486
CURLOPT_RETURNTRANSFER => true,
487487
CURLOPT_SSL_VERIFYPEER => false,
488488
CURLOPT_SSL_VERIFYHOST => 0,
489489
CURLOPT_CUSTOMREQUEST => "POST",
490490
CURLOPT_POSTFIELDS => "{\"query\":{\"query_string\":{\"query\":\"" . $product_name . "\"}}}",
491491
CURLOPT_HTTPHEADER => [
492-
"Authorization: Token token=" . getenv('SWISS_FOOD_KEY'),
492+
"Authorization: Token token=" . $_ENV['SWISS_FOOD_KEY'],
493493
"Content-ApiProviders: application/vnd.api+json",
494494
"Accept: application/json",
495495
"Content-ApiProviders: application/json"

src/Security.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ private function refreshToken($userData)
407407
$data[MESSAGE_KEY] = $message;
408408

409409
$arr_adminconfig = $this->getAdminConfigWithToken($userData);
410-
$arr_adminconfig['key_iv'] = getenv('ENCRYPTION_KEY_IV');
410+
$arr_adminconfig['key_iv'] = $_ENV['ENCRYPTION_KEY_IV'];
411411
$data['data']['adminConfig'] = $arr_adminconfig;
412412

413413
return $data;

0 commit comments

Comments
 (0)