[Admin] Extract an admin-only ProductType

Sylius · May 9, 2024 · 91f0a96 · 91f0a96
1 parent eff1c8f
commit 91f0a96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/...e/Form/Extension/ProductTypeExtension.php → ...dle/AdminBundle/Form/Type/ProductType.php b/...e/Form/Extension/ProductTypeExtension.php → ...dle/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<string, mixed> $options
@@ -43,11 +42,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         ;
     }
 
-    /**
-     * @return iterable<class-string>
-     */
-    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
@@ -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
@@ -13,8 +13,8 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius_admin.form.extension.product" class="Sylius\Bundle\AdminBundle\Form\Extension\ProductTypeExtension">
-            <tag name="form.type_extension" />
+        <service id="sylius_admin.form.type.product" class="Sylius\Bundle\AdminBundle\Form\Type\ProductType">
+            <tag name="form.type" />
         </service>
 
         <service id="sylius_admin.form.type.product_associations" class="Sylius\Bundle\AdminBundle\Form\Type\ProductAssociationsType">

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig/component.xml
@@ -57,7 +57,7 @@
 
         <service id="Sylius\Bundle\AdminBundle\TwigComponent\Product\FormComponent">
             <argument type="service" id="form.factory" />
-            <argument>Sylius\Bundle\ProductBundle\Form\Type\ProductType</argument>
+            <argument>Sylius\Bundle\AdminBundle\Form\Type\ProductType</argument>
             <argument type="service" id="sylius.generator.slug" />
             <argument type="service" id="sylius.repository.product_attribute" />
             <argument type="service" id="sylius.factory.product" />