[UPMERGE] 5.0 -> next

.github/workflows/behat.yml

@@ -73,16 +73,7 @@ jobs:
     name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/behat_ui.yml

@@ -74,16 +74,7 @@ jobs:
     name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - uses: browser-actions/setup-chrome@v1
         with:

.github/workflows/docs_next.yml

@@ -1,6 +1,6 @@
 name: "Documentation"
 on:
-  pull_request_target:
+  pull_request:
     paths:
       - 'docs/**'
       - '.github/workflows/docs_next.yml'

.github/workflows/license-check.yaml

@@ -6,7 +6,7 @@ on:
       - 'composer.json'
       - '*/**/composer.json'
       - '.github/workflows/license-check.yaml'
-  pull_request_target:
+  pull_request:
     branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
@@ -50,16 +50,7 @@ jobs:
     name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/packages_bundles.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - 'src/CoreShop/Bundle/**'
       - '.github/workflows/packages_bundles.yml'
-  pull_request_target:
+  pull_request:
     branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Bundle/**'
@@ -32,16 +32,7 @@ jobs:
     name: "Create a list of packages"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: "List Packages"
         id: create-list
@@ -61,18 +52,12 @@ jobs:
         pimcore: [ ^12.3 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
+        exclude:
+          - php: 8.4
+            dependencies: lowest
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/packages_components.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - 'src/CoreShop/Component/**'
       - '.github/workflows/packages_components.yml'
-  pull_request_target:
+  pull_request:
     branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Component/**'
@@ -32,16 +32,7 @@ jobs:
     name: "Create a list of packages"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: "List Packages"
         id: create-list
@@ -62,18 +53,12 @@ jobs:
         pimcore: [ ^12.3 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
+        exclude:
+          - php: 8.4
+            dependencies: lowest
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/static.yml

@@ -11,7 +11,7 @@ on:
       - '*.xml'
       - 'composer.json'
       - '.github/workflows/static.yml'
-  pull_request_target:
+  pull_request:
     branches: [ '5.0', 'next' ]
     paths:
       - 'features/**'
@@ -48,6 +48,9 @@ jobs:
         php: [ 8.3, 8.4 ]
         pimcore: [ ^12.3 ]
         dependencies: [ highest, lowest ]
+        exclude:
+          - php: 8.4
+            dependencies: lowest
     services:
       database:
         image: "mysql:8"
@@ -60,16 +63,7 @@ jobs:
     name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
     steps:
-      - name: Checkout PR head (only for pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - name: Checkout PR head (for push or other events)
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

composer.json

@@ -108,15 +108,15 @@
     "sebastian/diff": "^4.0 | ^5.0 | ^6.0",
     "stof/doctrine-extensions-bundle": "^1.14",
     "sylius/theme-bundle": "^2.2",
-    "symfony/config": "^6.3 || ^7.4",
-    "symfony/dotenv": "^6.3 || ^7.0",
-    "symfony/form": "^6.3 || ^7.0",
-    "symfony/http-client": "^6.3 || ^7.0",
-    "symfony/intl": "^6.3 || ^7.0",
-    "symfony/notifier": "^6.3 || ^7.0",
-    "symfony/scheduler": "^6.4 || ^7.0",
-    "symfony/serializer": "^6.3 || ^7.0",
-    "symfony/twig-bundle": "^6.3 || ^7.0",
+    "symfony/config": "^6.4 || ^7.3",
+    "symfony/dotenv": "^6.4 || ^7.3",
+    "symfony/form": "^6.4 || ^7.3",
+    "symfony/http-client": "^6.4 || ^7.3",
+    "symfony/intl": "^6.4 || ^7.3",
+    "symfony/notifier": "^6.4 || ^7.3",
+    "symfony/scheduler": "^6.4 || ^7.3",
+    "symfony/serializer": "^6.4 || ^7.3",
+    "symfony/twig-bundle": "^6.4 || ^7.3",
     "symfony/webpack-encore-bundle": "^2.4",
     "webmozart/assert": "^1.12"
   },
@@ -146,9 +146,9 @@
     "robertfausk/behat-panther-extension": "^1.2",
     "symfony/panther": "^2.3",
     "php-webdriver/webdriver": "^1.15",
-    "symfony/browser-kit": "^6.3 || ^7.0",
-    "symfony/runtime": "^6.4 || ^7.0",
-    "symfony/css-selector": "^6.4 || ^7.0",
+    "symfony/browser-kit": "^6.4 || ^7.3",
+    "symfony/runtime": "^6.4 || ^7.3",
+    "symfony/css-selector": "^6.4 || ^7.3",
     "symplify/easy-coding-standard": "^11.1",
     "vimeo/psalm": "^6.10"
   },

src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopUserBundle/CoreShopUser.json

@@ -128,6 +128,28 @@
                                 "visibleGridView": false,
                                 "visibleSearch": false
                             },
+                            {
+                                "fieldtype": "datetime",
+                                "queryColumnType": "bigint",
+                                "columnType": "bigint",
+                                "phpdocType": "\\Carbon\\Carbon",
+                                "defaultValue": null,
+                                "useCurrentDate": false,
+                                "name": "passwordResetHashCreatedAt",
+                                "title": "Reset Password Hash Created At",
+                                "tooltip": "",
+                                "mandatory": false,
+                                "noteditable": true,
+                                "index": false,
+                                "locked": false,
+                                "style": "",
+                                "permissions": null,
+                                "datatype": "data",
+                                "relationType": false,
+                                "invisible": true,
+                                "visibleGridView": false,
+                                "visibleSearch": false
+                            },
                             {
                                 "fieldtype": "coreShopRelation",
                                 "stack": "coreshop.customer",

src/CoreShop/Bundle/CurrencyBundle/composer.json

@@ -27,7 +27,7 @@
     "coreshop/currency": "^5.0",
     "coreshop/resource-bundle": "^5.0",
     "pimcore/pimcore": "^12.3",
-    "symfony/intl": "^6.3 || ^7.0"
+    "symfony/intl": "^6.4 || ^7.3"
   },
   "require-dev": {
     "phpstan/phpstan": "^2.1",