Skip to content

Commit 4227efe

Browse files
committed
MQE-2979: [MFTF] Update vlucas/phpdotenv to the latest versions
1 parent 2a31537 commit 4227efe

File tree

4 files changed

+111
-104
lines changed

4 files changed

+111
-104
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"php-webdriver/webdriver": "^1.9.0",
3131
"spomky-labs/otphp": "^10.0",
3232
"symfony/console": "^4.4",
33+
"symfony/dotenv": "^5.3",
3334
"symfony/finder": "^5.0",
3435
"symfony/http-foundation": "^5.0",
3536
"symfony/mime": "^5.0",
3637
"symfony/process": "^4.4",
37-
"vlucas/phpdotenv": "^2.4",
3838
"weew/helpers-array": "^1.3"
3939
},
4040
"require-dev": {

composer.lock

Lines changed: 77 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/functional/standalone_bootstrap.php

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020

2121
//Load constants from .env file
2222
if (file_exists(ENV_FILE_PATH . '.env')) {
23-
$env = new \Dotenv\Loader(ENV_FILE_PATH . '.env');
24-
$env->load();
23+
$env = new \Symfony\Component\Dotenv\Dotenv();
24+
if (function_exists('putenv')) {
25+
$env->usePutenv();
26+
}
27+
$env->populate($env->parse(file_get_contents(ENV_FILE_PATH . '.env'), ENV_FILE_PATH . '.env'), true);
28+
2529

2630
foreach ($_ENV as $key => $var) {
2731
defined($key) || define($key, $var);
@@ -42,19 +46,20 @@
4246
'MAGENTO_CLI_COMMAND_PATH',
4347
'dev/tests/acceptance/utils/command.php'
4448
);
45-
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PATH', MAGENTO_CLI_COMMAND_PATH);
46-
4749
defined('MAGENTO_CLI_COMMAND_PARAMETER') || define('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
48-
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PARAMETER', MAGENTO_CLI_COMMAND_PARAMETER);
49-
5050
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
51-
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
52-
5351
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
54-
$env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
55-
5652
defined('VERBOSE_ARTIFACTS') || define('VERBOSE_ARTIFACTS', false);
57-
$env->setEnvironmentVariable('VERBOSE_ARTIFACTS', VERBOSE_ARTIFACTS);
53+
$env->populate(
54+
[
55+
'MAGENTO_CLI_COMMAND_PATH' => MAGENTO_CLI_COMMAND_PATH,
56+
'MAGENTO_CLI_COMMAND_PARAMETER' => MAGENTO_CLI_COMMAND_PARAMETER,
57+
'DEFAULT_TIMEZONE' => DEFAULT_TIMEZONE,
58+
'WAIT_TIMEOUT' => WAIT_TIMEOUT,
59+
'VERBOSE_ARTIFACTS' => VERBOSE_ARTIFACTS,
60+
],
61+
true
62+
);
5863

5964
try {
6065
new DateTimeZone(DEFAULT_TIMEZONE);

src/Magento/FunctionalTestingFramework/_bootstrap.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
*/
77

88
// define framework basepath for schema pathing
9+
use Symfony\Component\Dotenv\Exception\PathException;
10+
911
defined('FW_BP') || define('FW_BP', realpath(__DIR__ . '/../../../'));
1012
// get the root path of the project
1113
$projectRootPath = substr(FW_BP, 0, strpos(FW_BP, DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR));
@@ -21,8 +23,11 @@
2123

2224
//Load constants from .env file
2325
if (file_exists(ENV_FILE_PATH . '.env')) {
24-
$env = new \Dotenv\Loader(ENV_FILE_PATH . '.env');
25-
$env->load();
26+
$env = new \Symfony\Component\Dotenv\Dotenv();
27+
if (function_exists('putenv')) {
28+
$env->usePutenv();
29+
}
30+
$env->populate($env->parse(file_get_contents(ENV_FILE_PATH . '.env'), ENV_FILE_PATH . '.env'), true);
2631

2732
if (array_key_exists('TESTS_MODULE_PATH', $_ENV) xor array_key_exists('TESTS_BP', $_ENV)) {
2833
throw new Exception(
@@ -42,19 +47,20 @@
4247
'MAGENTO_CLI_COMMAND_PATH',
4348
'dev/tests/acceptance/utils/command.php'
4449
);
45-
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PATH', MAGENTO_CLI_COMMAND_PATH);
46-
4750
defined('MAGENTO_CLI_COMMAND_PARAMETER') || define('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
48-
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PARAMETER', MAGENTO_CLI_COMMAND_PARAMETER);
49-
5051
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
51-
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
52-
5352
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
54-
$env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
55-
5653
defined('VERBOSE_ARTIFACTS') || define('VERBOSE_ARTIFACTS', false);
57-
$env->setEnvironmentVariable('VERBOSE_ARTIFACTS', VERBOSE_ARTIFACTS);
54+
$env->populate(
55+
[
56+
'MAGENTO_CLI_COMMAND_PATH' => MAGENTO_CLI_COMMAND_PATH,
57+
'MAGENTO_CLI_COMMAND_PARAMETER' => MAGENTO_CLI_COMMAND_PARAMETER,
58+
'DEFAULT_TIMEZONE' => DEFAULT_TIMEZONE,
59+
'WAIT_TIMEOUT' => WAIT_TIMEOUT,
60+
'VERBOSE_ARTIFACTS' => VERBOSE_ARTIFACTS,
61+
],
62+
true
63+
);
5864

5965
try {
6066
new DateTimeZone(DEFAULT_TIMEZONE);

0 commit comments

Comments
 (0)