Skip to content
Snippets Groups Projects
Commit 8723c9ef authored by GitLab CI's avatar GitLab CI
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !182
parents f716eac8 c2177031
No related branches found
No related tags found
1 merge request!182Merging develop into main
Pipeline #1208363 passed
...@@ -84,6 +84,7 @@ class Handler extends BaseHandler { ...@@ -84,6 +84,7 @@ class Handler extends BaseHandler {
} }
} }
$this->config->setValue('hash', $hash, FALSE); $this->config->setValue('hash', $hash, FALSE);
$this->config->setValue('php', ['version' => PHP_VERSION], FALSE);
} }
/** /**
......
...@@ -13,8 +13,13 @@ $settings['rebuild_access'] = {{ live ? 'FALSE' : 'TRUE' }}; ...@@ -13,8 +13,13 @@ $settings['rebuild_access'] = {{ live ? 'FALSE' : 'TRUE' }};
$settings['skip_permissions_hardening'] = {{ live ? 'FALSE' : 'TRUE' }}; $settings['skip_permissions_hardening'] = {{ live ? 'FALSE' : 'TRUE' }};
{% if not live %} {% if not live %}
{% set v = php.version|split('.') %}
{% if (v[0] == 8 and v[1] >= 3) or v[0] > 8 %}
// Skipping assert options
{% else %}
assert_options(ASSERT_ACTIVE, TRUE); assert_options(ASSERT_ACTIVE, TRUE);
assert_options(ASSERT_EXCEPTION, TRUE); assert_options(ASSERT_EXCEPTION, TRUE);
{% endif %}
$settings['container_yamls'][] = __DIR__ . '/development.services.yml'; $settings['container_yamls'][] = __DIR__ . '/development.services.yml';
$settings['cache']['bins']['render'] = 'cache.backend.null'; $settings['cache']['bins']['render'] = 'cache.backend.null';
$settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null'; $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment