@scandipwa/magento-scripts 1.16.0-alpha.3 → 1.16.1

package/lib/config/php/extensions/libsodium.js

@@ -1,8 +1,8 @@
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const pathExists = require('../../../util/path-exists');
 const UnknownError = require('../../../errors/unknown-error');
+const phpbrewConfig = require('../../phpbrew');
 
 /**
  * @type {import('../../../../typings/index').PHPExtension}
@@ -12,9 +12,7 @@ module.exports = {
     hooks: {
         postInstall: async ({ php }) => {
             const sodiumDynamicLibraryPath = path.join(
-                os.homedir(),
-                '.phpbrew',
-                'php',
+                phpbrewConfig.phpPath,
                 `php-${php.version}`,
                 'var',
                 'db',

package/lib/config/php-config.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const os = require('os');
+const phpbrewConfig = require('./phpbrew');
 
 module.exports = (app, config) => {
     const { php } = app;
@@ -7,9 +7,7 @@ module.exports = (app, config) => {
     const { cacheDir } = config;
 
     const phpVersionDir = path.join(
-        os.homedir(),
-        '.phpbrew',
-        'php',
+        phpbrewConfig.phpPath,
         `php-${ php.version }`
     );
 

package/lib/tasks/composer/install-prestissimo.js

@@ -46,6 +46,10 @@ Would you like to disable it in your project?`,
                                     name: 'disable',
                                     message: 'Disable it, thanks'
                                 },
+                                {
+                                    name: 'remove',
+                                    message: `Remove ${prestissimoPluginName} from your system`
+                                },
                                 {
                                     name: 'skip',
                                     message: 'Skip this step'
@@ -56,6 +60,17 @@ Would you like to disable it in your project?`,
                         if (disableConfirmation === 'disable') {
                             localComposerJsonData.config['allow-plugins'][prestissimoPluginName] = false;
                             await fs.promises.writeFile(localComposerJsonPath, JSON.stringify(localComposerJsonData, null, 4), 'utf-8');
+
+                            return;
+                        }
+
+                        if (disableConfirmation === 'remove') {
+                            await runComposerCommand(`global remove ${prestissimoPluginName}`, {
+                                throwNonZeroCode: false,
+                                magentoVersion
+                            });
+
+                            return;
                         }
                     }
                 }

package/lib/tasks/docker/containers.js

@@ -1,6 +1,8 @@
 /* eslint-disable max-len */
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const sleep = require('../../util/sleep');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @param {Object} options
@@ -164,6 +166,41 @@ const getContainerStatus = async (containerName) => {
     }
 };
 
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const checkContainersAreRunning = () => ({
+    title: 'Checking container statuses',
+    task: async (ctx, task) => {
+        const { config: { docker }, ports } = ctx;
+        const containers = Object.values(docker.getContainers(ports));
+        let tries = 0;
+        while (tries < 3) {
+            const containersWithStatus = await Promise.all(
+                containers.map(async (container) => ({
+                    ...container,
+                    status: await getContainerStatus(container.name)
+                }))
+            );
+
+            if (containersWithStatus.some((c) => c.status.Status !== 'running')) {
+                if (tries === 2) {
+                    throw new KnownError(`${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} containers are not running! Please check container logs for more details!`);
+                } else {
+                    task.output = `${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} are not running, waiting if something will change...`;
+                    await sleep(2000);
+                    tries++;
+                }
+            } else {
+                break;
+            }
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
@@ -188,5 +225,7 @@ module.exports = {
     startContainers,
     stopContainers,
     pullContainers,
-    statusContainers
+    statusContainers,
+    checkContainersAreRunning,
+    getContainerStatus
 };

package/lib/tasks/docker/index.js

@@ -19,7 +19,8 @@ const startServices = () => ({
                 ctx
             })
         },
-        containers.startContainers()
+        containers.startContainers(),
+        containers.checkContainersAreRunning()
     ], {
         concurrent: false,
         exitOnError: true

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

@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const os = require('os');
 const runComposerCommand = require('../../util/run-composer');
 const matchFilesystem = require('../../util/match-filesystem');
@@ -128,7 +129,7 @@ const createMagentoProject = async ({
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const installMagentoProject = () => ({
-    title: 'Installing Magento',
+    title: 'Installing Magento Project',
     task: async (ctx, task) => {
         const { magentoVersion, config: { baseConfig, overridenConfiguration }, verbose } = ctx;
         const {
@@ -180,6 +181,12 @@ const installMagentoProject = () => ({
                 verbose
             });
         }
+
+        if (!await pathExists(path.join(process.cwd(), 'app', 'etc'))) {
+            await fs.promises.mkdir(path.join(process.cwd(), 'app', 'etc'), {
+                recursive: true
+            });
+        }
         try {
             await runComposerCommand('install',
                 {

package/lib/tasks/magento/setup-magento/index.js

@@ -10,7 +10,6 @@ const setUrlRewrite = require('./set-url-rewrite');
 const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime');
 const magentoTask = require('../../../util/magento-task');
 const urnHighlighter = require('./urn-highlighter');
-const waitingForVarnish = require('./waiting-for-varnish');
 const adjustFullPageCache = require('./adjust-full-page-cache');
 
 /**
@@ -50,8 +49,7 @@ const setupMagento = (options = {}) => ({
             disable2fa(),
             urnHighlighter(),
             adjustFullPageCache(),
-            magentoTask('cache:flush'),
-            waitingForVarnish()
+            magentoTask('cache:flush')
         ], {
             concurrent: false,
             exitOnError: true,

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

@@ -12,7 +12,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installMagento = ({ isDbEmpty = false } = {}) => ({
-    title: 'Installing magento',
+    title: 'Installing Magento in Database',
     task: async (ctx, task) => {
         if (isDbEmpty) {
             task.output = 'No Magento is installed in DB!\nInstalling...';
@@ -23,8 +23,53 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 docker,
                 magentoConfiguration
             },
-            ports
+            ports,
+            mysqlConnection
         } = ctx;
+
+        const [tableResponse] = await mysqlConnection.query(
+            'SELECT * FROM information_schema.tables WHERE table_schema = \'magento\' AND table_name = \'admin_user\' LIMIT 1;'
+        );
+
+        if (tableResponse.length > 0) {
+            const response = await mysqlConnection.query(
+                'select * from admin_user where username=\'admin\';'
+            );
+
+            const usersWithUsernameAdmin = response && response.length > 0 && response[0];
+
+            if (usersWithUsernameAdmin && usersWithUsernameAdmin.length > 0) {
+                const confirmDeleteAdminUsers = await task.prompt({
+                    type: 'Select',
+                    message: `In order to install Magento in database you will need to delete admin user with username ${logger.style.command('admin')}`,
+                    choices: [
+                        {
+                            name: 'delete-all',
+                            message: `Delete all admin users (${logger.style.code('Recommended')})`
+                        },
+                        {
+                            name: 'delete-only-admin',
+                            message: `Delete only admin user with ${logger.style.command('admin')} username`
+                        }
+                    ]
+                });
+
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 0;');
+
+                if (confirmDeleteAdminUsers === 'delete-all') {
+                    await mysqlConnection.query(`
+                    TRUNCATE TABLE admin_user;
+                `);
+                } else {
+                    await mysqlConnection.query(`
+                    DELETE FROM admin_user WHERE username='admin';
+                `);
+                }
+
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
+            }
+        }
+
         const { mysql: { env } } = docker.getContainers(ports);
         const envPhpData = await envPhpToJson(process.cwd(), {
             magentoVersion: ctx.magentoVersion

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -82,13 +82,15 @@ const migrateDatabase = (options = {}) => ({
         case 1: {
             if (options.onlyInstallMagento) {
                 ctx.isSetupUpgradeNeeded = false;
-                return task.newListr(
-                    installMagentoProject()
-                );
+                return task.newListr([
+                    installMagentoProject(),
+                    installMagento()
+                ]);
             }
 
             return task.newListr([
                 installMagentoProject(),
+                installMagento(),
                 updateEnvPHP(),
                 varnishConfigSetup(),
                 configureElasticsearch(),

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

@@ -6,7 +6,7 @@ const getIsWsl = require('../../../util/is-wsl');
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const varnishConfigSetup = () => ({
-    title: 'Varnish setup',
+    title: 'Varnish Database setup',
     task: async (ctx, task) => {
         const {
             config: {

package/lib/tasks/mysql/connect-to-mysql.js

@@ -78,6 +78,17 @@ const gettingMySQLConnection = () => ({
     }
 });
 
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const terminatingExistingConnection = () => ({
+    title: 'Terminating existing MySQL connection',
+    skip: (ctx) => !ctx.mysqlConnection,
+    task: (ctx) => {
+        ctx.mysqlConnection.destroy();
+    }
+});
+
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
@@ -87,6 +98,7 @@ const connectToMySQL = () => ({
     task: (ctx, task) => task.newListr([
         waitForMySQLInitialization(),
         createMagentoDatabase(),
+        terminatingExistingConnection(),
         gettingMySQLConnection()
     ], {
         concurrent: false,

package/lib/tasks/mysql/import-dump-to-mysql.js

@@ -2,23 +2,100 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const KnownError = require('../../errors/known-error');
 const UnknownError = require('../../errors/unknown-error');
-const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { execAsyncSpawn, execCommandTask } = require('../../util/exec-async-command');
 const pathExists = require('../../util/path-exists');
+const connectToMySQL = require('./connect-to-mysql');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const importDumpToMySQL = () => ({
-    title: 'Importing Database Dump To MySQL',
+const copyDatabaseDumpIntoContainer = () => ({
+    title: 'Copying database dump into container',
     task: async (ctx, task) => {
-        if (!await pathExists(ctx.importDb)) {
-            throw new KnownError(`Dump file at ${ctx.importDb} does not exist. Please provide correct relative path to the file`);
-        }
+        const { config: { docker }, ports } = ctx;
+        const { mysql } = docker.getContainers(ports);
 
+        return task.newListr(
+            execCommandTask(`docker cp ${ctx.importDb} ${mysql.name}:/dump.sql`, {
+                logOutput: true
+            })
+        );
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const runSetGlobalLogBinTrustFunctionCreatorsCommand = () => ({
+    task: async (ctx, task) => {
         const { config: { docker }, ports } = ctx;
+        const { mysql } = docker.getContainers(ports);
 
+        return task.newListr(
+            execCommandTask(`docker exec ${mysql.name} bash -c 'mysql -uroot -p${mysql.env.MYSQL_ROOT_PASSWORD} -e "SET GLOBAL log_bin_trust_function_creators = 1;"'`)
+        );
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const deleteDatabaseBeforeImportingDumpPrompt = () => ({
+    title: 'Deleting magento database before importing dump',
+    task: async (ctx, task) => {
+        const deleteDatabaseMagentoChoice = await task.prompt({
+            type: 'Select',
+            message: `Before importing database dump, would you like to delete existing database?
+
+It is possible that dump might interfere with existing data in database.
+
+Note that you will lose your existing database!`,
+            choices: [
+                {
+                    name: 'delete',
+                    message: 'YES I AM SURE I WANT TO DELETE magento DATABASE!'
+                },
+                {
+                    name: 'skip',
+                    message: 'Skip this step'
+                }
+            ]
+        });
+
+        if (deleteDatabaseMagentoChoice === 'delete') {
+            await ctx.mysqlConnection.query('DROP DATABASE IF EXISTS magento;');
+            await ctx.mysqlConnection.query('CREATE DATABASE magento;');
+            return;
+        }
+        task.skip();
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const executeImportDumpSQL = () => ({
+    task: async (ctx, task) => {
+        const { config: { docker }, ports } = ctx;
         const { mysql } = docker.getContainers(ports);
 
+        const userCredentialsForMySQLCLI = await task.prompt({
+            type: 'Select',
+            message: 'Which user do you want to use to import db in MySQL client?',
+            choices: [
+                {
+                    name: `--user=root --password=${mysql.env.MYSQL_ROOT_PASSWORD}`,
+                    message: `root (${logger.style.command('Probably safest option')})`
+                },
+                {
+                    name: `--user=${mysql.env.MYSQL_USER} --password=${mysql.env.MYSQL_PASSWORD}`,
+                    message: `${mysql.env.MYSQL_USER}`
+                }
+            ]
+        });
+
+        const importCommand = `docker exec ${mysql.name} bash -c "mysql ${userCredentialsForMySQLCLI} magento < ./dump.sql"`;
+
         const startImportTime = Date.now();
         const tickInterval = setInterval(() => {
             task.title = `Importing Database Dump To MySQL, ${Math.floor((Date.now() - startImportTime) / 1000)}s in progress...`;
@@ -26,18 +103,7 @@ const importDumpToMySQL = () => ({
 
         try {
             await execAsyncSpawn(
-                `docker cp ${ctx.importDb} ${mysql.name}:/dump.sql`
-            );
-
-            await execAsyncSpawn(
-                `docker exec ${mysql.name} bash -c 'mysql -uroot -p${mysql.env.MYSQL_ROOT_PASSWORD} -e "SET GLOBAL log_bin_trust_function_creators = 1;"'`
-            );
-
-            /**
-             * Using `mysql` instead of `mysqlimport` because `mysqlimport` has permission issues during import
-             */
-            await execAsyncSpawn(
-                `docker exec ${mysql.name} bash -c "mysql -umagento -pmagento magento < ./dump.sql"`,
+                importCommand,
                 {
                     callback: (t) => {
                         task.output = t;
@@ -54,15 +120,42 @@ You can try replacing all occurrences of ${logger.style.misc('utf8mb4_0900_ai_ci
             }
 
             throw new UnknownError(`Unexpected error during dump import.\n\n${e}`);
+        } finally {
+            clearInterval(tickInterval);
         }
-
-        clearInterval(tickInterval);
-
-        task.title = 'Database imported!';
     },
     options: {
         bottomBar: 10
     }
 });
 
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const importDumpToMySQL = () => ({
+    title: 'Importing Database Dump To MySQL',
+    task: async (ctx, task) => {
+        if (!await pathExists(ctx.importDb)) {
+            throw new KnownError(`Dump file at ${ctx.importDb} does not exist. Please provide correct relative path to the file`);
+        }
+
+        return task.newListr([
+            copyDatabaseDumpIntoContainer(),
+            deleteDatabaseBeforeImportingDumpPrompt(),
+            runSetGlobalLogBinTrustFunctionCreatorsCommand(),
+            executeImportDumpSQL(),
+            connectToMySQL(),
+            {
+                task: () => {
+                    task.title = 'Database imported!';
+                }
+            }
+        ], {
+            rendererOptions: {
+                collapse: false
+            }
+        });
+    }
+});
+
 module.exports = importDumpToMySQL;

package/lib/tasks/php/compile.js

@@ -3,6 +3,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const compileOptions = require('./compile-options');
 const UnknownError = require('../../errors/unknown-error');
+const { getPHPForPHPBrewBin } = require('../../util/get-php-for-phpbrew');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -10,6 +11,7 @@ const UnknownError = require('../../errors/unknown-error');
 const compilePHP = () => ({
     title: 'Compiling PHP',
     task: async ({ config: { php } }, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const platformCompileOptions = compileOptions[process.platform];
         if (process.platform === 'linux') {
             const { distro } = await systeminformation.osInfo();
@@ -29,7 +31,11 @@ const compilePHP = () => ({
                     callback: (t) => {
                         task.output = t;
                     },
-                    useRosetta2: true
+                    useRosetta2: true,
+                    env: phpBinForPHPBrew ? {
+                        ...process.env,
+                        PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                    } : process.env
                 }
             );
         } catch (e) {

package/lib/tasks/php/extensions/disable.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -9,6 +10,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const disableExtension = (extensionName) => ({
     title: `Disabling ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -28,7 +30,11 @@ const disableExtension = (extensionName) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
             if (hooks && hooks.postDisable) {
                 await Promise.resolve(hooks.postDisable(config));

package/lib/tasks/php/extensions/enable.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -10,6 +11,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const enableExtension = (extensionName, extensionOptions) => ({
     title: `Enabling ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -30,7 +32,11 @@ const enableExtension = (extensionName, extensionOptions) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (hooks && hooks.postEnable) {

package/lib/tasks/php/extensions/index.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const pathExists = require('../../../util/path-exists');
 const phpbrewConfig = require('../../../config/phpbrew');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * Get enabled extensions list with versions
@@ -11,9 +12,16 @@ const phpbrewConfig = require('../../../config/phpbrew');
  * @returns {Promise<{[key: string]: string}}>}
  */
 const getEnabledExtensions = async ({ php }) => {
+    const phpBinForPHPBrew = await getPHPForPHPBrewBin();
     const output = await execAsyncSpawn(
         `${ php.binPath } -c ${php.iniPath} -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`,
-        { useRosetta2: true }
+        {
+            useRosetta2: true,
+            env: phpBinForPHPBrew ? {
+                ...process.env,
+                PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+            } : process.env
+        }
     );
 
     return output

package/lib/tasks/php/extensions/install.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 const phpbrewConfig = require('../../../config/phpbrew');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 
 /**
  * @param {String} extensionName
@@ -10,6 +11,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const installExtension = (extensionName, extensionOptions) => ({
     title: `Installing ${extensionName} extension`,
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const {
             config,
             config: { php }
@@ -32,7 +34,11 @@ const installExtension = (extensionName, extensionOptions) => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (hooks && hooks.postInstall) {

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

@@ -1,5 +1,6 @@
 const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../util/get-php-for-phpbrew');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -7,9 +8,14 @@ const { execAsyncSpawn } = require('../../util/exec-async-command');
 const updatePhpBrew = () => ({
     title: 'Updating PHPBrew PHP versions',
     task: async ({ config: { php } }, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         try {
             const knownPhpVersions = await execAsyncSpawn('phpbrew known', {
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
 
             if (knownPhpVersions.includes(`${php.version}`)) {
@@ -21,7 +27,11 @@ const updatePhpBrew = () => ({
                 callback: (t) => {
                     task.output = t;
                 },
-                useRosetta2: true
+                useRosetta2: true,
+                env: phpBinForPHPBrew ? {
+                    ...process.env,
+                    PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+                } : process.env
             });
         } catch (e) {
             throw new UnknownError(`Unexpected error while updating phpbrew known php versions\n\n${e}`);

package/lib/tasks/requirements/index.js

@@ -12,10 +12,10 @@ const checkRosetta = require('./rosetta');
 const checkRequirements = () => ({
     title: 'Checking requirements',
     task: (ctx, task) => task.newListr([
-        // checking if user is on supported platform
-        checkPlatform(),
         // check if rosetta 2 is installed or not on m1 macs
         checkRosetta(),
+        // checking if user is on supported platform
+        checkPlatform(),
         // check the Docker installation
         checkDocker(),
         // check for Node.js version

package/lib/tasks/requirements/phpbrew/index.js

@@ -1,6 +1,7 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { getPHPForPHPBrewBin } = require('../../../util/get-php-for-phpbrew');
 const installPHPBrew = require('./install');
 const getPHPBrewVersion = require('./version');
 
@@ -10,8 +11,13 @@ const getPHPBrewVersion = require('./version');
 const checkPHPBrew = () => ({
     title: 'Checking phpbrew',
     task: async (ctx, task) => {
+        const phpBinForPHPBrew = await getPHPForPHPBrewBin();
         const { code } = await execAsyncSpawn('phpbrew --version', {
-            withCode: true
+            withCode: true,
+            env: phpBinForPHPBrew ? {
+                ...process.env,
+                PATH: `${phpBinForPHPBrew}:${process.env.PATH}`
+            } : process.env
         });
 
         if (code !== 0) {

package/lib/tasks/requirements/phpbrew/install.js

@@ -68,7 +68,6 @@ const installPHPBrewBinary = () => ({
         bottomBar: 10
     }
 });
-
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
@@ -79,12 +78,19 @@ const addPHPBrewInitiatorLineToConfigFile = () => ({
         const shellConfigFileName = `.${shellName}rc`;
 
         const addLineToShellConfigFIle = await task.prompt({
-            type: 'Confirm',
+            type: 'Select',
             message: `To finish configuring PHPBrew we need to add ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')} line to your ${ shellConfigFileName } file.
-Do you want to do it now?`
+Do you want to do it now?`,
+            choices: [{
+                name: 'yes',
+                message: 'Yeah, thanks'
+            }, {
+                name: 'no',
+                message: 'No, I will deal with this myself'
+            }]
         });
 
-        if (!addLineToShellConfigFIle) {
+        if (addLineToShellConfigFIle === 'no') {
             task.skip();
             return;
         }
@@ -101,16 +107,26 @@ Do you want to do it now?`
             );
         } else {
             const continueInstall = await task.prompt({
-                type: 'Confirm',
+                type: 'Select',
                 message: `Unfortunately we cannot automatically add necessary configuration for your shell ${process.env.SHELL}!
 You will need to that manually!
 
 Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
 
-When you ready, press select Yes and installation will continue.`
+When you ready, press Enter and installation will continue.`,
+                choices: [
+                    {
+                        name: 'yes',
+                        message: 'YES'
+                    },
+                    {
+                        name: 'no',
+                        message: 'Exit installation'
+                    }
+                ]
             });
 
-            if (!continueInstall) {
+            if (continueInstall === 'no') {
                 throw new KnownError(`Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
 
 Then you can continue installation.`);

package/lib/tasks/start.js

@@ -32,6 +32,7 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
 const validatePHPInstallation = require('./php/validate-php');
 const installSodiumExtension = require('./php/install-sodium');
+const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -120,8 +121,8 @@ const configureProject = () => ({
         installPrestissimo(),
         installMagentoProject(),
         enableMagentoComposerPlugins(),
-        startServices(),
         startPhpFpm(),
+        startServices(),
         connectToMySQL()
     ])
 });
@@ -149,7 +150,8 @@ const finishProjectConfiguration = () => ({
                 });
             }
         },
-        setupThemes()
+        setupThemes(),
+        waitingForVarnish()
     ], {
         rendererOptions: {
             collapse: false

package/lib/util/exec-async-command.d.ts

@@ -11,6 +11,7 @@ interface ExecAsyncSpawnOptions<T extends boolean> {
     withCode?: T
     // only for mac
     useRosetta2?: boolean
+    env: NodeJS.ProcessEnv
 }
 
 /**

package/lib/util/exec-async-command.js

@@ -10,11 +10,16 @@ const execAsyncSpawn = (command, {
     logOutput = false,
     cwd,
     withCode = false,
-    useRosetta2 = false
+    useRosetta2 = false,
+    env = process.env
 } = {}) => {
+    /**
+     * @type {import('child_process').SpawnOptionsWithoutStdio}
+     */
     const spawnOptions = {
         stdio: pipeInput ? ['inherit', 'pipe', 'pipe'] : 'pipe',
-        cwd
+        cwd,
+        env
     };
 
     /**

package/lib/util/get-php-for-phpbrew.js

@@ -0,0 +1,30 @@
+const fs = require('fs');
+const path = require('path');
+const phpbrewConfig = require('../config/phpbrew');
+const pathExists = require('./path-exists');
+
+const getPHPForPHPBrewBin = async () => {
+    if (!await pathExists(phpbrewConfig.phpPath)) {
+        return '';
+    }
+
+    const buildedPHPs = await fs.promises.readdir(phpbrewConfig.phpPath, {
+        encoding: 'utf-8',
+        withFileTypes: true
+    });
+
+    const phpForPHPBrew = buildedPHPs.find((p) => p.isDirectory() && p.name.endsWith('phpbrew'));
+
+    if (phpForPHPBrew) {
+        const phpBinPath = path.join(phpbrewConfig.phpPath, phpForPHPBrew.name, 'bin');
+        if (await pathExists(phpBinPath)) {
+            return phpBinPath;
+        }
+    }
+
+    return '';
+};
+
+module.exports = {
+    getPHPForPHPBrewBin
+};

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.16.0-alpha.3",
+    "version": "1.16.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "1801104ed104a124f8d08cc81008d21b792857e4"
+    "gitHead": "ced1b75c1b448ef198a658edf010f53179aaaeb0"
 }