Merge branch 'develop' into 'main'

Merging develop into main

See merge request !128

ahoy.drupal.yml

@@ -6,11 +6,29 @@ commands:
       echo "DRUPAL_LIVE=1" >>.env
       env -i $(cat .env | xargs) >.env
       composer lakedrops:config --no-interaction
-    usage: Turn live mode on - ATTENTION - you should run drush cr afterwards
+      drush cr
+    usage: Turn live mode on.
   dev:
     cmd: |
       DRUPAL_LIVE=0
       echo "DRUPAL_LIVE=0" >>.env
       env -i $(cat .env | xargs) >.env
       composer lakedrops:config --no-interaction
-    usage: Turn live mode off - ATTENTION - you should run drush cr afterwards
+      drush cr
+    usage: Turn live mode off.
+  rcon:
+    cmd: |
+      RENDERER_CONFIG_DEBUG=1
+      echo "RENDERER_CONFIG_DEBUG=1" >>.env
+      env -i $(cat .env | xargs) >.env
+      composer lakedrops:config --no-interaction
+      drush cr
+    usage: Turn on renderer config debug mode
+  rcoff:
+    cmd: |
+      RENDERER_CONFIG_DEBUG=0
+      echo "RENDERER_CONFIG_DEBUG=0" >>.env
+      env -i $(cat .env | xargs) >.env
+      composer lakedrops:config --no-interaction
+      drush cr
+    usage: Turn off renderer config debug mode

composer.json

@@ -43,7 +43,8 @@
   "require": {
     "php": ">=8.1",
     "composer-plugin-api": "^2",
-    "lakedrops/composer-json-utils": "^2.4||dev-develop"
+    "lakedrops/composer-json-utils": "^2.4||dev-develop",
+    "mxr576/ddqg-composer-audit": "^1.0"
   },
   "require-dev": {
     "composer/composer": "^2",
@@ -55,6 +56,7 @@
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "drupal/core-composer-scaffold": false,
       "lakedrops/*": false,
+      "mxr576/ddqg-composer-audit": false,
       "php-http/discovery": false,
       "phpstan/extension-installer": true
     }

src/Handler.php

@@ -59,6 +59,10 @@ class Handler extends BaseHandler {
       'domain' => str_replace(['.', '-'], ['\\.', '\\-'], 'www.example.com'),
       'aliases' => [],
       'live' => (getenv('LAKEDROPS_BUILD_NG') === 'yes') || !empty($this->env->receiveGlobal('DRUPAL_LIVE', 'Live mode', '0')),
+      'renderer_config' => [
+        'debug' => $this->env->receiveGlobal('RENDERER_CONFIG_DEBUG', '', '0'),
+      ],
+      'file_assets_path' => FALSE,
     ];
   }
 

templates/services.yml.twig

@@ -14,6 +14,7 @@ parameters:
       max-age: 0
       contexts: ['session', 'user']
       tags: []
+    debug: {{ renderer_config.debug ? 'true' : 'false' }}
   http.response.debug_cacheability_headers: false
   factory.keyvalue:
     {}

templates/settings.php.twig

 <?php
 
-$databases = array (
-  'default' => array (
-    'default' => array (
+$databases = [
+  'default' => [
+    'default' => [
       'driver' => '{{ db.driver }}',
       'namespace' => '{{ db.namespace }}',
       'database' => '{{ db.host }}',
@@ -13,9 +13,9 @@ $databases = array (
       'prefix' => '{{ db.prefix }}',
       'charset' => 'utf8mb4',
       'collation' => 'utf8mb4_general_ci',
-    ),
-  ),
-);
+    ],
+  ],
+];
 
 {% if drupal8 %}
 $config_directories['sync'] = 'sites/default/files/config/sync';
@@ -27,10 +27,13 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
 $settings['file_public_path'] = 'sites/default/files';
 $settings['file_private_path'] = 'sites/default/private';
 $settings['file_temp_path'] = '/tmp';
+{% if file_assets_path %}
+$settings['file_assets_path'] = '{{ file_assets_path }}';
+{% endif %}
 $settings['hash_salt'] = '{{ hash }}';
-$settings['trusted_host_patterns'] = array(
+$settings['trusted_host_patterns'] = [
   '^{{ domain }}$',
-);
+];
 
 if (file_exists(__DIR__ . '/settings.local.php')) {
   include __DIR__ . '/settings.local.php';