[Studio] fix behat tests

dpfaffenbauer · dpfaffenbauer · commit 36ae29add058 · 2026-02-20T11:04:04.000+01:00
diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php
@@ -19,7 +19,7 @@
 
 use CoreShop\Component\Address\Model\CountryInterface;
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php
@@ -19,7 +19,7 @@
 
 use CoreShop\Component\Address\Model\ZoneInterface;
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CarriersConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CarriersConfigurationType.php
@@ -17,18 +17,20 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;
 
-use CoreShop\Bundle\ShippingBundle\Form\Type\CarrierChoiceType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class CarriersConfigurationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('carriers', CarrierChoiceType::class, [
+            ->add('carriers', CollectionType::class, [
                 'label' => 'coreshop_condition_carriers',
-                'multiple' => true,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'block_prefix' => 'coreshop_carrier_choice',
             ])
         ;
     }
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php
@@ -17,18 +17,20 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;
 
-use CoreShop\Bundle\AddressBundle\Form\Type\CountryChoiceType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class CountriesConfigurationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('countries', CountryChoiceType::class, [
+            ->add('countries', CollectionType::class, [
                 'label' => 'coreshop_condition_countries',
-                'multiple' => true,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'block_prefix' => 'coreshop_country_choice',
             ])
         ;
     }
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php
@@ -17,18 +17,20 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;
 
-use CoreShop\Bundle\CurrencyBundle\Form\Type\CurrencyChoiceType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class CurrenciesConfigurationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('currencies', CurrencyChoiceType::class, [
+            ->add('currencies', CollectionType::class, [
                 'label' => 'coreshop_condition_currencies',
-                'multiple' => true,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'block_prefix' => 'coreshop_currency_choice',
             ])
         ;
     }
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php
@@ -17,18 +17,20 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;
 
-use CoreShop\Bundle\StoreBundle\Form\Type\StoreChoiceType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class StoresConfigurationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('stores', StoreChoiceType::class, [
+            ->add('stores', CollectionType::class, [
                 'label' => 'coreshop_condition_stores',
-                'multiple' => true,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'block_prefix' => 'coreshop_store_choice',
             ])
         ;
     }
diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php
@@ -17,18 +17,20 @@
 
 namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;
 
-use CoreShop\Bundle\AddressBundle\Form\Type\ZoneChoiceType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class ZonesConfigurationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('zones', ZoneChoiceType::class, [
+            ->add('zones', CollectionType::class, [
                 'label' => 'coreshop_condition_zones',
-                'multiple' => true,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'block_prefix' => 'coreshop_zone_choice',
             ])
         ;
     }
diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/assets/pimcore-studio/src/modules/customer-company-assignment/CustomerCompanyAssignmentWidgetRestorer.ts b/src/CoreShop/Bundle/CoreBundle/Resources/assets/pimcore-studio/src/modules/customer-company-assignment/CustomerCompanyAssignmentWidgetRestorer.ts
@@ -25,7 +25,7 @@ const SUPPORTED_COMPONENTS = [
 export class CustomerCompanyAssignmentWidgetRestorer implements WidgetRestorer {
   supports(config: WidgetManagerTabConfig): boolean {
     return (
-      SUPPORTED_COMPONENTS.includes(config.component) &&
+      config.component !== undefined && SUPPORTED_COMPONENTS.includes(config.component) &&
       typeof config.config?.customerId === 'number'
     )
   }
diff --git a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php
@@ -18,7 +18,7 @@
 namespace CoreShop\Bundle\CurrencyBundle\Form\Type;
 
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/IndexBundle/Resources/assets/pimcore-studio/src/modules/shared/QuantityUnitSelect.tsx b/src/CoreShop/Bundle/IndexBundle/Resources/assets/pimcore-studio/src/modules/shared/QuantityUnitSelect.tsx
@@ -119,7 +119,7 @@ export const QuantityUnitSelect: React.FC<QuantityUnitSelectProps> = (props) =>
       placeholder={props.placeholder ?? 'Select quantity unit'}
       showSearch
       filterOption={(input, option) =>
-        (option?.label ?? '').toLowerCase().includes(input.toLowerCase())
+        String(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
       }
     />
   )
diff --git a/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php b/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php
@@ -18,7 +18,7 @@
 namespace CoreShop\Bundle\LocaleBundle\Form\Type;
 
 use Pimcore\Tool;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php
@@ -18,7 +18,7 @@
 namespace CoreShop\Bundle\OrderBundle\Form\Type;
 
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/cart-price-rules/conditions/index.ts b/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/cart-price-rules/conditions/index.ts
@@ -11,3 +11,4 @@
  */
 
 // All conditions are now schema-generated from backend form types
+export {}
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/CartList.tsx b/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/CartList.tsx
@@ -134,7 +134,7 @@ const CartListInner: React.FC = () => {
           const customerName = [details.firstname, details.lastname].filter(Boolean).join(' ') || `Customer #${customerId}`
           const widgetManager = container.get<WidgetRegistry>(serviceIds.widgetManager)
 
-          widgetManager.openMainWidget({
+          ;(widgetManager as any).openMainWidget({
             name: `New Order - ${customerName}`,
             id: `coreshop-order-creation-${customerId}`,
             component: 'coreshop-order-creation-detail',
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/OrderList.tsx b/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/OrderList.tsx
@@ -134,7 +134,7 @@ const OrderListInner: React.FC = () => {
           const customerName = [details.firstname, details.lastname].filter(Boolean).join(' ') || `Customer #${customerId}`
           const widgetManager = container.get<WidgetRegistry>(serviceIds.widgetManager)
 
-          widgetManager.openMainWidget({
+          ;(widgetManager as any).openMainWidget({
             name: `New Order - ${customerName}`,
             id: `coreshop-order-creation-${customerId}`,
             component: 'coreshop-order-creation-detail',
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/components/CreateInvoiceModal.tsx b/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/components/CreateInvoiceModal.tsx
@@ -10,7 +10,7 @@
  * @license    CoreShop Commercial License (CCL)
  */
 
-import { useState, useEffect } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Modal } from 'antd'
 import { useMessage } from '@pimcore/studio-ui-bundle/components'
 import { useTranslation } from 'react-i18next'
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/components/CreatePaymentModal.tsx b/src/CoreShop/Bundle/OrderBundle/Resources/assets/pimcore-studio/src/modules/sales/components/CreatePaymentModal.tsx
@@ -12,7 +12,7 @@
  * @license    CoreShop Commercial License (CCL)
  */
 
-import { useState, useEffect } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Modal } from 'antd'
 import { useMessage } from '@pimcore/studio-ui-bundle/components'
 import { useTranslation } from 'react-i18next'
diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitChoiceType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitChoiceType.php
@@ -18,7 +18,7 @@
 namespace CoreShop\Bundle\ProductBundle\Form\Type\Unit;
 
 use CoreShop\Component\Product\Repository\ProductUnitRepositoryInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/ProductBundle/Resources/assets/pimcore-studio/src/modules/product-price-rules/actions/index.ts b/src/CoreShop/Bundle/ProductBundle/Resources/assets/pimcore-studio/src/modules/product-price-rules/actions/index.ts
@@ -11,3 +11,4 @@
  */
 
 // All actions are now schema-generated from backend form types
+export {}
diff --git a/src/CoreShop/Bundle/ResourceBundle/Form/DataTransformer/CollectionToArrayTransformer.php b/src/CoreShop/Bundle/ResourceBundle/Form/DataTransformer/CollectionToArrayTransformer.php
diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php
@@ -19,7 +19,7 @@
 
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
 use CoreShop\Component\Shipping\Model\CarrierInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php b/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php
@@ -19,7 +19,7 @@
 
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
 use CoreShop\Component\Store\Model\StoreInterface;
-use CoreShop\Bundle\ResourceBundle\Form\DataTransformer\CollectionToArrayTransformer;
+use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/CoreShop/Component/Rule/Model/Action.php b/src/CoreShop/Component/Rule/Model/Action.php
@@ -17,7 +17,9 @@
 
 namespace CoreShop\Component\Rule\Model;
 
+use CoreShop\Component\Resource\Model\ResourceInterface;
 use CoreShop\Component\Resource\Model\SetValuesTrait;
+use Doctrine\Common\Collections\Collection;
 
 /**
  * @psalm-suppress MissingConstructor
@@ -80,8 +82,23 @@ public function getConfiguration()
 
     public function setConfiguration(array $configuration)
     {
-        $this->configuration = $configuration;
+        $this->configuration = $this->normalizeConfiguration($configuration);
 
         return $this;
     }
+
+    private function normalizeConfiguration(array $configuration): array
+    {
+        foreach ($configuration as $key => $value) {
+            if ($value instanceof Collection) {
+                $configuration[$key] = $this->normalizeConfiguration($value->toArray());
+            } elseif ($value instanceof ResourceInterface) {
+                $configuration[$key] = $value->getId();
+            } elseif (is_array($value)) {
+                $configuration[$key] = $this->normalizeConfiguration($value);
+            }
+        }
+
+        return $configuration;
+    }
 }
diff --git a/src/CoreShop/Component/Rule/Model/Condition.php b/src/CoreShop/Component/Rule/Model/Condition.php
@@ -17,7 +17,9 @@
 
 namespace CoreShop\Component\Rule\Model;
 
+use CoreShop\Component\Resource\Model\ResourceInterface;
 use CoreShop\Component\Resource\Model\SetValuesTrait;
+use Doctrine\Common\Collections\Collection;
 
 /**
  * @psalm-suppress MissingConstructor
@@ -80,8 +82,23 @@ public function getConfiguration()
 
     public function setConfiguration(array $configuration)
     {
-        $this->configuration = $configuration;
+        $this->configuration = $this->normalizeConfiguration($configuration);
 
         return $this;
     }
+
+    private function normalizeConfiguration(array $configuration): array
+    {
+        foreach ($configuration as $key => $value) {
+            if ($value instanceof Collection) {
+                $configuration[$key] = $this->normalizeConfiguration($value->toArray());
+            } elseif ($value instanceof ResourceInterface) {
+                $configuration[$key] = $value->getId();
+            } elseif (is_array($value)) {
+                $configuration[$key] = $this->normalizeConfiguration($value);
+            }
+        }
+
+        return $configuration;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,20 @@`
`17`	`17`
`18`	`18`	`namespace CoreShop\Bundle\CoreBundle\Form\Type\Rule\Condition;`
`19`	`19`
`20`		`-use CoreShop\Bundle\ShippingBundle\Form\Type\CarrierChoiceType;`
`21`	`20`	`use Symfony\Component\Form\AbstractType;`
	`21`	`+use Symfony\Component\Form\Extension\Core\Type\CollectionType;`
`22`	`22`	`use Symfony\Component\Form\FormBuilderInterface;`
`23`	`23`
`24`	`24`	`final class CarriersConfigurationType extends AbstractType`
`25`	`25`	`{`
`26`	`26`	`public function buildForm(FormBuilderInterface $builder, array $options): void`
`27`	`27`	`{`
`28`	`28`	`$builder`
`29`		`- ->add('carriers', CarrierChoiceType::class, [`
	`29`	`+ ->add('carriers', CollectionType::class, [`
`30`	`30`	`'label' => 'coreshop_condition_carriers',`
`31`		`- 'multiple' => true,`
	`31`	`+ 'allow_add' => true,`
	`32`	`+ 'allow_delete' => true,`
	`33`	`+ 'block_prefix' => 'coreshop_carrier_choice',`
`32`	`34`	`])`
`33`	`35`	`;`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ const SUPPORTED_COMPONENTS = [`
`25`	`25`	`export class CustomerCompanyAssignmentWidgetRestorer implements WidgetRestorer {`
`26`	`26`	`supports(config: WidgetManagerTabConfig): boolean {`
`27`	`27`	`return (`
`28`		`- SUPPORTED_COMPONENTS.includes(config.component) &&`
	`28`	`+ config.component !== undefined && SUPPORTED_COMPONENTS.includes(config.component) &&`
`29`	`29`	`typeof config.config?.customerId === 'number'`
`30`	`30`	`)`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ export const QuantityUnitSelect: React.FC<QuantityUnitSelectProps> = (props) =>`
`119`	`119`	`placeholder={props.placeholder ?? 'Select quantity unit'}`
`120`	`120`	`showSearch`
`121`	`121`	`filterOption={(input, option) =>`
`122`		`- (option?.label ?? '').toLowerCase().includes(input.toLowerCase())`
	`122`	`+ String(option?.label ?? '').toLowerCase().includes(input.toLowerCase())`
`123`	`123`	`}`
`124`	`124`	`/>`
`125`	`125`	`)`