@scandipwa/magento-scripts 1.16.1 → 2.0.0-alpha.2

package/lib/tasks/magento/setup-magento/varnish-config.js

@@ -18,18 +18,20 @@ const varnishConfigSetup = () => ({
                     }
                 }
             },
-            mysqlConnection,
-            ports
+            databaseConnection,
+            ports,
+            debug
         } = ctx;
 
         const isLinux = os.platform() === 'linux';
         const isWsl = await getIsWsl();
+        const isNativeLinux = isLinux && !isWsl;
 
-        if (varnishEnabled) {
+        if (!debug && varnishEnabled) {
             await updateTableValues('core_config_data', [
                 {
                     path: 'system/full_page_cache/varnish/backend_host',
-                    value: 'localhost'
+                    value: !isNativeLinux ? 'host.docker.internal' : 'localhost'
                 },
                 {
                     path: 'system/full_page_cache/varnish/backend_port',
@@ -37,16 +39,16 @@ const varnishConfigSetup = () => ({
                 },
                 {
                     path: 'system/full_page_cache/varnish/access_list',
-                    value: (!isLinux || isWsl) ? 'host.docker.internal,localhost' : 'localhost'
+                    value: !isNativeLinux ? 'host.docker.internal,localhost' : 'localhost'
                 },
                 {
                     path: 'system/full_page_cache/caching_application',
                     value: '2'
                 }
-            ], { mysqlConnection, task });
+            ], { databaseConnection, task });
         } else {
             // delete varnish configuration if exists
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 DELETE FROM core_config_data WHERE path LIKE '%varnish%';
             `);
 
@@ -57,7 +59,7 @@ const varnishConfigSetup = () => ({
                     path: 'system/full_page_cache/caching_application',
                     value: '0'
                 }
-            ], { mysqlConnection, task });
+            ], { databaseConnection, task });
         }
     },
     options: {

package/lib/tasks/magento/setup-magento/waiting-for-varnish.js

@@ -1,14 +1,48 @@
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const semver = require('semver');
+const fs = require('fs');
+const path = require('path');
 const { request } = require('smol-request');
 const KnownError = require('../../../errors/known-error');
+const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { NginxParser } = require('../../../util/nginx-logs-parser');
 const sleep = require('../../../util/sleep');
 
+const pathToWorkingHealthCheckPhp = path.join(__dirname, '..', '..', 'php', 'working_health_check.php');
+const pathToProjectsHealthCheckPhp = path.join(process.cwd(), 'pub', 'health_check.php');
+const pathToHealthCheckBackupPhp = path.join(process.cwd(), 'pub', 'health_check-super-backup-file.php');
+
+/**
+ * @param {import('../../../../typings/context').ListrContext} ctx
+ */
+const getIsHealthCheckRequestBroken = async (ctx) => {
+    const { nginx } = ctx.config.docker.getContainers(ctx.ports);
+
+    const nginxLogs = await execAsyncSpawn(`docker logs ${nginx.name}`);
+
+    const healthCheckRequests = nginxLogs
+        .split('\n')
+        .filter((line) => line.includes('"GET /health_check.php HTTP/1.1"'));
+
+    // eslint-disable-next-line max-len
+    const parser = new NginxParser('$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"');
+
+    const parsedRequests = healthCheckRequests.map((line) => parser.parseLine(line));
+
+    return parsedRequests.every((parsedRequest) => parsedRequest.status !== '200');
+};
+
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const waitingForVarnish = () => ({
     title: 'Waiting for Varnish to return code 200',
-    skip: (ctx) => !ctx.config.overridenConfiguration.configuration.varnish.enabled,
-    task: async (ctx) => {
+    skip: (ctx) => ctx.debug || !ctx.config.overridenConfiguration.configuration.varnish.enabled,
+    task: async (ctx, task) => {
+        const pureMagentoVersion = ctx.magentoVersion.match(/^([0-9]+\.[0-9]+\.[0-9]+)/)[1];
+
+        const isMagento23 = semver.satisfies(pureMagentoVersion, '<2.4');
+
         let tries = 0;
         while (tries < 10) {
             try {
@@ -28,6 +62,94 @@ const waitingForVarnish = () => ({
             }
         }
 
+        if (tries === 10 && isMagento23) {
+            const isHealthCheckRequestBroken = await getIsHealthCheckRequestBroken(ctx);
+            if (isHealthCheckRequestBroken) {
+                const confirm = await task.prompt({
+                    type: 'Select',
+                    message: `We detected that your Magento instance is experiencing problems with Varnish server.
+Health Check request is returning status 500.
+
+Do you want to try resolving this issue by replacing ${logger.style.file('./pub/health_check.php')} file content with content from newer Magento version (2.4.4)?`,
+                    choices: [
+                        {
+                            name: 'yes',
+                            message: 'Okay, let\'s try that'
+                        },
+                        {
+                            name: 'no',
+                            message: 'I will try to fix this myself, thanks for the info!'
+                        }
+                    ]
+                });
+
+                if (confirm === 'yes') {
+                    await fs.promises.writeFile(
+                        pathToHealthCheckBackupPhp,
+                        await fs.promises.readFile(pathToProjectsHealthCheckPhp, 'utf-8'),
+                        'utf-8'
+                    );
+
+                    task.output = `Backup made! Available at ${logger.style.file(pathToHealthCheckBackupPhp)}`;
+
+                    await fs.promises.writeFile(
+                        pathToProjectsHealthCheckPhp,
+                        await fs.promises.readFile(pathToWorkingHealthCheckPhp, 'utf-8'),
+                        'utf-8'
+                    );
+
+                    task.output = `${logger.style.file('./pub/health_check.php')} content is replaced, waiting for nginx logs...`;
+
+                    let connectionFixed = false;
+
+                    for (let i = 0; i < 10; i++) {
+                        try {
+                            const response = await request(`http://localhost:${ctx.ports.sslTerminator}/`, {
+                                responseType: 'headers'
+                            });
+
+                            if (response.status !== 200) {
+                                await sleep(2000);
+                            } else {
+                                connectionFixed = true;
+                                break;
+                            }
+                        } catch (e) {
+                            await sleep(200);
+                        }
+                    }
+
+                    if (connectionFixed) {
+                        task.output = 'Connection looks good!';
+                        const secondConfirm = await task.prompt({
+                            type: 'Select',
+                            message: `Okay, looks like it helped!
+Do you want to keep backed up ${logger.style.file('health_check.php')} file?`,
+                            choices: [
+                                {
+                                    name: 'no',
+                                    message: 'I don\'t think I will need it anymore, thanks'
+                                },
+                                {
+                                    name: 'yes',
+                                    message: 'I will keep it, maybe it will be useful (X to doubt)'
+                                }
+                            ]
+                        });
+
+                        if (secondConfirm === 'no') {
+                            await fs.promises.rm(pathToHealthCheckBackupPhp);
+                        }
+                    }
+
+                    return;
+                }
+
+                task.skip('User choose to fix issue himself');
+                return;
+            }
+        }
+
         if (tries === 10) {
             throw new KnownError(`After 20 seconds website is still responding with non-200 code, which might indicate issue with setup.
 Or Varnish is still loading...
@@ -35,7 +157,10 @@ Or Varnish is still loading...
 Please check the logs!`);
         }
     },
-    exitOnError: false
+    exitOnError: false,
+    options: {
+        bottomBar: 10
+    }
 });
 
 module.exports = waitingForVarnish;

package/lib/tasks/php/php-container.js

@@ -0,0 +1,108 @@
+/* eslint-disable no-use-before-define */
+const { deepmerge } = require('../../util/deepmerge');
+const { containerApi } = require('../docker/containers');
+
+/**
+ * @param {import('../../../typings/context').ListrContext} ctx
+ * @param {import('../../util/exec-async-command').ExecAsyncSpawnOptions<false> & { useXDebugContainer?: boolean }} [options]
+ * @param {string} command
+ */
+const runPHPContainerCommand = async (ctx, command, options = {}) => {
+    const { php } = ctx.config.docker.getContainers(ctx.ports);
+
+    const containers = await containerApi.ls({ formatToJSON: true, all: true });
+
+    if (containers.some((c) => c.Names === php.name)) {
+        return execPHPContainerCommand(ctx, command, options);
+    }
+
+    return containerApi.run(
+        deepmerge(
+            php,
+            {
+                detach: false,
+                rm: true
+            },
+            options.useXDebugContainer
+                ? {
+                    image: `${ php.image }.xdebug`
+                }
+                : {},
+            {
+                command
+            },
+        ),
+        options
+    );
+};
+
+/**
+ * @param {string} command
+ * @param {import('../../util/exec-async-command').ExecAsyncSpawnOptions<false> & { useXDebugContainer?: boolean }} [options]
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const runPHPContainerCommandTask = (command, options = {}) => ({
+    title: `Running command "${command}"`,
+    task: (ctx, task) => runPHPContainerCommand(ctx, command, {
+        callback: !ctx.verbose ? undefined : (t) => {
+            task.output = t;
+        },
+        ...options
+    }),
+    option: {
+        bottomBar: 10
+    }
+});
+
+/**
+ *
+ * @param {import('../../../typings/context').ListrContext} ctx
+ * @param {import('../../util/exec-async-command').ExecAsyncSpawnOptions<false> & { useXDebugContainer?: boolean }} [options]
+ * @param {string} command
+ */
+const execPHPContainerCommand = async (ctx, command, options = {}) => {
+    const { php } = ctx.config.docker.getContainers(ctx.ports);
+
+    const containers = await containerApi.ls({ formatToJSON: true, all: true });
+
+    if (!containers.some((c) => c.Names === php.name)) {
+        return runPHPContainerCommand(ctx, command, options);
+    }
+
+    return containerApi.exec(
+        command,
+        php.name,
+        deepmerge(
+            php,
+            options.env ? {
+                env: options.env
+            } : {}
+        ),
+        options
+    );
+};
+
+/**
+ * @param {string} command
+ * @param {import('../../util/exec-async-command').ExecAsyncSpawnOptions<false> & { useXDebugContainer?: boolean, title?: string }} [options]
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const execPHPContainerCommandTask = (command, options = {}) => ({
+    title: typeof options.title === 'string' && options.title === '' ? undefined : options.title || `Running command "${command}"`,
+    task: (ctx, task) => execPHPContainerCommand(ctx, command, {
+        callback: !ctx.verbose ? undefined : (t) => {
+            task.output = t;
+        },
+        ...options
+    }),
+    option: {
+        bottomBar: 10
+    }
+});
+
+module.exports = {
+    runPHPContainerCommand,
+    runPHPContainerCommandTask,
+    execPHPContainerCommand,
+    execPHPContainerCommandTask
+};

package/lib/tasks/php/update-env-php.js

@@ -1,10 +1,12 @@
 const path = require('path');
+const os = require('os');
 const envPhpToJson = require('../../util/env-php-json');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const pathExists = require('../../util/path-exists');
-const phpTask = require('../../util/php-task');
+const { containerApi } = require('../docker/containers');
 
 const composerLockPath = path.join(process.cwd(), 'composer.lock');
+const envPhpPath = path.join(process.cwd(), 'app', 'etc', 'env.php');
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
@@ -12,13 +14,19 @@ const updateEnvPHP = () => ({
     title: 'Updating env.php',
     task: async (ctx, task) => {
         // update env.php only if it's exist
-        if (!await pathExists(path.join(process.cwd(), 'app', 'etc', 'env.php'))) {
+        if (!await pathExists(envPhpPath)) {
             task.skip();
             return;
         }
 
-        const useVarnish = ctx.config.overridenConfiguration.configuration.varnish.enabled ? '1' : '';
-        const varnishHost = '127.0.0.1';
+        const { php } = ctx.config.docker.getContainers(ctx.ports);
+
+        const isLinux = ctx.platform === 'linux';
+        const isNativeLinux = isLinux && !ctx.isWsl;
+        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+
+        const useVarnish = (!ctx.debug && ctx.config.overridenConfiguration.configuration.varnish.enabled) ? '1' : '';
+        const varnishHost = hostMachine;
         const varnishPort = ctx.ports.varnish;
         const previousVarnishPort = ctx.cachedPorts
             ? ctx.cachedPorts.varnish
@@ -34,15 +42,15 @@ const updateEnvPHP = () => ({
                     ctx.CSAThemeInstalled = true;
                 }
 
-                const envPhp = await envPhpToJson(process.cwd(), { magentoVersion: ctx.magentoVersion });
+                const envPhp = await envPhpToJson(ctx);
 
                 const persistedQueryConfig = envPhp.cache && envPhp.cache['persisted-query'];
 
                 if (
                     persistedQueryConfig
                     && persistedQueryConfig.redis
-                    && persistedQueryConfig.redis.port === `${ ctx.ports.redis }`
-                    && persistedQueryConfig.redis.host === 'localhost'
+                    && (persistedQueryConfig.redis.port !== `${ ctx.ports.redis }`
+                    || persistedQueryConfig.redis.host === hostMachine)
                 ) {
                     SETUP_PQ = '';
                     return;
@@ -50,20 +58,30 @@ const updateEnvPHP = () => ({
             }
         }
 
-        return task.newListr(
-            phpTask(`-f ${ path.join(__dirname, 'update-env.php') }`, {
-                noTitle: true,
-                env: {
-                    USE_VARNISH: useVarnish,
-                    VARNISH_PORT: `${ varnishPort }`,
-                    VARNISH_HOST: varnishHost,
-                    PREVIOUS_VARNISH_PORT: `${ previousVarnishPort }`,
-                    SETUP_PQ,
-                    REDIS_PORT: ctx.ports.redis,
-                    ADMIN_URI: ctx.config.overridenConfiguration.magento.adminuri
-                }
-            })
-        );
+        const result = await containerApi.run({
+            env: {
+                USE_VARNISH: useVarnish,
+                VARNISH_PORT: `${ varnishPort }`,
+                VARNISH_HOST: varnishHost,
+                PREVIOUS_VARNISH_PORT: `${ previousVarnishPort }`,
+                SETUP_PQ,
+                REDIS_PORT: ctx.ports.redis,
+                ADMIN_URI: ctx.config.overridenConfiguration.magento.adminuri,
+                HOST_MACHINE: hostMachine,
+                PORTS: JSON.stringify(ctx.ports)
+            },
+            command: 'php ./update-env-php.php',
+            mountVolumes: [
+                `${path.join(__dirname, 'update-env.php')}:${ctx.config.baseConfig.containerMagentoDir}/update-env-php.php`,
+                `${envPhpPath}:/${ctx.config.baseConfig.containerMagentoDir}/env.php`
+            ],
+            image: php.image,
+            detach: false,
+            rm: true,
+            user: isLinux ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
+        });
+
+        task.output = result;
     }
 });
 

package/lib/tasks/php/update-env.php

@@ -3,9 +3,9 @@
 function varexport($expression, $return=false): string
 {
     $export = var_export($expression, true);
-    $export = preg_replace("/^([ ]*)(.*)/m", '$1$1$2', $export);
+    $export = preg_replace("/^([ ]*)(.*)/m", "$1$1$2", $export);
     $array = preg_split("/\r\n|\n|\r/", $export);
-    $array = preg_replace(["/\s*array\s\($/", "/\)(,)?$/", "/\s=>\s$/"], [null, ']$1', ' => ['], $array);
+    $array = preg_replace(["/\s*array\s\($/", "/\)(,)?$/", "/\s=>\s$/"], [null, "]$1", " => ["], $array);
     $export = join(PHP_EOL, array_filter(["["] + $array));
     if ((bool)$return) {
         return $export;
@@ -19,12 +19,12 @@ function joinpaths(): string
     $paths = array();
 
     foreach (func_get_args() as $arg) {
-        if ($arg !== '') {
+        if ($arg !== "") {
             $paths[] = $arg;
         }
     }
 
-    return preg_replace('#/+#', '/', join('/', $paths));
+    return preg_replace("#/+#", "/", join("/", $paths));
 }
 
 class EnvUpdater
@@ -42,7 +42,7 @@ class EnvUpdater
 
     public function loadConfig()
     {
-        $this->config = require './app/etc/env.php';
+        $this->config = require "./env.php";
     }
 
     /**
@@ -63,14 +63,14 @@ class EnvUpdater
 
     public function loadPortConfig()
     {
-        $portConfigContent = file_get_contents('./node_modules/.create-magento-app-cache/port-config.json');
+        $portConfigContent = getenv("PORTS");
         if ($portConfigContent === false) {
-            throw new Error('Port config file does not exists in cache directory');
+            throw new Error("Ports env does not exists");
         }
 
         $portConfigJsonData = json_decode($portConfigContent, true);
         if ($portConfigJsonData === null) {
-            throw new Error('Port config file is not content');
+            throw new Error("Ports env is not parseable");
         }
 
         $this->portConfig = $portConfigJsonData;
@@ -79,91 +79,96 @@ class EnvUpdater
     public function modifyConfig()
     {
         // set admin uri
-        $this->config['backend']['frontName'] = getenv('ADMIN_URI');
-
-        // update mysql config
-        if (isset($this->config['db']['connection']['default'])) {
-            $conn = &$this->config['db']['connection']['default'];
-            if (
-                isset($conn['engine']) &&
-                isset($conn['host']) &&
-                $conn['engine'] === 'innodb' &&
-                $conn['host'] !== '127.0.0.1:' . $this->portConfig['mysql']
-            ) {
-                $conn['host'] = '127.0.0.1:' . $this->portConfig['mysql'];
-            }
+        $this->config["backend"]["frontName"] = getenv("ADMIN_URI");
+        $hostMachine = getenv("HOST_MACHINE");
+        if ($hostMachine === false) {
+            $hostMachine = '127.0.0.1';
+        }
+
+        // update mariadb config
+        if (isset($this->config["db"]["connection"]["default"])) {
+            $conn = &$this->config["db"]["connection"]["default"];
+            $mysqlHost = $hostMachine . ":" . $this->portConfig["mariadb"];
+
+            $conn["host"] = $mysqlHost;
         }
 
         // update redis session config
         if (
-            isset($this->config['session']) &&
-            $this->config['session']['save'] === 'redis' &&
-            $this->config['session']['redis']['port'] !== strval($this->portConfig['redis'])
+            isset($this->config["session"]) &&
+            $this->config["session"]["save"] === "redis" &&
+            $this->config["session"]["redis"]["port"] !== strval($this->portConfig["redis"])
         ) {
-            $this->config['session']['redis']['port'] = strval($this->portConfig['redis']);
+            $this->config["session"]["redis"]["port"] = strval($this->portConfig["redis"]);
         }
 
         if (
-            isset($this->config['session']) &&
-            $this->config['session']['save'] === 'redis' &&
-            $this->config['session']['redis']['host'] !== '127.0.0.1'
+            isset($this->config["session"]) &&
+            $this->config["session"]["save"] === "redis" &&
+            $this->config["session"]["redis"]["host"] !== $hostMachine
         ) {
-            $this->config['session']['redis']['host'] = '127.0.0.1';
+            $this->config["session"]["redis"]["host"] = $hostMachine;
         }
 
         // update redis frontend config
-        if (isset($this->config['cache']['frontend']['default'])) {
-            $frontendCache = &$this->config['cache']['frontend']['default'];
-            if ($frontendCache['backend_options']['port'] !== strval($this->portConfig['redis'])) {
-                $frontendCache['backend_options']['port'] = strval($this->portConfig['redis']);
+        if (isset($this->config["cache"]["frontend"]["default"])) {
+            $frontendCache = &$this->config["cache"]["frontend"]["default"];
+            if ($frontendCache["backend_options"]["port"] !== strval($this->portConfig["redis"])) {
+                $frontendCache["backend_options"]["port"] = strval($this->portConfig["redis"]);
             }
-            if ($frontendCache['backend_options']['server'] !== '127.0.0.1') {
-                $frontendCache['backend_options']['server'] = '127.0.0.1';
+            if ($frontendCache["backend_options"]["server"] !== $hostMachine) {
+                $frontendCache["backend_options"]["server"] = $hostMachine;
             }
         }
 
         // update persisted query redis config
-        if (getenv('SETUP_PQ') == '1') {
-            $cacheConfig = &$this->config['cache'];
-            $redisPort = getenv('REDIS_PORT');
+        if (getenv("SETUP_PQ") == "1") {
+            $cacheConfig = &$this->config["cache"];
+            $redisPort = getenv("REDIS_PORT");
 
-            if (isset($cacheConfig) && isset($cacheConfig['persisted-query']) && isset($cacheConfig['persisted-query']['redis']) && $cacheConfig['persisted-query']['redis']['port'] != $redisPort) {
-                $cacheConfig['persisted-query']['redis']['port'] = $redisPort;
+            if (isset($cacheConfig) && isset($cacheConfig["persisted-query"]) && isset($cacheConfig["persisted-query"]["redis"])) {
+                if ($cacheConfig["persisted-query"]["redis"]["port"] !== $redisPort) {
+                    $cacheConfig["persisted-query"]["redis"]["port"] = $redisPort;
+                }
+
+                if ($cacheConfig["persisted-query"]["redis"]["host"] !== $hostMachine) {
+                    $cacheConfig["persisted-query"]["redis"]["host"] = $hostMachine;
+                }
             } else {
                 if (!isset($cacheConfig)) {
-                    $this->config['cache'] = [];
+                    $this->config["cache"] = [];
                 }
-                $this->config['cache']['persisted-query'] = [
-                    'redis' => [
-                        'host' => 'localhost',
-                        'port' => $redisPort,
-                        'database' => '5',
-                        'scheme' => 'tcp'
+                $this->config["cache"]["persisted-query"] = [
+                    "redis" => [
+                        "host" => $hostMachine,
+                        "port" => $redisPort,
+                        "database" => "5",
+                        "scheme" => "tcp"
                     ]
                 ];
             }
         } else {
-            unset($this->config['cache']['persisted-query']);
+            unset($this->config["cache"]["persisted-query"]);
         }
 
         // set varnish config
-        $httpCacheHosts = &$this->config['http_cache_hosts'];
+        $httpCacheHosts = &$this->config["http_cache_hosts"];
         $httpCacheHosts = [];
 
-        if (getenv('USE_VARNISH') == '1') {
-            $varnishHost = getenv('VARNISH_HOST');
-            $varnishPort = getenv('VARNISH_PORT');
-            $previousVarnishPort = getenv('PREVIOUS_VARNISH_PORT');
+        if (getenv("USE_VARNISH") == "1") {
+            $varnishHost = getenv("VARNISH_HOST");
+            $varnishPort = getenv("VARNISH_PORT");
+            $previousVarnishPort = getenv("PREVIOUS_VARNISH_PORT");
             $varnishConfig = [
-                'host' => $varnishHost,
-                'port' => $varnishPort
+                "host" => $varnishHost,
+                "port" => $varnishPort
             ];
 
             if (isset($httpCacheHosts)) {
                 $varnishHostExists = false;
                 foreach ($httpCacheHosts as $host) {
-                    if ($host['host'] == $varnishHost && $host['port'] == $previousVarnishPort) {
-                        $host['port'] = $varnishPort;
+                    if ($host["host"] == $varnishHost && $host["port"] == $previousVarnishPort) {
+                        $host["port"] = $varnishPort;
                         $varnishHostExists = true;
                         break;
                     }
@@ -173,10 +178,10 @@ class EnvUpdater
                     $httpCacheHosts = [$varnishConfig];
                 }
             } else {
-                $this->config['http_cache_hosts'] = [$varnishConfig];
+                $this->config["http_cache_hosts"] = [$varnishConfig];
             }
         } else {
-            unset($this->config['http_cache_hosts']);
+            unset($this->config["http_cache_hosts"]);
         }
     }
 
@@ -184,7 +189,7 @@ class EnvUpdater
     {
         file_put_contents(
             $filePath,
-            '<?php'.PHP_EOL.'return '.varexport($this->config, true).';' . PHP_EOL
+            "<?php".PHP_EOL."return ".varexport($this->config, true).";" . PHP_EOL
         );
     }
 
@@ -193,7 +198,7 @@ class EnvUpdater
         $this->loadConfig();
         $this->loadPortConfig();
         $this->modifyConfig();
-        $this->saveConfig(joinpaths(getcwd(), './app/etc/env.php'));
+        $this->saveConfig("./env.php");
     }
 }