Merge pull request #2943 from coreshop/upmerge/5.0_next

dpfaffenbauer · web-flow · commit a42887d1cbc4 · 2026-01-20T07:58:24.000+01:00
[UPMERGE] 5.0 -&gt; next
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -1,7 +1,7 @@
 name: Behat
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - 'features/**'
@@ -10,7 +10,7 @@ on:
       - 'src/**'
       - '.github/workflows/behat.yml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - 'features/**'
diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -1,7 +1,7 @@
 name: Behat UI
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - 'features/**'
@@ -10,7 +10,7 @@ on:
       - 'src/**'
       - '.github/workflows/behat_ui.yml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - 'features/**'
diff --git a/.github/workflows/codestyles.yml b/.github/workflows/codestyles.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: [ '4.0', '4.1', '5.0', 'next' ]
+        branches: [ '5.0', 'next' ]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/license-check.yaml b/.github/workflows/license-check.yaml
@@ -1,13 +1,13 @@
 name: License Check
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - '*/**/composer.json'
       - '.github/workflows/license-check.yaml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'composer.json'
       - '*/**/composer.json'
diff --git a/.github/workflows/packages_bundles.yml b/.github/workflows/packages_bundles.yml
@@ -1,12 +1,12 @@
 name: Packages Bundles
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Bundle/**'
       - '.github/workflows/packages_bundles.yml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Bundle/**'
       - '.github/workflows/packages_bundles.yml'
diff --git a/.github/workflows/packages_components.yml b/.github/workflows/packages_components.yml
@@ -1,12 +1,12 @@
 name: Packages Components
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Component/**'
       - '.github/workflows/packages_components.yml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'src/CoreShop/Component/**'
       - '.github/workflows/packages_components.yml'
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -1,7 +1,7 @@
 name: Static Tests (Lint, Stan)
 on:
   push:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'features/**'
       - 'behat.yml.dist'
@@ -12,7 +12,7 @@ on:
       - 'composer.json'
       - '.github/workflows/static.yml'
   pull_request_target:
-    branches: [ '4.0', '4.1', '5.0', 'next' ]
+    branches: [ '5.0', 'next' ]
     paths:
       - 'features/**'
       - 'behat.yml.dist'
diff --git a/CHANGELOG-4.1.x.md b/CHANGELOG-4.1.x.md
@@ -1,3 +1,9 @@
+## 4.1.8
+* [Messenger] dispatch `FailedMessageDetailsEvent` to allow customization of failed message details generation by @jdreesen in https://github.com/coreshop/CoreShop/pull/2911
+* [Messenger] wrap failed message details info modal data in `<pre>` tags by @jdreesen in https://github.com/coreshop/CoreShop/pull/2910
+* [Pimcore] require Pimcore 11.5 only and test for PHP 8.3 by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2937
+* [CoreBundle] fix reports injection by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2936
+
 ## 4.1.7
 * [CoreBundle] fix store values version preview with null values by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2912
 * [GraphQL] enable all translations for graphql by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2914
diff --git a/CHANGELOG-5.0.x.md b/CHANGELOG-5.0.x.md
@@ -11,4 +11,13 @@ old, not copied yet, Frontend Files to your implementation.
 ### Index Bundle
 
 The IndexBundle Extensions (`IndexColumnsExtensionInterface`, `IndexRelationalColumnsExtensionInterface`) get*Columns
-Methods for a MySQL Worker need to return a array of `Doctrine\DBAL\Schema\Column` now 
+Methods for a MySQL Worker need to return a array of `Doctrine\DBAL\Schema\Column` now
+
+## What's Changed
+* [FrontendBundle] Design v2 and Pimcore 12 compatibility by @codingioanniskrikos in https://github.com/coreshop/CoreShop/pull/2744
+* [IndexBundle] Optimize 404 Exception Handling on Index Item Deletion by @aarongerig in https://github.com/coreshop/CoreShop/pull/2894
+* [IndexBundle] Ignore missing 404 error when deleting non-existent document by @aarongerig in https://github.com/coreshop/CoreShop/pull/2896
+* [CoreBundle] fix store values version preview with null values by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2912
+* [GraphQL] enable all translations for graphql by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2914
+* [Pimcore] downgrade doctrine/dbal by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2922
+*  [CoreBundle] fix deprecation and issue in ObjectUserProvider and use stable Pimcore 12 in https://github.com/coreshop/CoreShop/pull/2926
diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -25,7 +25,7 @@ final class Version
 
     public const string RELEASE_VERSION = '0';
 
-    public const string EXTRA_VERSION = 'beta.1';
+    public const string EXTRA_VERSION = '';
 
     public static function getVersion(): string
     {
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php
@@ -93,6 +93,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 continue;
             }
 
+            /**
+             * @psalm-suppress ArgumentTypeCoercion
+             */
             $formBuilder = $builder->create(
                 'paymentSettings',
                 $this->formTypeRegistry->get($type, 'default'),
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php
@@ -96,15 +96,19 @@ public function getReportData(ParameterBag $parameterBag): array
                         LEFT JOIN object_$userClassId AS `user` ON `user`.oo_id = cart.customer__id
                         LEFT JOIN coreshop_payment_provider AS `pg` ON `pg`.id = cart.paymentProvider
                         WHERE cart.items <> ''
-                          AND cart.store = $storeId
-                          AND cart.creationDate > ?
-                          AND cart.creationDate < ?
+                          AND cart.store = :storeId
+                          AND cart.creationDate > :fromTimestamp
+                          AND cart.creationDate < :toTimestamp
                           AND cart.saleState = '" . OrderSaleStates::STATE_CART . "'
                      GROUP BY cart.oo_id
                      ORDER BY cart.creationDate DESC
-                     LIMIT $offset,$limit";
+                     LIMIT " . (int) $offset . ', ' . (int) $limit;
 
-        $data = $this->db->fetchAllAssociative($sqlQuery, [$fromTimestamp, $toTimestamp]);
+        $data = $this->db->fetchAllAssociative($sqlQuery, [
+            'storeId' => $storeId,
+            'fromTimestamp' => $fromTimestamp,
+            'toTimestamp' => $toTimestamp,
+        ]);
         $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()');
 
         foreach ($data as &$entry) {
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php
@@ -61,24 +61,28 @@ public function getReportData(ParameterBag $parameterBag): array
 
         $tableName = 'object_query_' . $this->orderRepository->getClassId();
         $sql = "
-              SELECT carrier, 
-                    COUNT(1) as total, 
-                    COUNT(1) / t.cnt * 100 as `percentage` 
-              FROM $tableName as `order` 
-              INNER JOIN objects as o 
-                ON o.id = `order`.oo_id 
-              CROSS JOIN 
+              SELECT carrier,
+                    COUNT(1) as total,
+                    COUNT(1) / t.cnt * 100 as `percentage`
+              FROM $tableName as `order`
+              INNER JOIN objects as o
+                ON o.id = `order`.oo_id
+              CROSS JOIN
                 (
-                  SELECT COUNT(1) as cnt 
-                  FROM $tableName as `order` 
-                  INNER JOIN objects as o 
-                    ON o.id = `order`.oo_id  
-                  WHERE store = $storeId AND creationDate > $fromTimestamp AND creationDate < $toTimestamp
-                ) t 
-              WHERE store = $storeId AND carrier IS NOT NULL AND creationDate > $fromTimestamp AND creationDate < $toTimestamp AND saleState='" . OrderSaleStates::STATE_ORDER . "' 
+                  SELECT COUNT(1) as cnt
+                  FROM $tableName as `order`
+                  INNER JOIN objects as o
+                    ON o.id = `order`.oo_id
+                  WHERE store = :storeId AND creationDate > :fromTimestamp AND creationDate < :toTimestamp
+                ) t
+              WHERE store = :storeId AND carrier IS NOT NULL AND creationDate > :fromTimestamp AND creationDate < :toTimestamp AND saleState='" . OrderSaleStates::STATE_ORDER . "'
               GROUP BY carrier";
 
-        $results = $this->db->fetchAllAssociative($sql);
+        $results = $this->db->fetchAllAssociative($sql, [
+            'storeId' => $storeId,
+            'fromTimestamp' => $fromTimestamp,
+            'toTimestamp' => $toTimestamp,
+        ]);
         $data = [];
 
         foreach ($results as $result) {
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php
@@ -80,25 +80,31 @@ protected function getData(ParameterBag $parameterBag): array
                     CASE WHEN orderCount IS NULL THEN 0 ELSE orderCount END as orders,
                     CASE WHEN cartCount IS NULL THEN 0 ELSE cartCount END as carts
                 FROM (
-                  SELECT 
+                  SELECT
                     COUNT(*) as orderCount,
                     DATE(FROM_UNIXTIME(orderDate)) as orderDateTimestamp
                   FROM object_query_$orderClassId AS orders
-                  WHERE store = $storeId AND orderDate > $fromTimestamp AND orderDate < $toTimestamp and orders.saleState = '" . OrderSaleStates::STATE_ORDER . "'
+                  WHERE store = :storeId AND orderDate > :fromTimestamp AND orderDate < :toTimestamp and orders.saleState = '" . OrderSaleStates::STATE_ORDER . "'
                   GROUP BY DATE(FROM_UNIXTIME(orderDate))
                 ) as ordersQuery
                 $join OUTER JOIN (
                   SELECT
                     COUNT(*) as cartCount,
                     DATE(FROM_UNIXTIME(creationDate)) as cartDateTimestamp
                   FROM object_$orderClassId AS carts
-                  WHERE store = $storeId AND creationDate > $fromTimestamp AND creationDate < $toTimestamp and carts.saleState = '" . OrderSaleStates::STATE_CART . "'
+                  WHERE store = :storeId AND creationDate > :fromTimestamp AND creationDate < :toTimestamp and carts.saleState = '" . OrderSaleStates::STATE_CART . "'
                   GROUP BY DATE(FROM_UNIXTIME(creationDate))
                 ) as cartsQuery ON cartsQuery.cartDateTimestamp = ordersQuery.orderDateTimestamp
             ";
         }
 
-        $data = $this->db->fetchAllAssociative(implode(\PHP_EOL . 'UNION ALL' . \PHP_EOL, $queries) . '  ORDER BY timestamp ASC');
+        $queryParams = [
+            'storeId' => $storeId,
+            'fromTimestamp' => $fromTimestamp,
+            'toTimestamp' => $toTimestamp,
+        ];
+
+        $data = $this->db->fetchAllAssociative(implode(\PHP_EOL . 'UNION ALL' . \PHP_EOL, $queries) . '  ORDER BY timestamp ASC', $queryParams);
 
         foreach ($data as &$day) {
             $date = Carbon::createFromTimestamp((string) strtotime($day['timestamp']));
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CategoriesReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CategoriesReport.php
@@ -78,6 +78,17 @@ public function getReportData(ParameterBag $parameterBag): array
             return [];
         }
 
+        $orderStateInClause = '';
+        $orderStateParams = [];
+        if ($orderStateFilter !== null) {
+            $orderStatePlaceholders = [];
+            foreach ($orderStateFilter as $i => $state) {
+                $orderStatePlaceholders[] = ':orderState' . $i;
+                $orderStateParams['orderState' . $i] = $state;
+            }
+            $orderStateInClause = ' AND `orders`.orderState IN (' . implode(', ', $orderStatePlaceholders) . ')';
+        }
+
         $query = "
             SELECT SQL_CALC_FOUND_ROWS
               `categories`.oo_id as categoryId,
@@ -89,23 +100,22 @@ public function getReportData(ParameterBag $parameterBag): array
               SUM(orderItems.quantity) AS `quantityCount`,
               COUNT(orderItems.product__id) AS `orderCount`
             FROM object_$categoryClassId AS categories
-            INNER JOIN object_localized_query_" . $categoryClassId . '_' . $locale . " AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id 
-            INNER JOIN dependencies AS catProductDependencies ON catProductDependencies.targetId = categories.oo_id AND catProductDependencies.targettype = \"object\" 
+            INNER JOIN object_localized_query_" . $categoryClassId . '_' . $locale . " AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id
+            INNER JOIN dependencies AS catProductDependencies ON catProductDependencies.targetId = categories.oo_id AND catProductDependencies.targettype = \"object\"
             INNER JOIN object_query_$orderItemClassId AS orderItems ON orderItems.product__id = catProductDependencies.sourceId
             INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\"
             INNER JOIN object_query_$orderClassId AS `orders` ON `orders`.oo_id = orderRelations.src_id
-            WHERE orders.store = $storeId" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL AND saleState='" . OrderSaleStates::STATE_ORDER . "'
+            WHERE orders.store = :storeId" . $orderStateInClause . " AND orders.orderDate > :fromTimestamp AND orders.orderDate < :toTimestamp AND orderItems.product__id IS NOT NULL AND saleState='" . OrderSaleStates::STATE_ORDER . "'
             GROUP BY categories.oo_id
             ORDER BY quantityCount DESC
-            LIMIT $offset,$limit";
+            LIMIT " . (int) $offset . ', ' . (int) $limit;
 
-        $queryParameters = [];
+        $queryParameters = array_merge([
+            'storeId' => $storeId,
+            'fromTimestamp' => $from->getTimestamp(),
+            'toTimestamp' => $to->getTimestamp(),
+        ], $orderStateParams);
 
-        if ($orderStateFilter !== null) {
-            array_push($queryParameters, ...$orderStateFilter);
-        }
-        $queryParameters[] = $from->getTimestamp();
-        $queryParameters[] = $to->getTimestamp();
         $results = $this->db->fetchAllAssociative($query, $queryParameters);
 
         if (count($results) === 0) {
@@ -121,15 +131,15 @@ public function getReportData(ParameterBag $parameterBag): array
               SUM(orderItems.quantity) AS `quantityCount`,
               COUNT(orderItems.product__id) AS `orderCount`
             FROM object_$categoryClassId AS categories
-            INNER JOIN object_localized_query_" . $categoryClassId . '_' . $locale . " AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id 
-            INNER JOIN dependencies AS catProductDependencies ON catProductDependencies.sourceId = categories.oo_id AND catProductDependencies.sourcetype = \"object\" 
+            INNER JOIN object_localized_query_" . $categoryClassId . '_' . $locale . " AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id
+            INNER JOIN dependencies AS catProductDependencies ON catProductDependencies.sourceId = categories.oo_id AND catProductDependencies.sourcetype = \"object\"
             INNER JOIN object_query_$orderItemClassId AS orderItems ON orderItems.product__id = catProductDependencies.targetId
             INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\"
             INNER JOIN object_query_$orderClassId AS `orders` ON `orders`.oo_id = orderRelations.src_id
-            WHERE orders.store = $storeId" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL
+            WHERE orders.store = :storeId" . $orderStateInClause . " AND orders.orderDate > :fromTimestamp AND orders.orderDate < :toTimestamp AND orderItems.product__id IS NOT NULL
             GROUP BY categories.oo_id
             ORDER BY quantityCount DESC
-            LIMIT $offset,$limit";
+            LIMIT " . (int) $offset . ', ' . (int) $limit;
             $results = $this->db->fetchAllAssociative($query, $queryParameters);
         }
 
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php
@@ -59,16 +59,19 @@ public function getReportData(ParameterBag $parameterBag): array
             SELECT SQL_CALC_FOUND_ROWS
               customer.oo_id,
               customer.email as `emailAddress`,
-              SUM(orders.totalNet) as sales, 
+              SUM(orders.totalNet) as sales,
               COUNT(customer.oo_id) as `orderCount`
             FROM object_query_$orderClassId AS orders
             INNER JOIN object_query_$customerClassId AS customer ON orders.customer__id = customer.oo_id
-            WHERE  orders.orderState = '$orderCompleteState' AND orders.orderDate > ? AND orders.orderDate < ? AND customer.oo_id IS NOT NULL AND saleState='" . OrderSaleStates::STATE_ORDER . "'
+            WHERE  orders.orderState = '$orderCompleteState' AND orders.orderDate > :fromTimestamp AND orders.orderDate < :toTimestamp AND customer.oo_id IS NOT NULL AND saleState='" . OrderSaleStates::STATE_ORDER . "'
             GROUP BY customer.oo_id
             ORDER BY COUNT(customer.oo_id) DESC
-            LIMIT $offset,$limit";
+            LIMIT " . (int) $offset . ', ' . (int) $limit;
 
-        $results = $this->db->fetchAllAssociative($query, [$from->getTimestamp(), $to->getTimestamp()]);
+        $results = $this->db->fetchAllAssociative($query, [
+            'fromTimestamp' => $from->getTimestamp(),
+            'toTimestamp' => $to->getTimestamp(),
+        ]);
         $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()');
 
         foreach ($results as &$result) {
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php b/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php b/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php
diff --git a/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class Version`
`25`	`25`
`26`	`26`	`public const string RELEASE_VERSION = '0';`
`27`	`27`
`28`		`- public const string EXTRA_VERSION = 'beta.1';`
	`28`	`+ public const string EXTRA_VERSION = '';`
`29`	`29`
`30`	`30`	`public static function getVersion(): string`
`31`	`31`	`{`