merge pimcore on local

.editorconfig

@@ -0,0 +1,20 @@
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+
+[*.php]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,4 @@
+
+* -text
+
+bundles/AdminBundle/Resources/public/js/lib/* linguist-vendored

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,36 @@
+# Bug Report
+<!--
+
+IMPORTANT: DO NOT SUBMIT ISSUES WHICH WERE NOT VERIFIED ON THE LATEST VERSION OF PIMCORE! 
+Bug reports that do not meet the conditions listed below will be closed/deleted without comment.
+
+- [ ] Do not submit reports for unsupported versions, supported versions can be viewed here https://github.com/pimcore/pimcore/milestones
+- [ ] This is not a security issue / vulnerability -> use [this form](https://pimcorehq.wufoo.com/forms/pimcore-security-report/) instead
+- [ ] Behavior is reproducible on https://demo.pimcore.fun/admin/ (admin/demo)
+or on a clean install of the latest build (out of your project, to avoid problems with custom code, plugins, ...)
+- [ ] You're not able to fix the problem yourself and send us a pull request instead of filing an issue.
+- [ ] There's no existing ticket for the same issue
+- [ ] Remove unused sections from below and this bullet points, submit only clean reports
+
+## Please answer the following questions
+-->
+
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce
+
+### Code example
+```php
+// your code
+```
+
+
+# Feature Request
+<!--
+## Please make sure all the following boxes are checked before submitting your feature request - thank you!
+- [ ] There is no existing issue regarding the same topic
+-->
+## Feature description
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,25 @@
+<!--
+
+## IMPORTANT CHANGE REGARDING THE TARGET BRANCH FOR YOUR PR! 
+Before working on a contribution, you must determine on which branch you need to work:
+- Bug fix: choose the latest maintenance branch, e.g. `6.6`
+- Feature/Improvement: choose `master` 
+
+> All bug fixes merged into the latest maintenance branch are also merged to the master 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/` -> target branch `master`
+- [ ] Bugfixes need a short guide how to reproduce them -> target branch latest maintenance branch, e.g. `6.6`
+- [ ] We're not accepting any feature PR's only for **version 5** anymore, you have to provide a feature PR for both versions. 
+- [ ] Please try to meet all level 2 requirements according to [PHPStan tests](/doc/Development_Documentation/19_Development_Tools_and_Details/29_Testing/02_Core_Tests.md)
+
+**Don't submit a PR if it doesn't comply, it'll be closed without a comment!**
+-->  
+
+
+## Changes in this pull request  
+Resolves #
+
+## Additional info  
+

.github/ci/files/.env

@@ -0,0 +1,21 @@
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=test
+
+#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+#TRUSTED_HOSTS='^(localhost|example\.com)$'
+###< symfony/framework-bundle ###

.github/ci/files/.my.cnf

@@ -0,0 +1,5 @@
+[client]
+host=127.0.0.1
+port=33006
+user=root
+password=

.github/ci/files/bin/console

@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ * @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+ob_get_clean();
+
+include __DIR__ . "/../vendor/autoload.php";
+
+define('PIMCORE_PROJECT_ROOT', __DIR__ . '/..');
+define('PIMCORE_CONSOLE', true);
+
+\Pimcore\Bootstrap::setProjectRoot();
+
+/** @var \Pimcore\Kernel $kernel */
+$kernel = \Pimcore\Bootstrap::startupCli();
+$application = new \Pimcore\Console\Application($kernel);
+$application->run();

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

@@ -0,0 +1,4 @@
+imports:
+    - { resource: services.yaml }
+    - { resource: system.yml }
+    - { resource: 'local/' }

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

@@ -0,0 +1,19 @@
+doctrine_migrations:
+    connection: default
+    migrations_paths:
+        'Pimcore\Bundle\CoreBundle\Migrations': '@PimcoreCoreBundle/Migrations'
+    storage:
+        table_storage:
+            table_name: 'migration_versions'
+            version_column_name: 'version'
+            version_column_length: 1024
+            executed_at_column_name: 'executed_at'
+            execution_time_column_name: 'execution_time'
+    all_or_nothing: false
+    check_database_platform: false
+    factories:
+        'Doctrine\Migrations\MigrationsRepository': 'Pimcore\Migrations\FilteredMigrationsRepository'
+        'Doctrine\Migrations\Metadata\Storage\MetadataStorage': 'Pimcore\Migrations\FilteredTableMetadataStorage'
+
+
+

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

@@ -0,0 +1,54 @@
+security:
+    providers:
+        pimcore_admin:
+            id: Pimcore\Bundle\AdminBundle\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
+            provider: pimcore_admin
+            http_basic: ~
+
+        # Pimcore admin form login // DO NOT CHANGE!
+        pimcore_admin:
+            anonymous: ~
+            pattern: ^/admin(/.*)?$
+            # admin firewall is stateless as we open the admin
+            # session on demand for non-blocking parallel requests
+            stateless: true
+            provider: pimcore_admin
+            logout:
+                path:   /admin/logout
+                target: /admin/login
+                success_handler: Pimcore\Bundle\AdminBundle\Security\LogoutSuccessHandler
+            guard:
+                entry_point: Pimcore\Bundle\AdminBundle\Security\Guard\AdminAuthenticator
+                authenticators:
+                    - Pimcore\Bundle\AdminBundle\Security\Guard\AdminAuthenticator
+            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: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/admin/login/2fa-verify, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS}
+        - { path: ^/admin/login/2fa, roles: IS_AUTHENTICATED_2FA_IN_PROGRESS}
+        - { path: ^/admin/login$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/admin/login/(login|lostpassword|deeplink|csrf-token)$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/admin, roles: ROLE_PIMCORE_USER }
+
+    role_hierarchy:
+        # Pimcore admin  // DO NOT CHANGE!
+        ROLE_PIMCORE_ADMIN: [ROLE_PIMCORE_USER]

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

@@ -0,0 +1,32 @@
+imports:
+    - { resource: ../../config.yaml }
+
+# this cache is used during tests when setting up pimcore
+framework:
+    cache:
+        pools:
+            pimcore.cache.pool:
+                public: true
+                tags: true
+                default_lifetime: 31536000  # 1 year
+                adapter: cache.adapter.array
+
+
+doctrine:
+    dbal:
+        connections:
+            default:
+                url: '%pimcore_test.db.dsn%'
+                host: ~
+                port: ~
+                dbname: ~
+                user: ~
+                password: ~
+                mapping_types:
+                    enum: string
+                    bit: boolean
+
+parameters:
+    pimcore_test.db.dsn: '%env(PIMCORE_TEST_DB_DSN)%'
+    env(PIMCORE_TEST_DB_DSN): ~
+    pimcore.encryption.secret: 'def00000fc1e34a17a03e2ef85329325b0736a5941633f8062f6b0a1a20f416751af119256bea0abf83ac33ef656b3fff087e1ce71fa6b8810d7f854fe2781f3fe4507f6'

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

@@ -0,0 +1,2 @@
+_pimcore:
+    resource: "@PimcoreCoreBundle/Resources/config/routing.yml"

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

@@ -0,0 +1,48 @@
+parameters:
+    secret: ThisTokenIsNotSoSecretChangeIt
+
+    # customize the full path to external executables
+    # normally they are auto-detected by `which program` or auto-discovered in the configured path in
+    # System Settings -> General -> Additional $PATH variable
+    # but in general it's a good idea to have your programs in your $PATH environment variable (system wide)
+
+    #pimcore_executable_composer: php /opt/vendor/bin/composer.phar
+    #pimcore_executable_soffice: /opt/libreoffice/bin/soffice
+    #pimcore_executable_gs: /opt/ghostscript/bin/gs
+    #pimcore_executable_pdftotext: /opt/tools/pdftotext
+    #pimcore_executable_xvfb-run: /opt/tools/xvfb-run
+    #pimcore_executable_pngcrush: /opt/tools/pngcrush
+    #pimcore_executable_zopflipng: /opt/tools/zopflipng
+    #pimcore_executable_pngout: /opt/tools/pngout
+    #pimcore_executable_advpng: /opt/tools/advpng
+    #pimcore_executable_cjpeg: /opt/tools/cjpeg
+    #pimcore_executable_jpegoptim: /opt/tools/jpegoptim
+    #pimcore_executable_php: /usr/local/custom-php/bin/php
+    #pimcore_executable_nice: /opt/tools/nice
+    #pimcore_executable_nohup: /opt/tools/nohup
+    #pimcore_executable_ffmpeg: /opt/tools/ffmpeg
+    #pimcore_executable_exiftool: /opt/tools/exiftool
+
+services:
+    # default configuration for services in *this* file
+    _defaults:
+        # automatically injects dependencies in your 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:
+    #     # templating helpers need to be public as they
+    #     # are fetched from the container on demand
+    #     public: true
+    #     tags:
+    #         - { name: templating.helper, alias: fooBar }
+
+    # Example event listener for objects
+    # AppBundle\EventListener\TestListener:
+    #     tags:
+    #         - { name: kernel.event_listener, event: pimcore.dataobject.preUpdate, method: onObjectPreUpdate }

.github/ci/files/config/system.yml

@@ -0,0 +1,40 @@
+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: [email protected]
+        return:
+            name: pimcore
+            email: [email protected]
+pimcore_admin:
+    branding:
+        login_screen_invert_colors: false
+        color_login_screen: ''
+        color_admin_interface: ''
+        login_screen_custom_image: ''

.github/ci/files/extensions.template.php

@@ -0,0 +1,27 @@
+<?php 
+
+return [
+    "brick" => [
+        "standard-teaser-row" => TRUE,
+        "wysiwyg" => TRUE,
+        "featurette" => TRUE,
+        "video" => TRUE,
+        "pdf" => TRUE,
+        "gallery-folder" => TRUE,
+        "gallery-single-images" => TRUE,
+        "image" => TRUE,
+        "blockquote" => TRUE,
+        "image-hotspot" => TRUE,
+        "image-hotspot-marker" => TRUE,
+        "gallery-carousel" => TRUE,
+        "headlines" => TRUE,
+        "text-accordion" => TRUE,
+        "horizontal-line" => TRUE,
+        "icon-teaser-row" => TRUE,
+        "tabbed-slider-text" => TRUE,
+        "wysiwyg-with-images" => TRUE
+    ],
+    "bundle" => [
+        "Pimcore\\Bundle\\EcommerceFrameworkBundle\\PimcoreEcommerceFrameworkBundle" => TRUE
+    ]
+];