@scandipwa/magento-scripts 2.4.9 → 2.4.10

package/lib/commands/cli.js

@@ -98,7 +98,7 @@ module.exports = (yargs) => {
 
             block
                 .addLine(
-                    `Clear Magento cache: ${logger.style.command('m c:f')}`
+                    `Clear Magento cache: ${logger.style.command('m c:c')}`
                 )
                 .addLine(
                     `Magento setup upgrade: ${logger.style.command('m se:up')}`
@@ -128,21 +128,37 @@ module.exports = (yargs) => {
                 .addEmptyLine()
 
             block
-                .addLine('Debug PHP in CLI:')
+                .addSeparator('Debugging PHP')
+                .addEmptyLine()
                 .addLine('1. Start debugger in VSCode or PHPStorm')
                 .addLine(
-                    `2. Go to PHP container: ${logger.style.command(
-                        'exec phpWithXdebug'
+                    `2. Set breakpoint in any PHP file (example: ${logger.style.file(
+                        'app/autoload.php'
+                    )} or ${logger.style.file('pub/index.php')})`
+                )
+                .addEmptyLine()
+                .addLine('Choose debugging approach:')
+                .addLine(`A. Run CLI command to debug any PHP file or Magento:`)
+                .addLine(`   ${logger.style.command('debugphp php -v')}`)
+                .addLine(
+                    `   ${logger.style.command(
+                        'debugphp magento setup:upgrade'
                     )}`
                 )
+                .addLine(`   ${logger.style.command('debugphp magento ...')}`)
+                .addEmptyLine()
                 .addLine(
-                    `3. Run CLI command with ${logger.style.code(
-                        'XDEBUG_SESSION=PHPSTORM'
-                    )} environmental variable: ${logger.style.command(
-                        'XDEBUG_SESSION=PHPSTORM magento <command>'
+                    `B. Or enter PHP container with XDebug: ${logger.style.command(
+                        'debugphp'
                     )}`
                 )
-                .addLine('4. Enjoy')
+                .addLine(
+                    `   And run any command: ${logger.style.command(
+                        'magento <command>'
+                    )} or ${logger.style.command('php <command>')}`
+                )
+                .addEmptyLine()
+                .addLine('Enjoy!')
 
             block.log()
 

package/lib/config/docker.js

@@ -123,7 +123,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             : {}
 
         /**
-         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[], serviceReadyLog?: string, platform?: string }>}
+         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[], serviceReadyLog?: string, platform?: string, execCommandEnv?: Record<string, string> }>}
          */
         const dockerConfig = {
             php: {
@@ -179,7 +179,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 serviceReadyLog: 'ready to handle connections',
                 platform: rosettaTranslatedContainers.includes('php')
                     ? 'linux/amd64'
-                    : undefined
+                    : php.platform
             },
             phpWithXdebug: {
                 _: 'PHP with Xdebug',
@@ -231,6 +231,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 pullImage: false,
                 name: `${prefix}_php_with_xdebug`,
                 connectCommand: ['/bin/sh'],
+                execCommandEnv: {
+                    XDEBUG_TRIGGER: 'PHPSTORM'
+                },
                 dependsOn: ['mariadb', 'redis', 'elasticsearch'],
                 user:
                     (ctx.platform === 'linux' && isDockerDesktop) ||
@@ -240,7 +243,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 serviceReadyLog: 'ready to handle connections',
                 platform: rosettaTranslatedContainers.includes('php')
                     ? 'linux/amd64'
-                    : undefined
+                    : php.platform
             },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
@@ -287,7 +290,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 dependsOn: ['nginx'],
                 platform: rosettaTranslatedContainers.includes('nginx')
                     ? 'linux/amd64'
-                    : undefined
+                    : nginx.platform
             },
             nginx: {
                 _: 'Nginx',
@@ -339,7 +342,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 dependsOn: ['php', 'phpWithXdebug'],
                 platform: rosettaTranslatedContainers.includes('nginx')
                     ? 'linux/amd64'
-                    : undefined
+                    : nginx.platform
             },
             redis: {
                 _: 'Redis',
@@ -358,7 +361,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 serviceReadyLog: 'Ready to accept connections',
                 platform: rosettaTranslatedContainers.includes('redis')
                     ? 'linux/amd64'
-                    : undefined
+                    : redis.platform
             },
             mariadb: {
                 _: 'MariaDB',
@@ -402,7 +405,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 )}`,
                 platform: rosettaTranslatedContainers.includes('mariadb')
                     ? 'linux/amd64'
-                    : undefined
+                    : mariadb.platform
             },
             elasticsearch: {
                 _:
@@ -448,7 +451,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 name: `${prefix}_${searchengine}`,
                 platform: rosettaTranslatedContainers.includes(searchengine)
                     ? 'linux/amd64'
-                    : undefined
+                    : searchengine === 'elasticsearch'
+                    ? elasticsearch.platform
+                    : opensearch.platform
             },
             maildev: {
                 _: 'MailDev',
@@ -494,7 +499,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 },
                 platform: rosettaTranslatedContainers.includes('maildev')
                     ? 'linux/amd64'
-                    : undefined
+                    : maildev.platform
             }
         }
 
@@ -550,13 +555,13 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 dependsOn: ['nginx'],
                 platform: rosettaTranslatedContainers.includes('varnish')
                     ? 'linux/amd64'
-                    : undefined
+                    : varnish.platform
             }
 
-            dockerConfig.sslTerminator.dependsOn.push('varnish')
+            dockerConfig.sslTerminator.dependsOn?.push('varnish')
         }
 
-        if (newRelic.enabled) {
+        if (newRelic?.enabled) {
             dockerConfig.newRelicPHPDaemon = {
                 _: 'New Relic PHP daemon',
                 ports: [],

package/lib/config/magento/required-php-extensions/magento-2.4.js

@@ -5,6 +5,7 @@ const magento24RequiredPHPExtensions = [
     'dom',
     'fileinfo',
     'filter',
+    'ftp',
     'gd',
     'hash',
     'iconv',

package/lib/config/php-config.js

@@ -23,7 +23,8 @@ module.exports = (overridenConfiguration, baseConfig) => {
         fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
         debugFpmConfPath: path.join(cacheDir, 'php-fpm-debug.conf'),
         extensions: php.extensions,
-        env: php.env
+        env: php.env,
+        platform: php.platform
     }
 
     return phpConfiguration

package/lib/config/services/composer/versions/composer-1.js

@@ -5,7 +5,7 @@ const composer1 = () => ({
     version: 'latest-1.x',
     plugins: {
         'hirak/prestissimo': {
-            enabled: true
+            enabled: false
         }
     }
 })

package/lib/config/services/composer/versions/composer-2.9.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ComposerConfiguration}
+ */
+const composer29 = () => ({
+    version: '2.9.5'
+})
+
+module.exports = composer29

package/lib/config/services/composer/versions/index.js

@@ -4,5 +4,6 @@ module.exports = {
     composer22: require('./composer-2.2'),
     composer26: require('./composer-2.6'),
     composer27: require('./composer-2.7'),
-    composer28: require('./composer-2.8')
+    composer28: require('./composer-2.8'),
+    composer29: require('./composer-2.9')
 }

package/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js

@@ -1,14 +1,13 @@
 const os = require('os')
 const { getArchSync } = require('../../../../util/arch')
 const { deepmerge } = require('../../../../util/deepmerge')
-const { repo } = require('../base-repo')
 const defaultEnv = require('../default-es-env')
 
 /**
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
-const elasticsearch68 = ({ image = `${repo}:elasticsearch-6.8` } = {}) => ({
-    image,
+const elasticsearch68 = () => ({
+    image: 'elasticsearch:6.8.23',
     env: deepmerge(
         defaultEnv,
         os.platform() === 'darwin' && getArchSync() === 'arm64'
@@ -16,7 +15,8 @@ const elasticsearch68 = ({ image = `${repo}:elasticsearch-6.8` } = {}) => ({
                   'xpack.ml.enabled': false
               }
             : {}
-    )
+    ),
+    platform: 'linux/amd64'
 })
 
 module.exports = elasticsearch68

package/lib/config/services/elasticsearch/versions/elasticsearch-7.6.js

@@ -5,7 +5,8 @@ const defaultEnv = require('../default-es-env')
  */
 const elasticsearch76 = () => ({
     image: 'elasticsearch:7.6.2',
-    env: defaultEnv
+    env: defaultEnv,
+    platform: 'linux/amd64'
 })
 
 module.exports = elasticsearch76

package/lib/config/services/nginx/versions/nginx-1.18.js

@@ -6,7 +6,8 @@ const path = require('path')
  */
 const nginx118 = ({ templateDir }) => ({
     image: 'nginx:1.18.0',
-    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf'),
+    runType: 'website'
 })
 
 module.exports = nginx118

package/lib/config/services/nginx/versions/nginx-1.22.js

@@ -6,7 +6,8 @@ const path = require('path')
  */
 const nginx122 = ({ templateDir }) => ({
     image: 'nginx:1.22.1',
-    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf'),
+    runType: 'website'
 })
 
 module.exports = nginx122

package/lib/config/services/nginx/versions/nginx-1.24.js

@@ -6,7 +6,8 @@ const path = require('path')
  */
 const nginx124 = ({ templateDir }) => ({
     image: 'nginx:1.24.0',
-    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf'),
+    runType: 'website'
 })
 
 module.exports = nginx124

package/lib/config/services/nginx/versions/nginx-1.26.js

@@ -6,7 +6,8 @@ const path = require('path')
  */
 const nginx126 = ({ templateDir }) => ({
     image: 'nginx:1.26.3',
-    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf'),
+    runType: 'website'
 })
 
 module.exports = nginx126

package/lib/config/services/nginx/versions/nginx-1.28.js

@@ -5,8 +5,9 @@ const path = require('path')
  * @returns {import('../../../../../typings/index').NginxConfiguration}
  */
 const nginx128 = ({ templateDir }) => ({
-    image: 'nginx:1.28.0',
-    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+    image: 'nginx:1.28.2',
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf'),
+    runType: 'website'
 })
 
 module.exports = nginx128

package/lib/config/services/php/versions/php-8.1.js

@@ -22,7 +22,7 @@ const php81 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.6'
+            version: '3.5.1'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.2.js

@@ -22,7 +22,7 @@ const php82 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.6'
+            version: '3.5.1'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.3.js

@@ -22,7 +22,7 @@ const php83 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.6'
+            version: '3.5.1'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.4.js

@@ -22,7 +22,7 @@ const php84 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.6'
+            version: '3.5.1'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.5.js

@@ -0,0 +1,32 @@
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
+const defaultPhpEnv = require('../default-php-env')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
+ */
+const php85 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${repo}:php-8.5`
+}) => ({
+    baseImage,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
+    extensions: {
+        xdebug: {
+            ...xdebug,
+            version: '3.5.1'
+        },
+        ...extensions
+    },
+    env: defaultPhpEnv
+})
+
+module.exports = php85

package/lib/config/templates/magentorc.template

@@ -17,6 +17,7 @@ alias cvc="exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache clea
 <% } %>
 alias mariadb="exec mariadb <%~ it.databaseBinFile %> -umagento -pmagento"
 alias mariadbroot="exec mariadb <%~ it.databaseBinFile %> -uroot -pscandipwa"
+alias debugphp="exec phpWithXdebug"
 
 # silence warning on macos
 export BASH_SILENCE_DEPRECATION_WARNING=1

package/lib/config/templates/nginx.template.conf

@@ -45,7 +45,7 @@ server {
     server_name _;
     set $MAGE_MODE <%= it.config.magento.mode %>;
     set $MAGE_ROOT "<%= it.mageRoot %>";
-    set $MAGE_RUN_TYPE website;
+    set $MAGE_RUN_TYPE <%= it.config.configuration.nginx.runType %>;
 <% if (it.useStoreDomainMapping) { %>
     set $MAGE_RUN_CODE $SITE_CODE_MAPPING;
 <% } %>

package/lib/config/versions/magento-2.4.4-p16.js

@@ -19,7 +19,7 @@ const { opensearch219 } = require('../services/opensearch/versions')
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
-    magentoVersion: '2.4.4-p15',
+    magentoVersion: '2.4.4-p16',
     configuration: {
         php: php81({
             templateDir,

package/lib/config/versions/magento-2.4.4-p17.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p17',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.5-p16.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p16',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.6-p14.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p14',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish74 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx124 } = require('../services/nginx/versions')
-const { composer26 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch811(),
-        composer: composer26(),
+        composer: composer29(),
         varnish: varnish74({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

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

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish74 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx124 } = require('../services/nginx/versions')
-const { composer27 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch811(),
-        composer: composer27(),
+        composer: composer29(),
         varnish: varnish74({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p3.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish74 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx124 } = require('../services/nginx/versions')
-const { composer27 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch811(),
-        composer: composer27(),
+        composer: composer29(),
         varnish: varnish74({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p4.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch816(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p5.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p6.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb1011 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb1011(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),