Merge branch '11.1' into 11.x

pimcore · Nov 1, 2023 · 52e492d · 52e492d
2 parents a52dc8f + c86951c
commit 52e492d
Show file tree

Hide file tree

Showing 57 changed files with 101 additions and 50 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,15 @@
 <!--
 
 Before working on a contribution, you must determine on which branch you need to work:
-- Bug fix: choose the latest maintenance branch `10.5`
+- Bug fix: choose the latest maintenance branch `11.1`
 - Feature/Improvement: choose `11.x` 
 
 > All bug fixes merged into the latest maintenance branch are also merged to the current dev branch (`11.x`) on a regular basis.
 
 ## Please make sure your PR complies with all of the following points: 
 - [ ] Read and accept our [contributing guidelines](/CONTRIBUTING.md) before you submit a PR.
 - [ ] Features need to be proper documented in `doc/` 
-- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `10.5` (see Readme.md for the list of supported versions)
+- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `11.1` (see Readme.md for the list of supported versions)
 - [ ] Meet all coding standards (see PhpStan actions) 
 
 **Don't submit a PR if it doesn't comply, it'll be closed without a comment!**

diff --git a/.github/workflows/pull-request-checklist.yaml b/.github/workflows/pull-request-checklist.yaml
@@ -16,7 +16,7 @@ jobs:
               env:
                   MESSAGE: |
                       ### Review Checklist
-                      - [ ] Target branch (`11.0` for bug fixes, others `11.x`)
+                      - [ ] Target branch (`11.1` for bug fixes, others `11.x`)
                       - [ ] Tests (if it's testable code, there should be a test for it - [get help](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Testing/Core_Tests.html))
                       - [ ] Docs (every functionality needs to be documented, [see here](https://github.com/pimcore/pimcore/tree/11.x/doc)) 
                       - [ ] [Migration](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Migrations.html) incl. `install.sql` (e.g. if the database schema changes, ...) 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ We gladly accept community pull requests. This is the preferred way to contribut
 There are a few necessary steps before we can accept a pull request:
 
 * [Fork us!](https://help.github.com/articles/fork-a-repo/)
-* Select the right branch. `main`(`11.x`) for features and improvements or latest maintenance branch for bug fixes (`11.0`)
+* Select the right branch. `main`(`11.x`) for features and improvements or latest maintenance branch for bug fixes (`11.1`)
 * Code! Follow the coding standards defined [here](https://github.com/pimcore/pimcore/blob/11.x/.php-cs-fixer.dist.php) and [here](https://github.com/pimcore/pimcore/blob/11.x/doc/19_Development_Tools_and_Details/29_Testing/02_Core_Tests.md#perform-phpstan-analysis)
 * [Send a pull request](https://help.github.com/articles/using-pull-requests/) from your fork’s branch to our repo branch.
 * [Sign the CLA](https://cla-assistant.io/pimcore/pimcore) - see also below.

diff --git a/bundles/ApplicationLoggerBundle/translations/admin.ca.yaml b/bundles/ApplicationLoggerBundle/translations/admin.ca.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.cs.yaml b/bundles/ApplicationLoggerBundle/translations/admin.cs.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.de.yaml b/bundles/ApplicationLoggerBundle/translations/admin.de.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Anwendungslogger
 log_search_component: Komponente
 log_search_pid: PID
 log_refresh_seconds: Sekunden
-keybinding_application_logger: Anwendungslogger
 log_search_from: Von
 log_search_to: An
 log_type: Typ
@@ -22,4 +21,5 @@ log_message: Nachricht
 log_reset_search: "Zur\xFCcksetzen"
 log_search: Suche
 log_search_message: Nachricht
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.es.yaml b/bundles/ApplicationLoggerBundle/translations/admin.es.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.fr.yaml b/bundles/ApplicationLoggerBundle/translations/admin.fr.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Journal applicatif
 log_search_component: Composant
 log_search_pid: PID
 log_refresh_seconds: Secondes
-keybinding_application_logger: Application logger
 log_search_from: De
 log_search_to: "\xC0"
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: "R\xE9initialiser"
 log_search: Rechercher
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.hu.yaml b/bundles/ApplicationLoggerBundle/translations/admin.hu.yaml
@@ -13,7 +13,6 @@ log_applicationlog: "Alkalmaz\xE1snapl\xF3"
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.it.yaml b/bundles/ApplicationLoggerBundle/translations/admin.it.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.nl.yaml b/bundles/ApplicationLoggerBundle/translations/admin.nl.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.pl.yaml b/bundles/ApplicationLoggerBundle/translations/admin.pl.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.pt_br.yaml b/bundles/ApplicationLoggerBundle/translations/admin.pt_br.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.ro.yaml b/bundles/ApplicationLoggerBundle/translations/admin.ro.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.sk.yaml b/bundles/ApplicationLoggerBundle/translations/admin.sk.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.sv.yaml b/bundles/ApplicationLoggerBundle/translations/admin.sv.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: "Fr\xE5n"
 log_search_to: Till
 log_type: Typ
@@ -22,4 +21,5 @@ log_message: Meddelande
 log_reset_search: Reset
 log_search: Search
 log_search_message: Meddelande
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.th.yaml b/bundles/ApplicationLoggerBundle/translations/admin.th.yaml
@@ -14,7 +14,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -23,4 +22,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/ApplicationLoggerBundle/translations/admin.zh_Hans.yaml b/bundles/ApplicationLoggerBundle/translations/admin.zh_Hans.yaml
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
 log_search_component: Component
 log_search_pid: PID
 log_refresh_seconds: Seconds
-keybinding_application_logger: Application logger
 log_search_from: From
 log_search_to: To
 log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
 log_reset_search: Reset
 log_search: Search
 log_search_message: Message
+keybinding_applicationLogger: Application logger
 ...
diff --git a/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php b/bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php
@@ -362,13 +362,9 @@ private function responseCanBeCached(Response $response): bool
     {
         $cache = true;
 
-        // do not cache when the application indicated one of the 'no-cache' directives in the response Cache-Control header
-        foreach (['no-cache', 'private', 'no-store'] as $directive) {
-            if ($response->headers->getCacheControlDirective($directive)) {
-                $cache = false;
-
-                break;
-            }
+        // do not cache when the application indicated the 'no-store' directives in the response Cache-Control header
+        if ($response->headers->hasCacheControlDirective('no-store')) {
+            $cache = false;
         }
 
         // do not cache common responses

diff --git a/bundles/CustomReportsBundle/translations/admin.de.yaml b/bundles/CustomReportsBundle/translations/admin.de.yaml
@@ -4,5 +4,5 @@ reports: Berichte
 custom_report_permissions: Berechtigung
 keybinding_customReports: Benutzerdefinierte Berichte
 keybinding_reports: Bericht
-mandatory_fields_missing: 'Please fill in the following mandatory fields:'
+mandatory_fields_missing: "Bitte f\xFCllen Sie die folgenden Pflichtfelder aus:"
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.ca.yaml b/bundles/GlossaryBundle/translations/admin.ca.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.cs.yaml b/bundles/GlossaryBundle/translations/admin.cs.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.de.yaml b/bundles/GlossaryBundle/translations/admin.de.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossar
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.es.yaml b/bundles/GlossaryBundle/translations/admin.es.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.fr.yaml b/bundles/GlossaryBundle/translations/admin.fr.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossaire
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.hu.yaml b/bundles/GlossaryBundle/translations/admin.hu.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.it.yaml b/bundles/GlossaryBundle/translations/admin.it.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.nl.yaml b/bundles/GlossaryBundle/translations/admin.nl.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.pl.yaml b/bundles/GlossaryBundle/translations/admin.pl.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.pt_br.yaml b/bundles/GlossaryBundle/translations/admin.pt_br.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.ro.yaml b/bundles/GlossaryBundle/translations/admin.ro.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.sk.yaml b/bundles/GlossaryBundle/translations/admin.sk.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.sv.yaml b/bundles/GlossaryBundle/translations/admin.sv.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Ordlista
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.th.yaml b/bundles/GlossaryBundle/translations/admin.th.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/GlossaryBundle/translations/admin.zh_Hans.yaml b/bundles/GlossaryBundle/translations/admin.zh_Hans.yaml
@@ -1,3 +1,4 @@
 ---
 glossary: Glossary
+keybinding_glossary: Glossary
 ...
diff --git a/bundles/SeoBundle/translations/admin.ca.yaml b/bundles/SeoBundle/translations/admin.ca.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Search Engine Optimization
 seo_document_editor: SEO Document Editor
 robots.txt: robots.txt
 http_errors: HTTP Errors
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...
diff --git a/bundles/SeoBundle/translations/admin.cs.yaml b/bundles/SeoBundle/translations/admin.cs.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Search Engine Optimization
 seo_document_editor: SEO Document Editor
 robots.txt: robots.txt
 http_errors: HTTP Errors
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...
diff --git a/bundles/SeoBundle/translations/admin.de.yaml b/bundles/SeoBundle/translations/admin.de.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Optimierung der Suchmaschine
 seo_document_editor: SEO-Dokument-Editor
 robots.txt: robots.txt
 http_errors: HTTP-Fehler
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...
diff --git a/bundles/SeoBundle/translations/admin.es.yaml b/bundles/SeoBundle/translations/admin.es.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Search Engine Optimization
 seo_document_editor: SEO Document Editor
 robots.txt: robots.txt
 http_errors: HTTP Errors
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...
diff --git a/bundles/SeoBundle/translations/admin.fr.yaml b/bundles/SeoBundle/translations/admin.fr.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Search Engine Optimization
 seo_document_editor: SEO Document Editor
 robots.txt: robots.txt
 http_errors: Erreurs HTTP
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...
diff --git a/bundles/SeoBundle/translations/admin.hu.yaml b/bundles/SeoBundle/translations/admin.hu.yaml
@@ -3,4 +3,7 @@ search_engine_optimization: Search Engine Optimization
 seo_document_editor: SEO Document Editor
 robots.txt: robots.txt
 http_errors: "HTTP Hib\xE1k"
+keybinding_seoDocumentEditor: SEO Document Editor
+keybinding_robots: robots.txt
+keybinding_httpErrorLog: HTTP Errors
 ...