Add more CRUD form tests

composer.json

@@ -54,6 +54,7 @@
         "dama/doctrine-test-bundle": "^6.7",
         "doctrine/annotations": "^1.13.3",
         "friendsofphp/php-cs-fixer": "^3.4",
+        "masterminds/html5": "^2.7",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.1",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.0",

src/Admin/BlockAdmin.php

@@ -22,7 +22,6 @@
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
 use Sonata\BlockBundle\Form\Type\ServiceListType;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\PageBundle\Mapper\PageFormMapper;
 use Sonata\PageBundle\Model\PageBlockInterface;
 use Sonata\PageBundle\Model\PageInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -232,12 +231,10 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
             ));
         }
 
-        $blockMapper = new PageFormMapper($form);
-
         if ($block->getId() > 0) {
-            $service->configureEditForm($blockMapper, $block);
+            $service->configureEditForm($form, $block);
         } else {
-            $service->configureCreateForm($blockMapper, $block);
+            $service->configureCreateForm($form, $block);
         }
 
         if ($form->has('settings') && isset($this->blocks[$blockType]['templates'])) {

src/Admin/SharedBlockAdmin.php

@@ -19,7 +19,6 @@
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
-use Sonata\PageBundle\Mapper\PageFormMapper;
 use Sonata\PageBundle\Model\PageBlockInterface;
 
 /**
@@ -103,12 +102,10 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
             ));
         }
 
-        $blockMapper = new PageFormMapper($form);
-
         if ($block->getId() > 0) {
-            $service->configureEditForm($blockMapper, $block);
+            $service->configureEditForm($form, $block);
         } else {
-            $service->configureCreateForm($blockMapper, $block);
+            $service->configureCreateForm($form, $block);
         }
     }
 }

src/Block/ChildrenPagesBlockService.php

@@ -170,20 +170,6 @@ public function configureSettings(OptionsResolver $resolver): void
         ]);
     }
 
-    public function prePersist(BlockInterface $block): void
-    {
-        $page = $block->getSetting('pageId');
-
-        $block->setSetting('pageId', $page instanceof PageInterface ? $page->getId() : null);
-    }
-
-    public function preUpdate(BlockInterface $block): void
-    {
-        $page = $block->getSetting('pageId');
-
-        $block->setSetting('pageId', $page instanceof PageInterface ? $page->getId() : null);
-    }
-
     public function load(BlockInterface $block): void
     {
         if (!$block instanceof PageBlockInterface) {

src/Block/SharedBlockBlockService.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Block;
 
-use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Form\FormMapper as AdminFormMapper;
 use Sonata\AdminBundle\Form\Type\ModelListType;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
@@ -42,24 +42,16 @@ final class SharedBlockBlockService extends AbstractBlockService implements Edit
      */
     private ManagerInterface $blockManager;
 
-    /**
-     * @var AdminInterface<PageBlockInterface>
-     */
-    private AdminInterface $sharedBlockAdmin;
-
     /**
      * @param ManagerInterface<PageBlockInterface> $blockManager
-     * @param AdminInterface<PageBlockInterface>   $sharedBlockAdmin
      */
     public function __construct(
         Environment $twig,
-        ManagerInterface $blockManager,
-        AdminInterface $sharedBlockAdmin
+        ManagerInterface $blockManager
     ) {
         parent::__construct($twig);
 
         $this->blockManager = $blockManager;
-        $this->sharedBlockAdmin = $sharedBlockAdmin;
     }
 
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
@@ -76,10 +68,10 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
         \assert(null !== $template);
 
         return $this->renderResponse($template, [
-                'block' => $blockContext->getBlock(),
-                'settings' => $blockContext->getSettings(),
-                'sharedBlock' => $sharedBlock,
-            ], $response);
+            'block' => $blockContext->getBlock(),
+            'settings' => $blockContext->getSettings(),
+            'sharedBlock' => $sharedBlock,
+        ], $response);
     }
 
     public function validate(ErrorElement $errorElement, BlockInterface $block): void
@@ -92,13 +84,17 @@ public function validate(ErrorElement $errorElement, BlockInterface $block): voi
 
     public function configureEditForm(FormMapper $form, BlockInterface $block): void
     {
+        if (!$form instanceof AdminFormMapper) {
+            throw new \InvalidArgumentException('Shared Block requires to be used in the Admin context');
+        }
+
         if (!$block->getSetting('blockId') instanceof BlockInterface) {
             $this->load($block);
         }
 
         $form->add('settings', ImmutableArrayType::class, [
             'keys' => [
-                [$this->getBlockBuilder(), null, []],
+                [$this->getBlockBuilder($form), null, []],
             ],
         ]);
     }
@@ -134,31 +130,23 @@ public function load(BlockInterface $block): void
         $block->setSetting('blockId', $sharedBlock);
     }
 
-    public function prePersist(BlockInterface $block): void
-    {
-        $block = $block->getSetting('blockId');
-
-        $block->setSetting('blockId', $block instanceof BlockInterface ? $block->getId() : null);
-    }
-
-    public function preUpdate(BlockInterface $block): void
+    /**
+     * @param AdminFormMapper<object> $form
+     */
+    private function getBlockBuilder(AdminFormMapper $form): FormBuilderInterface
     {
-        $block = $block->getSetting('blockId');
+        $admin = $form->getAdmin();
 
-        $block->setSetting('blockId', $block instanceof BlockInterface ? $block->getId() : null);
-    }
-
-    private function getBlockBuilder(): FormBuilderInterface
-    {
-        $fieldDescription = $this->sharedBlockAdmin->createFieldDescription('block', [
+        $fieldDescription = $admin->createFieldDescription('block', [
             'translation_domain' => 'SonataPageBundle',
             'edit' => 'list',
         ]);
+        $fieldDescription->setAssociationAdmin($admin);
 
-        return $this->sharedBlockAdmin->getFormBuilder()->create('blockId', ModelListType::class, [
+        return $form->getFormBuilder()->create('blockId', ModelListType::class, [
             'sonata_field_description' => $fieldDescription,
-            'class' => $this->sharedBlockAdmin->getClass(),
-            'model_manager' => $this->sharedBlockAdmin->getModelManager(),
+            'class' => $admin->getClass(),
+            'model_manager' => $admin->getModelManager(),
             'label' => 'form.label_block',
             'required' => false,
         ]);

src/Resources/config/block.php

@@ -53,7 +53,6 @@
             ->args([
                 new ReferenceConfigurator('twig'),
                 new ReferenceConfigurator('sonata.page.manager.block'),
-                new ReferenceConfigurator('sonata.page.admin.shared_block'),
             ])
 
         ->set('sonata.page.block.pagelist', PageListBlockService::class)