Merge pull request #15 from pimcore/11.x-from-7113486479

Automated PR

Author: herbertroth

.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!**
@@ -20,11 +20,3 @@ Before working on a contribution, you must determine on which branch you need to
 Resolves #
 
 ## Additional info
-
-### WHAT
-copilot:summary
-
-copilot:poem
-
-### HOW
-copilot:walkthrough

.github/workflows/clone-branch.yml

@@ -3,9 +3,9 @@ name: "LTS repository sync"
 
 on:
     workflow_dispatch:
-    push:
-        branches:
-            - 11.x
+    #push:
+    #    branches:
+    #        - 11.x
 
 permissions:
   contents: read

.github/workflows/lts-repo-sync.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, ...) 

.github/workflows/pull-request-checklist.yaml

@@ -0,0 +1,22 @@
+name: Sync changes scheduled from CE to EE
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '30 21 * * *'
+
+jobs:
+  clone-branch:
+    uses: pimcore/workflows-collection-public/.github/workflows/[email protected]
+    if: github.repository == 'pimcore/pimcore'
+    strategy:
+      fail-fast: false
+      matrix:
+        ref: [{'base': '11.x', 'destination': '11.x'}, {'base': '11.1', 'destination': '11.1'}, {'base': '10.6', 'destination': '10.6'}]
+    with:
+      base_ref: ${{ matrix.ref.base }}
+      ref_name: ${{ matrix.ref.destination }}
+      target_repo: 'ee-pimcore'
+    secrets:
+      SYNC_TOKEN: ${{ secrets.SYNC_TOKEN }}
+      GIT_NAME: ${{ secrets.GIT_NAME }}
+      GIT_EMAIL: ${{ secrets.GIT_EMAIL }}

.github/workflows/sync-changes-scheduled.yml

@@ -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.

CONTRIBUTING.md

@@ -5,7 +5,8 @@
 If you think that you have found a security issue, 
 don’t use the bug tracker and don’t publish it publicly. 
 Instead, all security issues must be reported via a private vulnerability report.
-Additionally, we also check issues reported via [huntr.dev](https://huntr.dev/repos/pimcore/pimcore/).
+
+Please follow the [instructions](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability) to submit a private report.
 
 
 ## Resolving Process

SECURITY.md

@@ -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
 ...

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
 ...

bundles/ApplicationLoggerBundle/translations/admin.cs.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
 ...