Skip to content

Commit 4145da6

Browse files
herbertrothherbertroth
authored
Merge pull request #15 from pimcore/11.x-from-7113486479
Automated PR
2 parents 9c953cb + 16b0447 commit 4145da6

File tree

187 files changed

+718
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+718
-280
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!--
22
33
Before working on a contribution, you must determine on which branch you need to work:
4-
- Bug fix: choose the latest maintenance branch `10.5`
4+
- Bug fix: choose the latest maintenance branch `11.1`
55
- Feature/Improvement: choose `11.x`
66
77
> All bug fixes merged into the latest maintenance branch are also merged to the current dev branch (`11.x`) on a regular basis.
88
99
## Please make sure your PR complies with all of the following points:
1010
- [ ] Read and accept our [contributing guidelines](/CONTRIBUTING.md) before you submit a PR.
1111
- [ ] Features need to be proper documented in `doc/`
12-
- [ ] 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)
12+
- [ ] 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)
1313
- [ ] Meet all coding standards (see PhpStan actions)
1414
1515
**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
2020
Resolves #
2121

2222
## Additional info
23-
24-
### WHAT
25-
copilot:summary
26-
27-
copilot:poem
28-
29-
### HOW
30-
copilot:walkthrough

‎.github/workflows/clone-branch.yml

-25
This file was deleted.

‎.github/workflows/lts-repo-sync.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: "LTS repository sync"
33

44
on:
55
workflow_dispatch:
6-
push:
7-
branches:
8-
- 11.x
6+
#push:
7+
# branches:
8+
# - 11.x
99

1010
permissions:
1111
contents: read

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
MESSAGE: |
1818
### Review Checklist
19-
- [ ] Target branch (`11.0` for bug fixes, others `11.x`)
19+
- [ ] Target branch (`11.1` for bug fixes, others `11.x`)
2020
- [ ] 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))
2121
- [ ] Docs (every functionality needs to be documented, [see here](https://github.com/pimcore/pimcore/tree/11.x/doc))
2222
- [ ] [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/sync-changes-scheduled.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Sync changes scheduled from CE to EE
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '30 21 * * *'
6+
7+
jobs:
8+
clone-branch:
9+
uses: pimcore/workflows-collection-public/.github/workflows/[email protected]
10+
if: github.repository == 'pimcore/pimcore'
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
ref: [{'base': '11.x', 'destination': '11.x'}, {'base': '11.1', 'destination': '11.1'}, {'base': '10.6', 'destination': '10.6'}]
15+
with:
16+
base_ref: ${{ matrix.ref.base }}
17+
ref_name: ${{ matrix.ref.destination }}
18+
target_repo: 'ee-pimcore'
19+
secrets:
20+
SYNC_TOKEN: ${{ secrets.SYNC_TOKEN }}
21+
GIT_NAME: ${{ secrets.GIT_NAME }}
22+
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ We gladly accept community pull requests. This is the preferred way to contribut
88
There are a few necessary steps before we can accept a pull request:
99

1010
* [Fork us!](https://help.github.com/articles/fork-a-repo/)
11-
* Select the right branch. `main`(`11.x`) for features and improvements or latest maintenance branch for bug fixes (`11.0`)
11+
* Select the right branch. `main`(`11.x`) for features and improvements or latest maintenance branch for bug fixes (`11.1`)
1212
* 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)
1313
* [Send a pull request](https://help.github.com/articles/using-pull-requests/) from your fork’s branch to our repo branch.
1414
* [Sign the CLA](https://cla-assistant.io/pimcore/pimcore) - see also below.

‎SECURITY.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
If you think that you have found a security issue,
66
don’t use the bug tracker and don’t publish it publicly.
77
Instead, all security issues must be reported via a private vulnerability report.
8-
Additionally, we also check issues reported via [huntr.dev](https://huntr.dev/repos/pimcore/pimcore/).
8+
9+
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.
910

1011

1112
## Resolving Process

‎bundles/ApplicationLoggerBundle/translations/admin.ca.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.cs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.de.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Anwendungslogger
1313
log_search_component: Komponente
1414
log_search_pid: PID
1515
log_refresh_seconds: Sekunden
16-
keybinding_application_logger: Anwendungslogger
1716
log_search_from: Von
1817
log_search_to: An
1918
log_type: Typ
@@ -22,4 +21,5 @@ log_message: Nachricht
2221
log_reset_search: "Zur\xFCcksetzen"
2322
log_search: Suche
2423
log_search_message: Nachricht
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.es.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.fr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Journal applicatif
1313
log_search_component: Composant
1414
log_search_pid: PID
1515
log_refresh_seconds: Secondes
16-
keybinding_application_logger: Application logger
1716
log_search_from: De
1817
log_search_to: "\xC0"
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: "R\xE9initialiser"
2322
log_search: Rechercher
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.hu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: "Alkalmaz\xE1snapl\xF3"
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.it.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.nl.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.pl.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.pt_br.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.ro.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.sk.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.sv.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: "Fr\xE5n"
1817
log_search_to: Till
1918
log_type: Typ
@@ -22,4 +21,5 @@ log_message: Meddelande
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Meddelande
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/ApplicationLoggerBundle/translations/admin.th.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ log_applicationlog: Application Logger
1414
log_search_component: Component
1515
log_search_pid: PID
1616
log_refresh_seconds: Seconds
17-
keybinding_application_logger: Application logger
1817
log_search_from: From
1918
log_search_to: To
2019
log_type: Type
@@ -23,4 +22,5 @@ log_message: Message
2322
log_reset_search: Reset
2423
log_search: Search
2524
log_search_message: Message
25+
keybinding_applicationLogger: Application logger
2626
...

‎bundles/ApplicationLoggerBundle/translations/admin.zh_Hans.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ log_applicationlog: Application Logger
1313
log_search_component: Component
1414
log_search_pid: PID
1515
log_refresh_seconds: Seconds
16-
keybinding_application_logger: Application logger
1716
log_search_from: From
1817
log_search_to: To
1918
log_type: Type
@@ -22,4 +21,5 @@ log_message: Message
2221
log_reset_search: Reset
2322
log_search: Search
2423
log_search_message: Message
24+
keybinding_applicationLogger: Application logger
2525
...

‎bundles/CoreBundle/src/Command/ClassesDefinitionsBuildCommand.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
namespace Pimcore\Bundle\CoreBundle\Command;
1818

19+
use Pimcore\Cache;
1920
use Pimcore\Console\AbstractCommand;
2021
use Pimcore\DataObject\ClassBuilder\PHPClassDumperInterface;
2122
use Pimcore\DataObject\ClassBuilder\PHPFieldCollectionClassDumperInterface;
@@ -49,15 +50,13 @@ public function __construct(
4950

5051
protected function execute(InputInterface $input, OutputInterface $output): int
5152
{
52-
$cacheStatus = \Pimcore\Cache::isEnabled();
53-
\Pimcore\Cache::disable();
53+
$cacheStatus = Cache::isEnabled();
54+
Cache::disable();
5455
$objectClassesFolders = array_unique([PIMCORE_CLASS_DEFINITION_DIRECTORY, PIMCORE_CUSTOM_CONFIGURATION_CLASS_DEFINITION_DIRECTORY]);
5556

5657
foreach ($objectClassesFolders as $objectClassesFolder) {
5758
$files = glob($objectClassesFolder.'/*.php');
5859

59-
$changes = [];
60-
6160
foreach ($files as $file) {
6261
$class = include $file;
6362

@@ -84,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8483
}
8584

8685
if ($cacheStatus) {
87-
\Pimcore\Cache::enable();
86+
Cache::enable();
8887
}
8988

9089
return 0;

‎bundles/CoreBundle/src/DependencyInjection/Compiler/WorkflowPass.php

+1
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ public function process(ContainerBuilder $container): void
181181
if (isset($markingStoreDefinition)) {
182182
$workflowDefinition->replaceArgument(1, $markingStoreDefinition);
183183
}
184+
$workflowDefinition->setPublic(true);
184185
$workflowDefinition->replaceArgument(3, $workflowName);
185186
$workflowDefinition->replaceArgument(4, $workflowConfig['events_to_dispatch'] ?? null);
186187

‎bundles/CoreBundle/src/EventListener/Frontend/FullPageCacheListener.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,9 @@ private function responseCanBeCached(Response $response): bool
362362
{
363363
$cache = true;
364364

365-
// do not cache when the application indicated one of the 'no-cache' directives in the response Cache-Control header
366-
foreach (['no-cache', 'private', 'no-store'] as $directive) {
367-
if ($response->headers->getCacheControlDirective($directive)) {
368-
$cache = false;
369-
370-
break;
371-
}
365+
// do not cache when the application indicated the 'no-store' directives in the response Cache-Control header
366+
if ($response->headers->hasCacheControlDirective('no-store')) {
367+
$cache = false;
372368
}
373369

374370
// do not cache common responses

‎bundles/CustomReportsBundle/translations/admin.de.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ reports: Berichte
44
custom_report_permissions: Berechtigung
55
keybinding_customReports: Benutzerdefinierte Berichte
66
keybinding_reports: Bericht
7-
mandatory_fields_missing: 'Please fill in the following mandatory fields:'
7+
mandatory_fields_missing: "Bitte f\xFCllen Sie die folgenden Pflichtfelder aus:"
88
...

0 commit comments

Comments
 (0)