diff --git a/src/Sylius/Bundle/AdminBundle/Form/Extension/ProductTypeExtension.php b/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php similarity index 72% rename from src/Sylius/Bundle/AdminBundle/Form/Extension/ProductTypeExtension.php rename to src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php index 37a424983c2..42d73d19758 100644 --- a/src/Sylius/Bundle/AdminBundle/Form/Extension/ProductTypeExtension.php +++ b/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php @@ -11,16 +11,15 @@ declare(strict_types=1); -namespace Sylius\Bundle\AdminBundle\Form\Extension; +namespace Sylius\Bundle\AdminBundle\Form\Type; -use Sylius\Bundle\AdminBundle\Form\Type\ProductAssociationsType; use Sylius\Bundle\CoreBundle\Form\Type\Product\ProductImageType; -use Sylius\Bundle\ProductBundle\Form\Type\ProductType; -use Symfony\Component\Form\AbstractTypeExtension; +use Sylius\Bundle\ProductBundle\Form\Type\ProductType as BaseProductType; +use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\UX\LiveComponent\Form\Type\LiveCollectionType; -final class ProductTypeExtension extends AbstractTypeExtension +final class ProductType extends AbstractType { /** * @param array $options @@ -43,11 +42,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ; } - /** - * @return iterable - */ - public static function getExtendedTypes(): iterable + public function getParent(): string { - return [ProductType::class]; + return BaseProductType::class; } } diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml index edf443278d9..98ef3cdd0c1 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml @@ -5,6 +5,8 @@ sylius_admin_product: templates: "@SyliusAdmin\\shared\\crud" redirect: update grid: sylius_admin_product + form: + type: Sylius\Bundle\AdminBundle\Form\Type\ProductType permission: true vars: all: @@ -39,6 +41,8 @@ sylius_admin_product_create_simple: permission: true factory: method: createWithVariant + form: + type: Sylius\Bundle\AdminBundle\Form\Type\ProductType template: "@SyliusAdmin/shared/crud/create.html.twig" redirect: sylius_admin_product_update vars: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/product/form.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/product/form.xml index 8e55d558d8e..60b0238cc94 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/product/form.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/product/form.xml @@ -13,8 +13,8 @@ - - + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml index 0b1c5c2cbfa..6830e654769 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml @@ -149,7 +149,7 @@ class="Sylius\Bundle\AdminBundle\Twig\Component\Product\FormComponent" > - Sylius\Bundle\ProductBundle\Form\Type\ProductType + Sylius\Bundle\AdminBundle\Form\Type\ProductType