Merge remote-tracking branch 'refs/remotes/origin/11.1' into 11.x

SECURITY.md

@@ -4,7 +4,9 @@
 
 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 📫 to [security-issue@pimcore.com](mailto:security-issue@pimcore.com).
+Instead, all security issues must be reported via a private vulnerability report.
+
+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
@@ -18,4 +20,3 @@ Every submitted security issue is handled with top priority by following these s
 6. Patch reviewing 
 7. Tagging a new release for supported versions
 8. Publish security announcement
-

composer.json

@@ -33,7 +33,7 @@
     "gotenberg/gotenberg-php": "^1.1 || ^2.0"
   },
   "conflict": {
-     "twig/twig": "3.9.0 || 3.9.1"
+     "twig/twig": "^3.9.0"
   },  
   "suggest": {
     "pimcore/elasticsearch-client": "Required for Elastic Search service"