Allow installing the plugin on Sylius >= 2.0.0 and < 3, and fix issue with ux_live_component route

.github/workflows/recipe.yaml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.2', '8.3']
-        sylius: ["~2.0.0"]
+        sylius: ["~2.0.0", "~2.1.0"]
 
     steps:
       - name: Setup PHP

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=2.0.0
+SYLIUS_VERSION=2.1.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console

README.md

@@ -17,7 +17,7 @@ This plugin adds a rich editor on the fields you want. Now you can manage your c
 
 | Sylius Version | PHP Version     |
 |----------------|-----------------|
-| 2.0            | 8.1 - 8.2       |
+| 2.0, 2.1       | 8.1 - 8.2       |
 
 ℹ️ For Sylius 1.x, see our branch [branch 2.x] (https://github.com/monsieurbiz/SyliusRichEditorPlugin/tree/2.0) and all 2.x releases.
 

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "~2.0.0",
+        "sylius/sylius": "~2.0",
         "twig/markdown-extra": "^3.13",
         "twig/extra-bundle": "^3.13",
         "league/commonmark": "^2.6"

src/Resources/config/services.yaml

@@ -62,3 +62,8 @@ services:
     # Maker
     MonsieurBiz\SyliusRichEditorPlugin\Maker\UiElementMaker:
         tags: ['maker.command']
+
+    MonsieurBiz\SyliusRichEditorPlugin\Twig\Components\UiElementForm:
+        autoconfigure: false
+        tags:
+            - { name: 'sylius.live_component.admin', key: 'SyliusAdmin:MonsieurBizUiElement:Form', template: '@MonsieurBizSyliusRichEditorPlugin/Admin/formContainer.html.twig' }

src/Twig/Components/UiElementForm.php

@@ -14,10 +14,9 @@
 namespace MonsieurBiz\SyliusRichEditorPlugin\Twig\Components;
 
 use RuntimeException;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveProp;
@@ -26,8 +25,7 @@
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 use Symfony\UX\LiveComponent\LiveCollectionTrait;
 
-#[AsLiveComponent(name: 'SyliusAdmin:MonsieurBizUiElement:Form', template: '@MonsieurBizSyliusRichEditorPlugin/Admin/formContainer.html.twig')]
-class UiElementForm extends AbstractController
+class UiElementForm
 {
     use ComponentToolsTrait;
     use ComponentWithFormTrait;
@@ -52,6 +50,11 @@ class UiElementForm extends AbstractController
     #[LiveProp]
     public ?string $locale = null;
 
+    public function __construct(
+        protected readonly FormFactoryInterface $formFactory,
+    ) {
+    }
+
     #[LiveAction]
     public function addCollectionItem(PropertyAccessorInterface $propertyAccessor, #[LiveArg] string $name): void
     {
@@ -68,7 +71,7 @@ public function removeCollectionItem(PropertyAccessorInterface $propertyAccessor
 
     protected function instantiateForm(): FormInterface
     {
-        return $this->createForm(
+        return $this->formFactory->create(
             $this->uiElementFormClass ?? throw new RuntimeException('Ui Element form class is not defined'),
             $this->data,
         );