Sync with latest upstream 4.x

.github/workflows/behat.yml

@@ -1,51 +1,55 @@
 name: Behat
 on:
   push:
-    branches: [ master ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ master ]
+    branches: [ '4.0' ]
 
 jobs:
   behat:
     runs-on: ubuntu-latest
     env:
       APP_ENV: "test"
       IM_SKIP_DB_SETUP: "1"
+      PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/coreshop_test"
       PIMCORE_INSTALL_ADMIN_USERNAME: "admin"
       PIMCORE_INSTALL_ADMIN_PASSWORD: "admin"
       PIMCORE_INSTALL_MYSQL_HOST_SOCKET: "127.0.0.1"
       PIMCORE_INSTALL_MYSQL_USERNAME: "root"
       PIMCORE_INSTALL_MYSQL_PASSWORD: "root"
-      PIMCORE_INSTALL_MYSQL_DATABASE: "data_defs_test"
+      PIMCORE_INSTALL_MYSQL_DATABASE: "coreshop_test"
       PIMCORE_INSTALL_MYSQL_PORT: "3306"
       PIMCORE_KERNEL_CLASS: 'Kernel'
       PIMCORE_CLASS_DIRECTORY: 'var/tmp/behat/var/classes'
-      PIMCORE_WRITE_TARGET_STATICROUTES: 'settings-store'
-      PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/data_defs_test"
+
+    strategy:
+      matrix:
+        php: [ 8.1, 8.2 ]
+        pimcore: [ ^11.0 ]
+        dependencies: [ highest ]
+        exclude:
+          - php: 8.1
+            dependencies: lowest
 
     services:
       database:
-        image: "mariadb:10.5"
+        image: "mysql:8"
         env:
           MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: data_defs_test
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}"
-    strategy:
-      matrix:
-        php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
+    name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
+        ini-values: display_errors=On, display_startup_errors=On, error_reporting=32767
         extensions: intl, gd, simpleXML, dom, exif, fileinfo, iconv, mbstring, mysqli, pdo_mysql, zip, zlib
 
     - name: Check PHP Version
@@ -57,35 +61,35 @@ jobs:
 
     - name: Get composer cache directory
       id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
         restore-keys: ${{ runner.os }}-composer-
 
-    - name: Cache composer dependencies
-      uses: actions/cache@v1
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-        restore-keys: ${{ runner.os }}-composer-
-
-    - name: Install dependencies highest
+    - if: matrix.dependencies == 'highest'
+      name: Install dependencies highest
       run: |
-        composer req guzzlehttp/psr7 pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
+        composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
         composer update --no-progress --prefer-dist --optimize-autoloader
 
+    - if: matrix.dependencies == 'lowest'
+      name: Install dependencies lowest
+      run: |
+        composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
+        composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
+
     - name: Cache clear
       run: bin/console cache:clear
 
     - name: Assets Install
       run: bin/console assets:install --symlink
 
     - name: Install Pimcore
-      run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --ignore-existing-config --env=test --skip-database-config
+      run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config
 
     - name: Install DataDefinitions
       run: bin/console pimcore:bundle:install DataDefinitionsBundle

.github/workflows/static.yml

@@ -1,41 +1,40 @@
 name: Static Tests (Lint, Stan)
 on:
   push:
-    branches: [ master ]
+    branches: [ '4.0' ]
   pull_request:
-    branches: [ master ]
+    branches: [ '4.0' ]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     env:
       APP_ENV: "test"
-      PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/data_defs_test"
+      PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/coreshop_test"
 
     strategy:
       matrix:
-        php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.5 ]
-        database: [ 'mysql:8.0' ]
-        dependencies: [ highest, lowest ]
+        php: [ 8.1, 8.2 ]
+        pimcore: [ ^11.0 ]
+        dependencies: [ highest ]
         exclude:
           - php: 8.1
             dependencies: lowest
 
     services:
       database:
-        image: "${{ matrix.database }}"
+        image: "mysql:8"
         env:
           MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: data_defs_test
+          MYSQL_DATABASE: coreshop_test
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, DB ${{ matrix.database }}, Deps ${{ matrix.dependencies }}"
+    name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -49,10 +48,10 @@ jobs:
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -61,13 +60,13 @@ jobs:
       - if: matrix.dependencies == 'highest'
         name: Install dependencies highest
         run: |
-          composer req guzzlehttp/psr7 pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
+          composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
           composer update --no-progress --prefer-dist --optimize-autoloader
 
       - if: matrix.dependencies == 'lowest'
         name: Install dependencies lowest
         run: |
-          composer req guzzlehttp/psr7 pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
+          composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
           composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
 
       - name: Validate YAML

behat-bootstrap.php

@@ -1,10 +1,20 @@
 <?php
 
-require __DIR__ . '/src/Kernel.php';
+if (!defined('PIMCORE_PROJECT_ROOT')) {
+    define(
+        'PIMCORE_PROJECT_ROOT',
+        getenv('PIMCORE_PROJECT_ROOT')
+            ?: getenv('REDIRECT_PIMCORE_PROJECT_ROOT')
+            ?: realpath(getcwd())
+    );
+}
 
-define('TESTS_PATH', __DIR__);
-define('PIMCORE_PROJECT_ROOT', __DIR__);
-define('PIMCORE_KERNEL_CLASS', '\AppKernel');
+define('PIMCORE_TEST', true);
+define('PIMCORE_CLASS_DIRECTORY', __DIR__ . '/var/tmp/behat/var/classes');
+
+error_reporting(E_ALL);
+
+require_once __DIR__ .'/src/BehatKernel.php';
 
 \Pimcore\Bootstrap::setProjectRoot();
 \Pimcore\Bootstrap::bootstrap();

composer.json

@@ -32,15 +32,18 @@
     "php": ">=8.0",
     "ext-json": "*",
     "box/spout": "^3.0",
-    "coreshop/pimcore-bundle": "^3.0",
-    "coreshop/resource-bundle": "^3.0",
-    "coreshop/rule-bundle": "^3.0",
+    "coreshop/pimcore-bundle": "^4.0",
+    "coreshop/resource-bundle": "^4.0",
+    "coreshop/rule-bundle": "^4.0",
     "jms/serializer": "^3.17.1",
     "league/csv": "^9.7",
     "nyholm/psr7": "^1.5",
-    "pimcore/pimcore": "^10.5",
+    "pimcore/admin-ui-classic-bundle": "^1.0",
+    "pimcore/pimcore": "^11.0",
     "psr/http-client-implementation": "^1.0",
-    "psr/http-factory-implementation": "^1.0"
+    "psr/http-factory-implementation": "^1.0",
+    "symfony/dotenv": "^6.3",
+    "symfony/http-client": "^6.3"
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
@@ -65,7 +68,11 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Wvision\\Bundle\\DataDefinitionsBundle\\Behat\\": "tests/DataDefinitionsBundle/Behat"
+      "Wvision\\Bundle\\DataDefinitionsBundle\\Behat\\": "tests/DataDefinitionsBundle/Behat",
+      "Pimcore\\Model\\DataObject\\": [
+        "var/classes/DataObject",
+        "var/tmp/behat/var/classes/DataObject"
+      ]
     },
     "classmap": [
       "src/Kernel.php"

config/config.yaml

@@ -1,6 +1,5 @@
 imports:
     - { resource: services.yaml }
-    - { resource: migrations.yaml }
     - { resource: system.yml }
     - { resource: 'local/' }
 

config/packages/security.yaml

@@ -1,54 +1,35 @@
 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:
-            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)
-
+        # Pimcore Admin Bundle firewall
+        pimcore_admin: '%pimcore_admin_bundle.firewall_settings%'
 
     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/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 }
         - { path: ^/admin, roles: ROLE_PIMCORE_USER }
+        - { path: ^/asset/webdav, roles: ROLE_PIMCORE_USER }
 
     role_hierarchy:
         # Pimcore admin  // DO NOT CHANGE!
-        ROLE_PIMCORE_ADMIN: [ROLE_PIMCORE_USER]
+        ROLE_PIMCORE_ADMIN: [ROLE_PIMCORE_USER]

config/packages/test/config.yaml

@@ -21,3 +21,12 @@ parameters:
 framework:
     session:
         handler_id: 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler'
+
+data_definitions:
+    config_location:
+        import_definitions:
+            write_target:
+                type: settings-store
+        export_definitions:
+            write_target:
+                type: settings-store

config/routes.yaml

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

config/routes/dev/routes.yaml

@@ -1,3 +1,2 @@
 _pimcore_dev:
-    resource: "@PimcoreCoreBundle/Resources/config/routing_dev.yml"
-
+    resource: "@PimcoreCoreBundle/config/routing_dev.yaml"