Merging develop into main

templates/settings.local.php.twig

@@ -11,13 +11,8 @@ $config['config_auto_export.settings']['enabled'] = {{ live ? 'TRUE':  'FALSE' }
 $settings['extension_discovery_scan_tests'] = {{ live ? 'FALSE' : 'TRUE' }};
 $settings['rebuild_access'] = {{ live ? 'FALSE' : 'TRUE' }};
 $settings['skip_permissions_hardening'] = {{ live ? 'FALSE' : 'TRUE' }};
-
-$settings['redis.connection']['interface'] = 'PhpRedis';
-$settings['redis.connection']['host'] = 'redis';
-$settings['cache']['default'] = 'cache.backend.redis';
-$settings['container_yamls'][] = 'modules/redis/example.services.yml';
-$settings['queue_default'] = 'queue.redis';
 {% if not live %}
+
 assert_options(ASSERT_ACTIVE, TRUE);
 \Drupal\Component\Assertion\Handle::register();
 $settings['container_yamls'][] = __DIR__ . '/development.services.yml';
@@ -25,3 +20,9 @@ $settings['cache']['bins']['render'] = 'cache.backend.null';
 $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
 $config['advagg.settings']['enabled'] = FALSE;
 {% endif %}
+
+$settings['redis.connection']['interface'] = 'PhpRedis';
+$settings['redis.connection']['host'] = 'redis';
+$settings['cache']['default'] = 'cache.backend.redis';
+$settings['container_yamls'][] = 'modules/redis/example.services.yml';
+$settings['queue_default'] = 'queue.redis';