@scandipwa/magento-scripts 1.16.0 → 2.0.0-alpha.1

package/lib/tasks/file-system/create-vscode-config.js

@@ -1,77 +1,85 @@
 const path = require('path');
-const semver = require('semver');
 const fs = require('fs');
-const os = require('os');
 const hjson = require('hjson');
 const pathExists = require('../../util/path-exists');
 const setConfigFile = require('../../util/set-config');
 const UnknownError = require('../../errors/unknown-error');
 
-const phpXDebug2port = 9111;
-const phpXDebug3port = 9003;
 const listenForXDebugConfigName = 'Listen for XDebug';
 
-const vscodeLaunchConfigPath = path.join(process.cwd(), '.vscode', 'launch.json');
+const xdebugPort = 9003;
 
-/**
- * @param {import('../../../typings/context').ListrContext['config']['php']} php
- */
-const getCurrentXDebugPort = (php) => (semver.satisfies(php.extensions.xdebug.version, '>=3')
-    ? phpXDebug3port
-    : phpXDebug2port);
+const vscodeLaunchConfigPath = path.join(process.cwd(), '.vscode', 'launch.json');
 
 /**
- * @param {import('../../../typings/context').ListrContext['config']['php']} php
- */
-const getPHPBinPathWithHomeVariable = (php) => php.binPath.replace(os.homedir(), '$HOME');
-/**
- * @param {import('../../../typings/context').ListrContext['config']['php']} php
+ * @param {import('../../../typings/context').ListrContext} ctx
  */
-const addPHPDebugConfig = (vscodeLaunchConfig, php) => {
+const addPHPDebugConfig = (vscodeLaunchConfig, ctx) => {
     const phpXDebugConfig = vscodeLaunchConfig.configurations.find(
         ({ name }) => name === listenForXDebugConfigName
     );
 
-    const phpXDebugPort = getCurrentXDebugPort(php);
-    const phpBingPath = getPHPBinPathWithHomeVariable(php);
+    let hasChanges = false;
+
+    const newConfiguration = {
+        name: listenForXDebugConfigName,
+        type: 'php',
+        request: 'launch',
+        port: xdebugPort,
+        pathMappings: {
+            // eslint-disable-next-line no-template-curly-in-string
+            [ctx.config.baseConfig.containerMagentoDir]: '${workspaceFolder}'
+        }
+
+    };
+
+    if (phpXDebugConfig && phpXDebugConfig.runtimeExecutable) {
+        vscodeLaunchConfig.configurations = vscodeLaunchConfig.configurations.filter(
+            ({ name }) => name !== listenForXDebugConfigName
+        );
 
+        vscodeLaunchConfig.configurations.push(newConfiguration);
+
+        return true;
+    }
     if (!phpXDebugConfig) {
-        vscodeLaunchConfig.configurations.push({
-            name: listenForXDebugConfigName,
-            type: 'php',
-            request: 'launch',
-            port: phpXDebugPort,
-            runtimeExecutable: phpBingPath
-        });
+        vscodeLaunchConfig.configurations.push(newConfiguration);
 
         return true;
     }
 
     if (
-        phpXDebugConfig.port !== phpXDebugPort
-        && phpXDebugConfig.runtimeExecutable !== phpBingPath
-    ) {
-        phpXDebugConfig.port = phpXDebugPort;
-        phpXDebugConfig.runtimeExecutable = phpBingPath;
+        !phpXDebugConfig.port
+        || phpXDebugConfig.port !== xdebugPort) {
+        phpXDebugConfig.port = xdebugPort;
 
-        return true;
+        hasChanges = true;
+    }
+
+    if (!phpXDebugConfig.pathMappings || !phpXDebugConfig.pathMappings[ctx.config.baseConfig.containerMagentoDir]) {
+        phpXDebugConfig.pathMappings = {
+            // eslint-disable-next-line no-template-curly-in-string
+            [ctx.config.baseConfig.containerMagentoDir]: '${workspaceFolder}'
+        };
+
+        hasChanges = true;
     }
 
-    return false;
+    return hasChanges;
 };
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const createPhpFpmConfig = () => ({
+const createVSCodeConfig = () => ({
     title: 'Setting VSCode config',
-    task: async ({ config: { php, baseConfig } }, task) => {
+    task: async (ctx, task) => {
         if (await pathExists(vscodeLaunchConfigPath)) {
             const vscodeLaunchConfig = hjson.parse(await fs.promises.readFile(vscodeLaunchConfigPath, 'utf-8'), {
                 keepWsc: true
             });
 
-            const vscodeConfigEdited = addPHPDebugConfig(vscodeLaunchConfig, php);
+            const vscodeConfigEdited = addPHPDebugConfig(vscodeLaunchConfig, ctx);
 
             // if vscode config is up-to-date, skip task
             if (!vscodeConfigEdited) {
@@ -79,7 +87,15 @@ const createPhpFpmConfig = () => ({
                 return;
             }
 
-            await fs.promises.writeFile(vscodeLaunchConfigPath, hjson.stringify(vscodeLaunchConfig));
+            const result = hjson.stringify(vscodeLaunchConfig, {
+                keepWsc: true,
+                bracesSameLine: true,
+                separator: true,
+                quotes: 'all'
+
+            });
+
+            await fs.promises.writeFile(vscodeLaunchConfigPath, result);
 
             return;
         }
@@ -93,14 +109,13 @@ const createPhpFpmConfig = () => ({
         }
 
         try {
-            const phpXDebugPort = getCurrentXDebugPort(php);
-            const vscodeLaunchConfigTemplatePath = path.join(baseConfig.templateDir, 'vscode-launch.template.json');
+            const vscodeLaunchConfigTemplatePath = path.join(ctx.config.baseConfig.templateDir, 'vscode-launch.template.json');
             await setConfigFile({
                 template: vscodeLaunchConfigTemplatePath,
                 configPathname: vscodeLaunchConfigPath,
                 templateArgs: {
-                    XDebugPort: phpXDebugPort,
-                    PHPBinPath: getPHPBinPathWithHomeVariable(php)
+                    XDebugPort: xdebugPort,
+                    baseConfig: ctx.config.baseConfig
                 }
             });
         } catch (e) {
@@ -109,4 +124,4 @@ const createPhpFpmConfig = () => ({
     }
 });
 
-module.exports = createPhpFpmConfig;
+module.exports = createVSCodeConfig;

package/lib/tasks/file-system/index.js

@@ -1,3 +1,4 @@
+const createMariaDBConfig = require('./create-mariadb-config');
 const createNginxConfig = require('./create-nginx-config');
 const createPhpConfig = require('./create-php-config');
 const createPhpFpmConfig = require('./create-php-fpm-config');
@@ -18,9 +19,11 @@ const prepareFileSystem = () => ({
         createPhpConfig(),
         createPhpStormConfig(),
         createVSCodeConfig(),
-        createVarnishConfig()
+        createVarnishConfig(),
+        createMariaDBConfig()
     ], {
-        concurrent: true
+        concurrent: true,
+        exitOnError: false
     })
 });
 

package/lib/tasks/import-dump.js

@@ -1,11 +1,11 @@
 const path = require('path');
 const { checkRequirements } = require('./requirements');
 const {
-    importDumpToMySQL,
+    importDumpToDatabase,
     fixDB,
     dumpThemeConfig,
     restoreThemeConfig
-} = require('./mysql');
+} = require('./database');
 const { setupMagento } = require('./magento');
 const indexProducts = require('./magento/setup-magento/index-products');
 const {
@@ -14,7 +14,7 @@ const {
     retrieveFreshProjectConfiguration,
     configureProject
 } = require('./start');
-const importRemoteDb = require('./mysql/import-remote-db');
+const importRemoteDb = require('./database/import-remote-db');
 const matchFilesystem = require('../util/match-filesystem');
 
 /**
@@ -34,8 +34,8 @@ const importDump = () => ({
             // skip setup if env.php and config.php are present in app/etc folder and db is not empty
             skip: async (ctx) => {
                 const isFsMatching = await matchFilesystem(path.join(process.cwd(), 'app', 'etc'), ['config.php', 'env.php']);
-                const { mysqlConnection } = ctx;
-                const [[{ tableCount }]] = await mysqlConnection.query(`
+                const { databaseConnection } = ctx;
+                const [[{ tableCount }]] = await databaseConnection.query(`
                     SELECT count(*) AS tableCount
                     FROM INFORMATION_SCHEMA.TABLES
                     WHERE TABLE_SCHEMA = 'magento';
@@ -48,7 +48,7 @@ const importDump = () => ({
             )
         },
         dumpThemeConfig(),
-        importDumpToMySQL(),
+        importDumpToDatabase(),
         restoreThemeConfig(),
         fixDB(),
         setupMagento(),

package/lib/tasks/link.js

@@ -4,22 +4,23 @@ const getProjectConfiguration = require('../config/get-project-configuration');
 const retrieveThemeData = require('./theme/retrieve-theme-data');
 const linkTheme = require('./theme/link-theme');
 const { startServices } = require('./docker');
-const { startPhpFpm } = require('./php-fpm');
 const checkConfigurationFile = require('../config/check-configuration-file');
-const { connectToMySQL } = require('./mysql');
+const { connectToDatabase } = require('./database');
+const { checkRequirements } = require('./requirements');
 
 /**
  * @type {(theme: string) => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const linkTask = (themePath) => ({
     task: (ctx, task) => task.newListr([
+        checkRequirements(),
         getMagentoVersionConfig(),
         checkConfigurationFile(),
         getProjectConfiguration(),
         getCachedPorts(),
         startServices(),
-        startPhpFpm(),
-        connectToMySQL(),
+        // startPhpFpm(),
+        connectToDatabase(),
         retrieveThemeData(themePath),
         linkTheme()
     ])

package/lib/tasks/magento/install-magento-project.js

@@ -1,32 +1,27 @@
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const runComposerCommand = require('../../util/run-composer');
 const matchFilesystem = require('../../util/match-filesystem');
-const moveFile = require('../../util/move-file');
 const pathExists = require('../../util/path-exists');
 const getJsonFileData = require('../../util/get-jsonfile-data');
-const rmdirSafe = require('../../util/rmdir-safe');
 const KnownError = require('../../errors/known-error');
 const UnknownError = require('../../errors/unknown-error');
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const { runPHPContainerCommand } = require('../php/php-container');
 
 const magentoProductEnterpriseEdition = 'magento/product-enterprise-edition';
 const magentoProductCommunityEdition = 'magento/product-community-edition';
 
 /**
- * Adjust composer.json file configuration for magento
+ * @param {import('../../../typings/context').ListrContext} ctx
+ * @param {import('listr2').ListrTaskWrapper<import('../../../typings/context').ListrContext>} task
  */
-const adjustComposerJson = async ({
-    baseConfig,
+const adjustComposerJson = async (ctx, task, {
     magentoEdition,
     magentoProductSelectedEdition,
-    magentoVersion,
-    magentoPackageVersion,
-    task,
-    verbose
+    magentoPackageVersion
 }) => {
-    const composerData = await getJsonFileData(path.join(baseConfig.magentoDir, 'composer.json'));
+    const composerData = await getJsonFileData(path.join(ctx.config.baseConfig.magentoDir, 'composer.json'));
 
     // fix composer magento repository
     if (composerData && (!composerData.repositories
@@ -37,9 +32,8 @@ const adjustComposerJson = async ({
             && !Object.values(composerData.repositories).some((repo) => repo.type === 'composer' && repo.url.includes('repo.magento.com')))
     )) {
         task.output = 'No Magento repository is set in composer.json! Setting up...';
-        await runComposerCommand('config repo.0 composer https://repo.magento.com', {
-            magentoVersion,
-            callback: !verbose ? undefined : (t) => {
+        await runComposerCommand(ctx, 'config repo.0 composer https://repo.magento.com', {
+            callback: !ctx.verbose ? undefined : (t) => {
                 task.output = t;
             }
         });
@@ -48,10 +42,9 @@ const adjustComposerJson = async ({
     // if composer-root-update-plugin is not installed in composer, install it.
     if (composerData && !composerData.require['magento/composer-root-update-plugin']) {
         task.output = 'Installing magento/composer-root-update-plugin!';
-        await runComposerCommand('require magento/composer-root-update-plugin:^1',
+        await runComposerCommand(ctx, 'require magento/composer-root-update-plugin:^1',
             {
-                magentoVersion,
-                callback: !verbose ? undefined : (t) => {
+                callback: !ctx.verbose ? undefined : (t) => {
                     task.output = t;
                 }
             });
@@ -62,7 +55,8 @@ const adjustComposerJson = async ({
         && composerData.require[magentoProductCommunityEdition]
         && composerData.require[magentoProductEnterpriseEdition]
     ) {
-        throw new KnownError('Somehow, both Magento editions are installed!\nPlease choose only one edition an modify your composer.json manually!');
+        throw new KnownError(`Somehow, both Magento editions are installed!
+Please choose only one edition an modify your composer.json manually!`);
     }
 
     const oppositeEdition = [magentoProductCommunityEdition, magentoProductEnterpriseEdition]
@@ -76,13 +70,11 @@ Change magento edition in config file or manually reinstall correct magento edit
     }
 
     // if magento package is not installed in composer, require it.
-
     if (composerData && !composerData.require[magentoProductSelectedEdition]) {
         task.output = `Installing ${magentoProductSelectedEdition}=${magentoPackageVersion}!`;
-        await runComposerCommand(`require ${magentoProductSelectedEdition}:${magentoPackageVersion}`,
+        await runComposerCommand(ctx, `require ${magentoProductSelectedEdition}:${magentoPackageVersion}`,
             {
-                magentoVersion,
-                callback: !verbose ? undefined : (t) => {
+                callback: !ctx.verbose ? undefined : (t) => {
                     task.output = t;
                 }
             });
@@ -90,16 +82,14 @@ Change magento edition in config file or manually reinstall correct magento edit
 };
 
 /**
- * Create Magento Project
+ * @param {import('../../../typings/context').ListrContext} ctx
+ * @param {import('listr2').ListrTaskWrapper<import('../../../typings/context').ListrContext>} task
  */
-const createMagentoProject = async ({
+const createMagentoProject = async (ctx, task, {
     magentoProject,
-    magentoPackageVersion,
-    magentoVersion,
-    task,
-    verbose
+    magentoPackageVersion
 }) => {
-    const tempDir = path.join(os.tmpdir(), `magento-tmpdir-${Date.now()}`);
+    const tempDir = `/tmp/magento-tmpdir-${Date.now()}`;
     const installCommand = [
         'create-project',
         `--repository=https://repo.magento.com/ ${magentoProject}=${magentoPackageVersion}`,
@@ -107,22 +97,8 @@ const createMagentoProject = async ({
         `"${tempDir}"`
     ];
 
-    await runComposerCommand(
-        installCommand.join(' '),
-        {
-            magentoVersion,
-            callback: !verbose ? undefined : (t) => {
-                task.output = t;
-            }
-        }
-    );
-
-    await moveFile({
-        from: path.join(tempDir, 'composer.json'),
-        to: path.join(process.cwd(), 'composer.json')
-    });
-
-    await rmdirSafe(tempDir);
+    await runPHPContainerCommand(ctx, `composer ${installCommand.join(' ')} \n
+&& mv ${tempDir}/composer.json ${ctx.config.baseConfig.containerMagentoDir}/composer.json`);
 };
 
 /**
@@ -131,7 +107,7 @@ const createMagentoProject = async ({
 const installMagentoProject = () => ({
     title: 'Installing Magento Project',
     task: async (ctx, task) => {
-        const { magentoVersion, config: { baseConfig, overridenConfiguration }, verbose } = ctx;
+        const { config: { baseConfig, overridenConfiguration } } = ctx;
         const {
             magento: { edition: magentoEdition },
             magentoVersion: magentoPackageVersion
@@ -141,15 +117,10 @@ const installMagentoProject = () => ({
         const magentoProject = `magento/project-${magentoEdition}-edition`;
 
         if (await pathExists(path.join(baseConfig.magentoDir, 'composer.json'))) {
-            await adjustComposerJson({
-                baseConfig,
-                isEnterprise,
+            await adjustComposerJson(ctx, task, {
                 magentoEdition,
                 magentoPackageVersion,
-                magentoProductSelectedEdition,
-                magentoVersion,
-                task,
-                verbose
+                magentoProductSelectedEdition
             });
         }
 
@@ -173,12 +144,9 @@ const installMagentoProject = () => ({
         task.output = 'Creating Magento project';
 
         if (!await pathExists(path.join(process.cwd(), 'composer.json'))) {
-            await createMagentoProject({
+            await createMagentoProject(ctx, task, {
                 magentoProject,
-                magentoPackageVersion,
-                magentoVersion,
-                task,
-                verbose
+                magentoPackageVersion
             });
         }
 
@@ -187,18 +155,18 @@ const installMagentoProject = () => ({
                 recursive: true
             });
         }
+
         try {
-            await runComposerCommand('install',
+            await runComposerCommand(ctx, 'install',
                 {
-                    magentoVersion,
-                    callback: !verbose ? undefined : (t) => {
+                    callback: !ctx.verbose ? undefined : (t) => {
                         task.output = t;
                     }
                 });
         } catch (e) {
             if (e.message.includes('man-in-the-middle attack')) {
                 throw new KnownError(`Probably you haven't setup pubkeys in composer.
-Please run ${logger.style.command('composer diagnose')} in cli to get mode.\n\n${e}`);
+        Please run ${logger.style.command('composer diagnose')} in cli to get mode.\n\n${e}`);
             }
 
             throw new UnknownError(`Unexpected error during composer install.\n\n${e}`);

package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js

@@ -6,15 +6,15 @@ const magentoTask = require('../../../util/magento-task');
  */
 const disableFullPageCache = () => ({
     title: 'Adjusting full_page cache setting',
-    task: async ({ magentoVersion, config }, task) => {
-        const { cache_types } = await envPhpToJson(process.cwd(), { magentoVersion });
+    task: async (ctx, task) => {
+        const { cache_types } = await envPhpToJson(ctx);
         if (cache_types && typeof cache_types.full_page === 'number') {
-            if (cache_types.full_page !== 0 && !config.overridenConfiguration.configuration.varnish.enabled) {
+            if (cache_types.full_page !== 0 && !ctx.config.overridenConfiguration.configuration.varnish.enabled) {
                 task.title = 'Disabling full_page cache in Magento';
                 return task.newListr(magentoTask('cache:disable full_page'));
             }
 
-            if (config.overridenConfiguration.configuration.varnish.enabled && cache_types.full_page !== 1) {
+            if (ctx.config.overridenConfiguration.configuration.varnish.enabled && cache_types.full_page !== 1) {
                 task.title = 'Enabling full_page cache in Magento (Varnish is enabled)';
                 return task.newListr(magentoTask('cache:enable full_page'));
             }

package/lib/tasks/magento/setup-magento/configure-elasticsearch.js

@@ -6,11 +6,15 @@ const { updateTableValues, isTableExists } = require('../../../util/database');
 module.exports = () => ({
     title: 'Configuring Elasticsearch',
     skip: async (ctx) => !(await isTableExists('magento', 'core_config_data', ctx)),
-    task: async ({ ports, mysqlConnection }, task) => {
+    task: async (ctx, task) => {
+        const { ports, databaseConnection } = ctx;
+        const isLinux = ctx.platform === 'linux';
+        const isNativeLinux = isLinux && !ctx.isWsl;
+        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
         await updateTableValues('core_config_data', [
             { path: 'catalog/search/engine', value: 'elasticsearch7' },
-            { path: 'catalog/search/elasticsearch7_server_hostname', value: '127.0.0.1' },
+            { path: 'catalog/search/elasticsearch7_server_hostname', value: hostMachine },
             { path: 'catalog/search/elasticsearch7_server_port', value: `${ports.elasticsearch}` }
-        ], { mysqlConnection, task });
+        ], { databaseConnection, task });
     }
 });

package/lib/tasks/magento/setup-magento/create-admin.js

@@ -5,8 +5,9 @@ const runMagentoCommand = require('../../../util/run-magento');
  */
 module.exports = () => ({
     title: 'Creating admin user',
-    task: async ({ magentoVersion, mysqlConnection, config: { magentoConfiguration } }, task) => {
-        const [[{ userCount }]] = await mysqlConnection.query(`
+    task: async (ctx, task) => {
+        const { config: { magentoConfiguration } } = ctx;
+        const [[{ userCount }]] = await ctx.databaseConnection.query(`
             SELECT count(*) AS userCount
             FROM admin_user
             WHERE username = ?;
@@ -17,13 +18,11 @@ module.exports = () => ({
             return;
         }
 
-        await runMagentoCommand(`admin:user:create \
+        await runMagentoCommand(ctx, `admin:user:create \
         --admin-firstname='${ magentoConfiguration.first_name }' \
         --admin-lastname='${ magentoConfiguration.last_name }' \
         --admin-email='${ magentoConfiguration.email }' \
         --admin-user='${ magentoConfiguration.user }' \
-        --admin-password='${ magentoConfiguration.password }'`, {
-            magentoVersion
-        });
+        --admin-password='${ magentoConfiguration.password }'`);
     }
 });

package/lib/tasks/magento/setup-magento/delete-admin-users.js

@@ -7,8 +7,8 @@ const deleteAdminUsers = () => ({
     title: 'Deleting old admin users',
     skip: async (ctx) => !(await isTableExists('magento', 'admin_user', ctx)),
     task: async (ctx) => {
-        const { mysqlConnection } = ctx;
-        await mysqlConnection.query(`
+        const { databaseConnection } = ctx;
+        await databaseConnection.query(`
             TRUNCATE TABLE admin_user;
         `);
     }

package/lib/tasks/magento/setup-magento/delete-customers.js

@@ -1,4 +1,4 @@
-const { customerTables } = require('../../mysql/magento-tables');
+const { customerTables } = require('../../database/magento-tables');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -6,19 +6,19 @@ const { customerTables } = require('../../mysql/magento-tables');
 const deleteCustomers = () => ({
     title: 'Deleting customers',
     task: async (ctx, task) => {
-        const { mysqlConnection, withCustomersData } = ctx;
+        const { databaseConnection, withCustomersData } = ctx;
 
         if (withCustomersData) {
             task.skip();
             return;
         }
 
-        const [rows] = await mysqlConnection.query('select TABLE_NAME from information_schema.TABLES;');
+        const [rows] = await databaseConnection.query('select TABLE_NAME from information_schema.TABLES;');
 
         await Promise.all(
             customerTables
                 .filter((tableName) => rows.some((row) => row.TABLE_NAME === tableName))
-                .map((tableName) => mysqlConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
+                .map((tableName) => databaseConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
         );
     }
 });

package/lib/tasks/magento/setup-magento/delete-orders.js

@@ -1,4 +1,4 @@
-const { orderTables } = require('../../mysql/magento-tables');
+const { orderTables } = require('../../database/magento-tables');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -6,19 +6,19 @@ const { orderTables } = require('../../mysql/magento-tables');
 const deleteOrders = () => ({
     title: 'Deleting orders',
     task: async (ctx, task) => {
-        const { mysqlConnection, withCustomersData } = ctx;
+        const { databaseConnection, withCustomersData } = ctx;
 
         if (withCustomersData) {
             task.skip();
             return;
         }
 
-        const [rows] = await mysqlConnection.query('select TABLE_NAME from information_schema.TABLES;');
+        const [rows] = await databaseConnection.query('select TABLE_NAME from information_schema.TABLES;');
 
         await Promise.all(
             orderTables
                 .filter((tableName) => rows.some((row) => row.TABLE_NAME === tableName))
-                .map((tableName) => mysqlConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
+                .map((tableName) => databaseConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
         );
     }
 });

package/lib/tasks/magento/setup-magento/disable-2fa.js

@@ -6,13 +6,11 @@ const runMagentoCommand = require('../../../util/run-magento');
  */
 module.exports = () => ({
     title: 'Disabling 2fa for admin',
-    task: async ({ magentoVersion }, task) => {
-        const { modules } = await configPhpToJson(process.cwd(), { magentoVersion });
+    task: async (ctx, task) => {
+        const { modules } = await configPhpToJson(ctx);
 
         if (modules.Magento_TwoFactorAuth !== undefined && modules.Magento_TwoFactorAuth !== 0) {
-            await runMagentoCommand('module:disable Magento_TwoFactorAuth', {
-                magentoVersion
-            });
+            await runMagentoCommand(ctx, 'module:disable Magento_TwoFactorAuth');
 
             return;
         }

package/lib/tasks/magento/setup-magento/disable-maintenance-mode.js

@@ -5,9 +5,8 @@ const runMagentoCommand = require('../../../util/run-magento');
  */
 const disableMaintenanceMode = () => ({
     title: 'Disabling maintenance mode',
-    task: async ({ magentoVersion }, task) => {
-        const { result } = await runMagentoCommand('maintenance:status', {
-            magentoVersion,
+    task: async (ctx, task) => {
+        const { result } = await runMagentoCommand(ctx, 'maintenance:status', {
             throwNonZeroCode: false
         });
 
@@ -16,7 +15,7 @@ const disableMaintenanceMode = () => ({
             return;
         }
 
-        await runMagentoCommand('maintenance:disable', { magentoVersion });
+        await runMagentoCommand(ctx, 'maintenance:disable');
     }
 });
 

package/lib/tasks/magento/setup-magento/increase-admin-session-lifetime.js

@@ -5,7 +5,7 @@ const { updateTableValues } = require('../../../util/database');
  */
 const increaseAdminSessionLifetime = () => ({
     title: 'Increase admin session lifetime to 1 month',
-    task: async ({ mysqlConnection }, task) => updateTableValues('core_config_data', [
+    task: async ({ databaseConnection }, task) => updateTableValues('core_config_data', [
         {
             path: 'admin/security/session_lifetime',
             value: '2800000'
@@ -15,7 +15,7 @@ const increaseAdminSessionLifetime = () => ({
             value: null
         }
     ], {
-        mysqlConnection,
+        databaseConnection,
         task
     })