From f33248d487b5b6a09a38224f890d259f9ea07003 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bobdenotter@gmail.com>
Date: Mon, 23 Oct 2023 11:42:13 +0200
Subject: [PATCH] Updating config

---
 config/bolt/config.yaml            | 39 ++++++++++++++++++++----------
 config/packages/doctrine.yaml      |  1 +
 config/packages/prod/doctrine.yaml |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml
index 73d31fa41..1b397e37d 100644
--- a/config/bolt/config.yaml
+++ b/config/bolt/config.yaml
@@ -9,15 +9,28 @@ secret: '%env(APP_SECRET)%'
 
 # Set the caching configuration for various areas of Bolt.
 # The expires_after is counted in seconds.
-caching:
-    related_options: 3600
-    canonical: 60
-    formatter: 60
-    selectoptions: 3600
-    content_array: 3600
-    frontend_menu: 3600
-    backend_menu: 3600
+#caching:
+#    related_options: 3600
+#    canonical: 1800
+#    formatter: 180
+#    selectoptions: 3600
+#    content_array: 180
+#    frontend_menu: 3600
+#    backend_menu: 3600
+#    files_index: 3600
+#    list_format: true  # Run `bin/console cache:list-format; bin/console bolt:update-list-format` to clear and rebuild these
 
+caching:
+    related_options: ~
+    canonical: ~
+    formatter: ~
+    selectoptions: ~
+    content_array: ~
+    frontend_menu: ~
+    backend_menu: ~
+    files_index: ~
+    list_format: false # Run `bin/console cache:list-format; bin/console bolt:update-list-format` to clear and rebuild these
+    
 # The theme to use.
 #
 # Dont edit the provided templates directly, because they _will_ get updated
@@ -58,6 +71,9 @@ headers:
 # If you want to override the canonical template, from the theme:
 #canonical_template: 'partials/_canonical.html.twig'
 
+# If you want to add canonical link in your own way, set this to true
+omit_canonical_link: false
+
 # By setting this to true, you will get a relative canonical path passed to the template.
 #relative_canonical_url: true
 
@@ -153,9 +169,6 @@ records_per_page: 8
 # Default settings for thumbnails.
 #
 # quality:       Quality should be between 0 (horrible, small file) and 100 (best, huge file).
-# fit:           One of either none, crop (= crop-center), crop-top-left, crop-top, crop-top-right, crop-left, crop-right, crop-bottom-left, crop-bottom or crop-bottom-right.
-# allow_upscale: Determines whether small images will be enlarged to fit
-#                the requested dimensions.
 # save_files:    Save files in the thumbs/ folder, so subsequent requests will serve file directly. Great for performance
 #
 # Note: If you change these values, you might need to clear the cache before
@@ -163,10 +176,9 @@ records_per_page: 8
 thumbnails:
     default_thumbnail: [ 320, 240 ]
     default_image: [ 1000, 750 ]
+    default_cropping: crop
     quality: 80
-    cropping: crop
     save_files: true
-    allow_upscale: false
 
 # File permissions for read/write/execute to set on folders and files that are
 # created. The exact permissions you should be setting depends on the system
@@ -242,3 +254,4 @@ user_show_sort&filter: false
 
 # Use Ajaxy saving ("Stay on page"), or traditional saving
 ajaxy_saving: false
+
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index 314508d30..898c43a1e 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -34,6 +34,7 @@ doctrine:
         dql:
             string_functions:
                 JSON_EXTRACT: Bolt\Doctrine\Functions\JsonExtract
+                JSON_VALUE: Bolt\Doctrine\Functions\JsonValue
                 JSON_GET_TEXT: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Postgresql\JsonGetText
                 JSON_SEARCH: Scienta\DoctrineJsonFunctions\Query\AST\Functions\Mysql\JsonSearch
                 JSON_UNQUOTE: Bolt\Doctrine\Functions\JsonUnquote
diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml
index 2f16f0fde..1c812e552 100644
--- a/config/packages/prod/doctrine.yaml
+++ b/config/packages/prod/doctrine.yaml
@@ -28,4 +28,4 @@ framework:
             doctrine.result_cache_pool:
                 adapter: cache.app
             doctrine.system_cache_pool:
-                adapter: cache.system
+                adapter: cache.app