Remove PageFormMapper

sonata-project · Aug 12, 2022 · f2e516e · f2e516e
1 parent 28f87f0
commit f2e516e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 84 deletions.
diff --git a/src/Admin/BlockAdmin.php b/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'])) {

diff --git a/src/Admin/SharedBlockAdmin.php b/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);
         }
     }
 }
diff --git a/src/Mapper/PageFormMapper.php b/src/Mapper/PageFormMapper.php
diff --git a/tests/Block/ContainerBlockServiceTest.php b/tests/Block/ContainerBlockServiceTest.php
@@ -66,7 +66,7 @@ public function testFormBuilder(): void
         $service = new ContainerBlockService($baseContainerBlockService);
 
         $form = $this->createMock(FormMapper::class);
-        $form->expects(static::exactly(3))->method('add');
+        $form->expects(static::exactly(2))->method('add');
 
         $service->configureCreateForm($form, $block);
     }