@scandipwa/magento-scripts 1.11.2 → 1.12.0

package/lib/config/dependencies-for-platforms.js

@@ -86,7 +86,6 @@ const dependenciesForPlatforms = {
             'libreadline-dev',
             'libsodium-dev',
             'libsqlite3-dev',
-            'libssl-dev',
             'libxml2-dev',
             ['libxslt-dev', 'libxslt1-dev'],
             'libonig-dev',

package/lib/config/index.js

@@ -4,9 +4,10 @@ const {
     getConfigurations,
     defaultConfiguration
 } = require('./versions');
-const getPhpConfig = require('./php');
+const getPhpConfig = require('./php-config');
 const getComposerConfig = require('./composer');
 const { getMagentoConfig } = require('./magento-config');
+const { getPhpStormConfig } = require('./phpstorm/debug-config');
 const resolveConfigurationWithOverrides = require('../util/resolve-configuration-with-overrides');
 const { getPrefix, folderName } = require('../util/prefix');
 
@@ -57,7 +58,8 @@ module.exports = {
             baseConfig: newBaseConfig,
             overridenConfiguration,
             userConfiguration,
-            nonOverridenConfiguration: configurations[magentoVersion]
+            nonOverridenConfiguration: configurations[magentoVersion],
+            phpStorm: getPhpStormConfig(overridenConfiguration, newBaseConfig)
         };
     },
     baseConfig,

package/lib/config/phpstorm/debug-config.js

@@ -0,0 +1,46 @@
+const path = require('path');
+
+const getPhpStormConfig = (app, config) => {
+    const [majorPHPVersion, minorPHPVersion] = app.configuration.php.version.split('.');
+    const phpLanguageLevel = `${ majorPHPVersion }.${ minorPHPVersion }`;
+    const { templateDir } = config;
+    const phpStormConfiguration = {
+        xdebug: {
+            v2Port: '9111',
+            v3Port: '9003',
+            debugServerAddress: `http://${ app.host }`,
+            serverName: 'create-magento-app',
+            runManagerName: 'create-magento-app',
+            sessionId: 'PHPSTORM',
+            path: path.join(process.cwd(), '.idea', 'workspace.xml'),
+            templatePath: path.join(templateDir, 'workspace.template.xml')
+        },
+        php: {
+            phpLanguageLevel,
+            path: path.join(process.cwd(), '.idea', 'php.xml'),
+            templatePath: path.join(templateDir, 'php.template.xml')
+        },
+        database: {
+            driver: 'mysql',
+            dataSourceManagerName: 'mysql 8.0',
+            dataSourcesLocal: {
+                path: path.join(process.cwd(), '.idea', 'dataSources.local.xml'),
+                templatePath: path.join(templateDir, 'dataSources.local.template.xml')
+            },
+            dataSources: {
+                path: path.join(process.cwd(), '.idea', 'dataSources.xml'),
+                templatePath: path.join(templateDir, 'dataSources.template.xml')
+            }
+        },
+        inspectionTools: {
+            path: path.join(process.cwd(), '.idea', 'inspectionProfiles', 'Project_Default.xml'),
+            templatePath: path.join(templateDir, 'Project_Default.template.xml')
+        }
+    };
+
+    return phpStormConfiguration;
+};
+
+module.exports = {
+    getPhpStormConfig
+};

package/lib/config/templates/Project_Default.template.xml

@@ -0,0 +1,13 @@
+<component name="InspectionProjectProfileManager">
+    <profile version="1.0">
+        <option name="myName" value="Project Default" />
+        <inspection_tool class="PhpCSValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+            <option name="CODING_STANDARD" value="Custom" />
+            <option name="CUSTOM_RULESET_PATH" value="$PROJECT_DIR$/vendor/magento/magento-coding-standard/Magento2/ruleset.xml" />
+            <option name="USE_INSTALLED_PATHS" value="true" />
+            <option name="INSTALLED_PATHS" value="$PROJECT_DIR$/vendor/phpcompatibility/php-compatibility/PHPCompatibility" />
+            <option name="EXTENSIONS" value="php,js,css,inc" />
+        </inspection_tool>
+        <inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    </profile>
+</component>

package/lib/config/templates/dataSources.local.template.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal" created-in="PS-212.5284.49">
+    <data-source name="<%~ it.phpStorm.database.dataSourceManagerName %>" uuid="a2eadb3c-6fc9-4d85-b5f4-d8114906ce2f">
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
+      <secret-storage>master_key</secret-storage>
+      <user-name>magento</user-name>
+      <schema-mapping />
+    </data-source>
+  </component>
+</project>

package/lib/config/templates/dataSources.template.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="<%~ it.phpStorm.database.dataSourceManagerName %>" uuid="a2eadb3c-6fc9-4d85-b5f4-d8114906ce2f">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url><%= it.jdbcUrl %></jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

package/lib/config/templates/php.template.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="PhpCodeSniffer">
+        <phpcs_settings>
+            <PhpCSConfiguration beautifier_path="$PROJECT_DIR$/vendor/bin/phpcbf" standards="Magento2;MySource;PEAR;PHPCompatibility;PSR1;PSR12;PSR2;Squiz;Zend" tool_path="$PROJECT_DIR$/vendor/bin/phpcs" />
+        </phpcs_settings>
+    </component>
+    <component name="PhpStan">
+        <PhpStan_settings>
+            <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
+        </PhpStan_settings>
+    </component>
+    <component name="PhpProjectSharedConfiguration" php_language_level="<%~ it.phpLanguageLevel %>" />
+</project>

package/lib/config/templates/vscode-launch.template.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": <%~ it.XDebugPort %>,
+            "runtimeExecutable": "<%~ it.PHPBinPath %>"
+        }
+    ]
+}

package/lib/config/templates/workspace.template.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="PhpDebugGeneral" xdebug_debug_port="<%~ it.phpStorm.xdebug.v3Port %>" ignore_connections_through_unregistered_servers="true">
+        <xdebug_debug_ports port="<%~ it.phpStorm.xdebug.v3Port %>" />
+        <xdebug_debug_ports port="<%~ it.phpStorm.xdebug.v2Port %>" />
+    </component>
+    <component name="PhpServers">
+        <servers>
+            <server host="<%~ it.phpStorm.xdebug.debugServerAddress %>" id="7e16e907-9ce3-4559-9d26-a30a5650d11f" name="<%~ it.phpStorm.xdebug.serverName %>" />
+        </servers>
+    </component>
+    <component name="RunManager">
+        <configuration name="<%~ it.phpStorm.xdebug.runManagerName %>" type="PhpRemoteDebugRunConfigurationType" factoryName="PHP Remote Debug" filter_connections="FILTER" server_name="<%~ it.phpStorm.xdebug.serverName %>" session_id="<%~ it.phpStorm.xdebug.sessionId %>">
+            <method v="2" />
+        </configuration>
+    </component>
+    <component name="PropertiesComponent">
+        <property name="DatabaseDriversLRU" value="<%~ it.phpStorm.database.driver %>" />
+    </component>
+</project>

package/lib/config/versions/magento-2.3.0.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.1.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.2-p2.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.2.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.3-p1.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.3.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.4-p2.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.4.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.5-p1.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.5-p2.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.5.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.6-p1.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.6.js

@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.3.7-p1.js

@@ -5,7 +5,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p1',
     configuration: {
         php: {
-            version: '7.4.13',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },
@@ -36,7 +36,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.9.3'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.3.7.js

@@ -5,7 +5,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7',
     configuration: {
         php: {
-            version: '7.4.13',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '2.9.8'
+                    version: '3.1.2'
                 }
             }
         },
@@ -36,7 +36,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.9.3'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.4.0-p1.js

@@ -5,7 +5,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0-p1',
     configuration: {
         php: {
-            version: '7.4.16',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.4.0.js

@@ -5,7 +5,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0',
     configuration: {
         php: {
-            version: '7.4.16',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.4.1-p1.js

@@ -6,7 +6,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1-p1',
     configuration: {
         php: {
-            version: '7.4.16',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -17,7 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 libsodium,
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.4.1.js

@@ -5,7 +5,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
     configuration: {
         php: {
-            version: '7.4.13',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -15,7 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
                 sockets: {},
                 SimpleXML: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },

package/lib/config/versions/magento-2.4.2-p1.js

@@ -7,7 +7,7 @@ module.exports = ({ templateDir } = {}) => ({
     isDefault: true,
     configuration: {
         php: {
-            version: '7.4.18',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -19,7 +19,7 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 fileinfo: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },
@@ -40,7 +40,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.12.1'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.4.2-p2.js

@@ -7,7 +7,7 @@ module.exports = ({ templateDir } = {}) => ({
     isDefault: true,
     configuration: {
         php: {
-            version: '7.4.18',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -19,7 +19,7 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 fileinfo: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },
@@ -40,7 +40,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.12.1'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.4.2.js

@@ -6,7 +6,7 @@ module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
     configuration: {
         php: {
-            version: '7.4.18',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -18,7 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 fileinfo: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },
@@ -39,7 +39,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.12.1'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.4.3-p1.js

@@ -7,7 +7,7 @@ module.exports = ({ templateDir } = {}) => ({
     isDefault: true,
     configuration: {
         php: {
-            version: '7.4.18',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -19,7 +19,7 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 fileinfo: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },
@@ -40,7 +40,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.12.1'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/config/versions/magento-2.4.3.js

@@ -7,7 +7,7 @@ module.exports = ({ templateDir } = {}) => ({
     isDefault: true,
     configuration: {
         php: {
-            version: '7.4.18',
+            version: '7.4.27',
             configTemplate: path.join(templateDir || '', 'php.template.ini'),
             extensions: {
                 gd: {},
@@ -19,7 +19,7 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 fileinfo: {},
                 xdebug: {
-                    version: '3.0.4'
+                    version: '3.1.2'
                 }
             }
         },
@@ -40,7 +40,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '7.12.1'
         },
         composer: {
-            version: '2'
+            version: '2.1.14'
         }
     },
     magento: defaultMagentoConfig,

package/lib/tasks/composer/index.js

@@ -32,8 +32,12 @@ const createComposerDir = async ({ composer }) => {
 };
 
 const downloadComposerBinary = async ({ composer }) => {
+    const composerVersion = /^\d$/.test(composer.version)
+        ? `latest-${composer.version}.x`
+        : composer.version;
+
     try {
-        await downloadFile(`https://getcomposer.org/download/latest-${composer.version}.x/composer.phar`, {
+        await downloadFile(`https://getcomposer.org/download/${composerVersion}/composer.phar`, {
             destination: composer.binPath
         });
     } catch (e) {
@@ -48,7 +52,7 @@ const downloadComposerBinary = async ({ composer }) => {
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const installComposer = () => ({
-    title: 'Installing composer',
+    title: 'Installing Composer',
     task: async (ctx, task) => {
         const { composer, php } = ctx.config;
         const hasComposerInCache = await pathExists(composer.binPath);
@@ -59,11 +63,14 @@ const installComposer = () => ({
             await downloadComposerBinary({ composer });
         } else {
             const currentComposerVersion = await getComposerVersion({ composer, php });
+            const expectedComposerVersion = /^\d$/.test(composer.version)
+                ? `${composer.version}.x`
+                : composer.version;
 
-            if (!semver.satisfies(currentComposerVersion, `${composer.version}.x`)) {
+            if (!semver.satisfies(currentComposerVersion, expectedComposerVersion)) {
                 const continueComposerBinaryVersionSwitch = await task.prompt({
                     type: 'Select',
-                    message: `You have Composer ${logger.style.misc(`${currentComposerVersion}`)} while your Magento version requires ${logger.style.misc(`${composer.version}.x`)}!`,
+                    message: `You have Composer ${logger.style.misc(`${currentComposerVersion}`)} while your Magento version requires ${logger.style.misc(expectedComposerVersion)}!`,
                     choices: [
                         {
                             message: `Continue with current installed version (${logger.style.misc(`${currentComposerVersion}`)})`,
@@ -86,7 +93,7 @@ const installComposer = () => ({
                     break;
                 }
                 case 'exit': {
-                    throw new Error(`Current composer version ${logger.style.misc(`v${currentComposerVersion}`)} is not compatible with version ${logger.style.misc(`${composer.version}.x`)}!`);
+                    throw new Error(`Current composer version ${logger.style.misc(`v${currentComposerVersion}`)} is not compatible with version ${logger.style.misc(expectedComposerVersion)}!`);
                 }
                 case 'continue':
                 default: {
@@ -98,7 +105,7 @@ const installComposer = () => ({
         }
 
         const composerVersion = await getComposerVersion({ composer, php });
-        task.title = `Using composer version ${composerVersion}`;
+        task.title = `Using Composer version ${composerVersion}`;
         ctx.composerVersion = composerVersion;
     },
     options: {

package/lib/tasks/docker/index.js

@@ -6,7 +6,7 @@ const volumes = require('./volumes');
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const startServices = () => ({
-    title: 'Starting docker services',
+    title: 'Starting Docker services',
     task: (ctx, task) => task.newListr([
         {
             title: 'Preparing services',