Patch 2

.gitattributes

@@ -1,7 +1,6 @@
 
 * -text
 
-bundles/AdminBundle/public/js/lib/* linguist-vendored
 
 # Exclude build/test files from archive to reduce ZIP size for composer dist download
 /.github export-ignore

.github/ISSUE_TEMPLATE/Bug-Report.yaml

@@ -11,7 +11,7 @@ body:
               It's also important for us to make clear that **we're not working for you or your company**,
               but we enjoy to work together to solve existing bugs.
               So we would love to see PRs with bugfixes, discuss them and we are happy to merge them when they are ready.
-              For details see also our [contributing guidelines](https://github.com/pimcore/pimcore/blob/10.x/CONTRIBUTING.md).
+              For details see also our [contributing guidelines](https://github.com/pimcore/pimcore/blob/11.x/CONTRIBUTING.md).
 
               Bug reports that do not meet the conditions listed below will be closed/deleted without comment.
 
@@ -20,19 +20,23 @@ body:
               - This is not a security issue -> see [our security policy](https://github.com/pimcore/pimcore/security/policy) instead.
               - You are not able to provide a pull request that fixes the issue.
               - There's no existing ticket for the same issue.
-
-    - type: textarea
+    - type: input
       attributes:
-          label: Expected behavior
+          label: Pimcore version
       validations:
           required: true
     - type: textarea
       attributes:
-          label: Actual behavior
+          label: Steps to reproduce
       validations:
           required: true
     - type: textarea
       attributes:
-          label: Steps to reproduce
+          label: Actual Behavior
       validations:
           required: true
+    - type: textarea
+      attributes:
+          label: Expected Behavior
+      validations:
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,5 +19,12 @@ Before working on a contribution, you must determine on which branch you need to
 ## Changes in this pull request  
 Resolves #
 
-## Additional info  
+## Additional info
 
+### WHAT
+copilot:summary
+
+copilot:poem
+
+### HOW
+copilot:walkthrough

.github/ci/files/config/bundles.php

@@ -1,7 +1,29 @@
 <?php
+declare(strict_types=1);
 
 return [
-    "Pimcore\\Bundle\\EcommerceFrameworkBundle\\PimcoreEcommerceFrameworkBundle" => [
+    "Pimcore\\Bundle\\GlossaryBundle\\PimcoreGlossaryBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\SimpleBackendSearchBundle\\PimcoreSimpleBackendSearchBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\SeoBundle\\PimcoreSeoBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\StaticRoutesBundle\\PimcoreStaticRoutesBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\UuidBundle\\PimcoreUuidBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\WordExportBundle\\PimcoreWordExportBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\ApplicationLoggerBundle\\PimcoreApplicationLoggerBundle" => [
+        "all" => TRUE
+    ],
+    "Pimcore\\Bundle\\TinymceBundle\\PimcoreTinymceBundle" => [
         "all" => TRUE
     ],
 ];

.github/ci/files/config/config.yaml

@@ -1,4 +1,46 @@
 imports:
     - { resource: services.yaml }
     - { resource: system.yaml }
-    - { resource: 'local/' }
+    - { resource: 'local/' }
+
+pimcore:
+    email:
+        sender:
+            name: pimcore
+            email: pimcore@example.com
+        return:
+            name: pimcore
+            email: pimcore@example.com
+    config_location:
+        image_thumbnails:
+            write_target:
+                type: 'settings-store'
+        video_thumbnails:
+            write_target:
+                type: 'settings-store'
+        document_types:
+            write_target:
+                type: 'settings-store'
+        predefined_properties:
+            write_target:
+                type: 'settings-store'
+        predefined_asset_metadata:
+            write_target:
+                type: 'settings-store'
+        perspectives:
+            write_target:
+                type: 'settings-store'
+        custom_views:
+            write_target:
+                type: 'settings-store'
+        object_custom_layouts:
+            write_target:
+                type: 'settings-store'
+        system_settings:
+            write_target:
+                type: 'settings-store'
+            read_target:
+                type: 'settings-store'
+        select_options:
+            write_target:
+                type: 'settings-store'

.github/ci/files/config/packages/html_sanitizer.yaml

@@ -0,0 +1,61 @@
+framework:
+    html_sanitizer:
+        sanitizers:
+            pimcore.wysiwyg_sanitizer:
+                allow_attributes:
+                    pimcore_type: '*'
+                    pimcore_id: '*'
+                allow_relative_links: true
+                allow_relative_medias: true
+                allow_elements:
+                    span: [ 'class', 'style', 'id' ]
+                    div: [ 'class', 'style', 'id' ]
+                    p: [ 'class', 'style', 'id' ]
+                    strong: 'class'
+                    em: 'class'
+                    h1: [ 'class', 'id' ]
+                    h2: [ 'class', 'id' ]
+                    h3: [ 'class', 'id' ]
+                    h4: [ 'class', 'id' ]
+                    h5: [ 'class', 'id' ]
+                    h6: [ 'class', 'id' ]
+                    table: [ 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'width', 'height', 'id' ]
+                    colgroup: 'class'
+                    col: [ 'class', 'style', 'id' ]
+                    thead: [ 'class', 'id' ]
+                    tbody: [ 'class', 'id' ]
+                    tr: [ 'class', 'id' ]
+                    td: [ 'class', 'id' ]
+                    th: [ 'class', 'id', 'scope' ]
+                    ul: [ 'class', 'style', 'id' ]
+                    li: [ 'class', 'style', 'id' ]
+                    ol: [ 'class', 'style', 'id' ]
+                    u: [ 'class', 'id' ]
+                    i: [ 'class', 'id' ]
+                    b: [ 'class', 'id' ]
+                    caption: [ 'class', 'id' ]
+                    sub: [ 'class', 'id' ]
+                    sup: [ 'class', 'id' ]
+                    blockquote: [ 'class', 'id' ]
+                    s: [ 'class', 'id' ]
+                    iframe: [ 'frameborder', 'height', 'longdesc', 'name', 'sandbox', 'scrolling', 'src', 'title', 'width' ]
+                    br: ''
+                    img: [ 'alt', 'style', 'src' ]
+            pimcore.translation_sanitizer:
+                allow_attributes:
+                    pimcore_type: '*'
+                    pimcore_id: '*'
+                allow_relative_links: true
+                allow_elements:
+                    span: [ 'class', 'style', 'id' ]
+                    p: [ 'class', 'style', 'id' ]
+                    strong: 'class'
+                    em: 'class'
+                    h1: [ 'class', 'id' ]
+                    h2: [ 'class', 'id' ]
+                    h3: [ 'class', 'id' ]
+                    h4: [ 'class', 'id' ]
+                    h5: [ 'class', 'id' ]
+                    h6: [ 'class', 'id' ]
+                    a: [ 'class', 'id', 'href', 'target', 'title', 'rel' ]
+                    br: ''

.github/ci/files/config/packages/security.yaml

@@ -1,52 +1,24 @@
 security:
-    enable_authenticator_manager: true
-
     providers:
         pimcore_admin:
-            id: Pimcore\Bundle\AdminBundle\Security\User\UserProvider
+            id: Pimcore\Security\User\UserProvider
 
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
         # Pimcore WebDAV HTTP basic // DO NOT CHANGE!
-        pimcore_admin_webdav:
-            pattern: ^/admin/asset/webdav
+        pimcore_webdav:
+            pattern: ^/asset/webdav
             provider: pimcore_admin
             http_basic: ~
 
-        # Pimcore admin form login // DO NOT CHANGE!
-        pimcore_admin:
-            pattern: ^/admin(/.*)?$
-            # admin firewall is stateless as we open the admin
-            # session on demand for non-blocking parallel requests
-            stateless: true
-            provider: pimcore_admin
-            login_throttling:
-                max_attempts: 3
-                interval: '5 minutes'
-            logout:
-                path: pimcore_admin_logout
-                target: pimcore_admin_login
-            custom_authenticators:
-                    - Pimcore\Bundle\AdminBundle\Security\Authenticator\AdminLoginAuthenticator
-                    - Pimcore\Bundle\AdminBundle\Security\Authenticator\AdminTokenAuthenticator
-                    - Pimcore\Bundle\AdminBundle\Security\Authenticator\AdminSessionAuthenticator
-            two_factor:
-                auth_form_path: /admin/login/2fa                   # Path or route name of the two-factor form
-                check_path: /admin/login/2fa-verify                # Path or route name of the two-factor code check
-                default_target_path: /admin            # Where to redirect by default after successful authentication
-                always_use_default_target_path: false  # If it should always redirect to default_target_path
-                auth_code_parameter_name: _auth_code   # Name of the parameter for the two-factor authentication code
-                trusted_parameter_name: _trusted       # Name of the parameter for the trusted device option
-                multi_factor: false                    # If ALL active two-factor methods need to be fulfilled (multi-factor authentication)
-
-
     access_control:
         # Pimcore admin ACl  // DO NOT CHANGE!
         - { path: ^/admin/settings/display-custom-logo, roles: PUBLIC_ACCESS }
         - { path: ^/admin/login/2fa-verify, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS }
+        - { path: ^/admin/login/2fa-setup, roles: ROLE_PIMCORE_USER }
         - { path: ^/admin/login/2fa, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS }
         - { path: ^/admin/login$, roles: PUBLIC_ACCESS }
         - { path: ^/admin/login/(login|lostpassword|deeplink|csrf-token)$, roles: PUBLIC_ACCESS }

.github/ci/files/config/packages/test/config.yaml

@@ -16,6 +16,7 @@ doctrine:
     dbal:
         connections:
             default:
+                server_version: '10.11'
                 url: '%pimcore_test.db.dsn%'
                 host: ~
                 port: ~

.github/ci/files/config/services.yaml

@@ -30,9 +30,6 @@ services:
         autowire: true
         # automatically registers your services as commands, event subscribers, etc.
         autoconfigure: true
-        # this means you cannot fetch services directly from the container via $container->get()
-        # if you need to do this, you can override this setting on individual services
-        public: false
 
     # Example custom templating helper
     # AppBundle\Templating\Helper\Example:

.github/ci/files/config/system.yaml

@@ -1,40 +0,0 @@
-pimcore:
-    general:
-        domain: 'pimcore-test.dev'
-        redirect_to_maindomain: false
-        language: en
-        valid_languages: 'en,de,fr'
-        fallback_languages:
-            en: ''
-            de: ''
-        default_language: ''
-        debug_admin_translations: false
-    documents:
-        versions:
-            days: null
-            steps: 10
-        error_pages:
-            default: /error
-    objects:
-        versions:
-            days: null
-            steps: 10
-    assets:
-        versions:
-            days: null
-            steps: 10
-        hide_edit_image: false
-        disable_tree_preview: false
-    email:
-        sender:
-            name: pimcore
-            email: pimcore@example.com
-        return:
-            name: pimcore
-            email: pimcore@example.com
-pimcore_admin:
-    branding:
-        login_screen_invert_colors: false
-        color_login_screen: ''
-        color_admin_interface: ''
-        login_screen_custom_image: ''

.github/ci/files/public/index_test.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Pimcore
  *

.github/ci/files/src/Kernel.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
@@ -15,9 +16,21 @@
 
 namespace App;
 
+use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
+use Pimcore\HttpKernel\BundleCollection\BundleCollection;
 use Pimcore\Kernel as BaseKernel;
 
 class Kernel extends BaseKernel
 {
+    /**
+     * Adds bundles to register to the bundle collection. The collection is able
+     * to handle priorities and environment specific bundles.
+     *
+     * @param BundleCollection $collection
+     */
+    public function registerBundlesToCollection(BundleCollection $collection): void
+    {
+        // pimcore bundles
+    }
 
 }