Merge branch '3.2' into 4.0

coreshop · Dec 12, 2023 · a1a456f · a1a456f
2 parents c1f658a + e57e0fb
commit a1a456f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/AddressPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/AddressPage.php
@@ -35,12 +35,12 @@ public function chooseDifferentShippingAddress(): void
 
     public function useShippingAddress(AddressInterface $shippingAddress): void
     {
-        $this->getElement('shipping_address')->selectOption($shippingAddress->getId());
+        $this->getElement('shipping_address')->selectOption((string) $shippingAddress->getId());
     }
 
     public function useInvoiceAddress(AddressInterface $invoiceAddress): void
     {
-        $this->getElement('invoice_address')->selectOption($invoiceAddress->getId());
+        $this->getElement('invoice_address')->selectOption((string) $invoiceAddress->getId());
     }
 
     public function shippingAddressVisible(): bool

diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/PaymentPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/PaymentPage.php
@@ -30,7 +30,7 @@ public function getRouteName(): string
 
     public function selectPaymentProvider(PaymentProviderInterface $paymentProvider): void
     {
-        $this->getElement('payment_provider')->selectOption($paymentProvider->getId());
+        $this->getElement('payment_provider')->selectOption((string) $paymentProvider->getId());
     }
 
     public function submitStep(): void

diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml b/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml
@@ -36,6 +36,8 @@ services:
 
     coreshop.expression_language:
         class: Symfony\Component\ExpressionLanguage\ExpressionLanguage
+        arguments:
+            - '@cache.system'
 
     CoreShop\Component\Pimcore\ExpressionLanguage\PimcoreLanguageProvider:
         tags:

diff --git a/src/CoreShop/Bundle/ResourceBundle/Cache/CoreCacheHandlerDecorator.php b/src/CoreShop/Bundle/ResourceBundle/Cache/CoreCacheHandlerDecorator.php
@@ -51,15 +51,4 @@ public function load($key): mixed
 
         return $data;
     }
-
-    protected function prepareCacheData($data): mixed
-    {
-        /**
-         * It is useless to prepare the data for cache here
-         * since the Pimcore CoreCacheHandler on line 502 loads
-         * the data-object completely fresh, so we still have to use
-         * DeepCopy approach
-         */
-        return $data;
-    }
 }
diff --git a/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php b/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php
@@ -44,9 +44,9 @@ public function modify(StorageListItemInterface $item, float $targetQuantity): v
         $item->setQuantity($cleanTargetQuantity);
 
         if ($item->hasUnitDefinition()) {
-            $item->setDefaultUnitQuantity($item->getUnitDefinition()->getConversionRate() * $item->getQuantity());
+            $item->setDefaultUnitQuantity(($item->getUnitDefinition()?->getConversionRate() ?? 1.0) * $item->getQuantity());
         } else {
-            $item->setDefaultUnitQuantity($item->getQuantity());
+            $item->setDefaultUnitQuantity($item->getQuantity() ?? 1.0);
         }
     }