revert

sonata-project · Jul 22, 2022 · f561bf5 · f561bf5
1 parent 0f2d03d
commit f561bf5
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 114 deletions.
diff --git a/src/Admin/BlockAdmin.php b/src/Admin/BlockAdmin.php
@@ -148,9 +148,9 @@ protected function configureFormFields(FormMapper $form): void
                         return $repository->createQueryBuilder('a')
                             ->andWhere('a.page = :page AND a.type IN (:types)')
                             ->setParameters([
-                                'page' => $page,
-                                'types' => $containerBlockTypes,
-                            ]);
+                                    'page' => $page,
+                                    'types' => $containerBlockTypes,
+                                ]);
                     },
                 ], [
                     'admin_code' => $this->getCode(),

diff --git a/src/Block/BlockContextManager.php b/src/Block/BlockContextManager.php
@@ -14,25 +14,15 @@
 namespace Sonata\PageBundle\Block;
 
 use Sonata\BlockBundle\Block\BlockContextInterface;
-use Sonata\BlockBundle\Block\BlockContextManager as BaseBlockContextManager;
 use Sonata\BlockBundle\Block\BlockContextManagerInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class BlockContextManager implements BlockContextManagerInterface
 {
-    private BaseBlockContextManager $blockContextManager;
+    private BlockContextManagerInterface $blockContextManager;
 
-    private OptionsResolver $optionsResolver;
-
-    public function __construct(BaseBlockContextManager $blockContextManager)
+    public function __construct(BlockContextManagerInterface $blockContextManager)
     {
         $this->blockContextManager = $blockContextManager;
-        $this->optionsResolver = new OptionsResolver();
-    }
-
-    public function getOptionsResolver(): OptionsResolver
-    {
-        return $this->optionsResolver;
     }
 
     public function addSettingsByType(string $type, array $settings, bool $replace = false): void

diff --git a/src/Block/BreadcrumbBlockService.php b/src/Block/BreadcrumbBlockService.php
@@ -24,8 +24,6 @@
 use Twig\Environment;
 
 /**
- * BlockService for homepage breadcrumb.
- *
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>
  */
 final class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService
@@ -35,21 +33,19 @@ final class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService
      */
     private $cmsSelector;
 
-    public function __construct(Environment $twig, FactoryInterface $factory, CmsManagerSelectorInterface $cmsSelector)
-    {
+    public function __construct(
+        Environment $twig,
+        FactoryInterface $factory,
+        CmsManagerSelectorInterface $cmsSelector
+    ) {
         parent::__construct($twig, $factory);
 
         $this->cmsSelector = $cmsSelector;
     }
 
-    public function getName()
-    {
-        return 'sonata.page.block.breadcrumb';
-    }
-
-    public function getMetadata($code = null): MetadataInterface
+    public function getMetadata(): MetadataInterface
     {
-        return new Metadata($this->getName(), $code ?? $this->getName(), null, 'SonataPageBundle', [
+        return new Metadata($this->getName(), null, null, 'SonataPageBundle', [
             'class' => 'fa fa-bars',
         ]);
     }
@@ -88,9 +84,12 @@ protected function getMenu(BlockContextInterface $blockContext): ItemInterface
         return $menu;
     }
 
+    private function getName()
+    {
+        return 'sonata.page.block.breadcrumb';
+    }
+
     /**
-     * Return the current Page.
-     *
      * @return PageInterface|null
      */
     private function getCurrentPage()

diff --git a/src/Block/ChildrenPagesBlockService.php b/src/Block/ChildrenPagesBlockService.php
@@ -13,15 +13,21 @@
 
 namespace Sonata\PageBundle\Block;
 
-use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
+use Sonata\BlockBundle\Block\Service\EditableBlockService;
+use Sonata\BlockBundle\Form\Mapper\FormMapper;
+use Sonata\BlockBundle\Meta\Metadata;
+use Sonata\BlockBundle\Meta\MetadataInterface;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Sonata\PageBundle\CmsManager\CmsManagerSelectorInterface;
 use Sonata\PageBundle\Exception\PageNotFoundException;
 use Sonata\PageBundle\Form\Type\PageSelectorType;
 use Sonata\PageBundle\Model\PageBlockInterface;
+use Sonata\PageBundle\Model\PageInterface;
 use Sonata\PageBundle\Site\SiteSelectorInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -34,18 +40,28 @@
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  */
-final class ChildrenPagesBlockService extends AbstractBlockService
+final class ChildrenPagesBlockService extends AbstractBlockService implements EditableBlockService
 {
     private SiteSelectorInterface $siteSelector;
 
     private CmsManagerSelectorInterface $cmsManagerSelector;
 
-    public function __construct(Environment $twig, SiteSelectorInterface $siteSelector, CmsManagerSelectorInterface $cmsManagerSelector)
-    {
+    /**
+     * @var AdminInterface<PageInterface>
+     */
+    private AdminInterface $pageAdmin;
+
+    public function __construct(
+        Environment $twig,
+        SiteSelectorInterface $siteSelector,
+        CmsManagerSelectorInterface $cmsManagerSelector,
+        AdminInterface $pageAdmin
+    ) {
         parent::__construct($twig);
 
         $this->siteSelector = $siteSelector;
         $this->cmsManagerSelector = $cmsManagerSelector;
+        $this->pageAdmin = $pageAdmin;
     }
 
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
@@ -76,7 +92,14 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
         ], $response);
     }
 
-    public function buildEditForm(FormMapper $form, BlockInterface $block): void
+    public function getMetadata(): MetadataInterface
+    {
+        return new Metadata('Children Page (core)', null, null, 'SonataPageBundle', [
+            'class' => 'fa fa-home',
+        ]);
+    }
+
+    public function configureEditForm(FormMapper $form, BlockInterface $block): void
     {
         if (!$block instanceof PageBlockInterface) {
             return;
@@ -101,8 +124,8 @@ public function buildEditForm(FormMapper $form, BlockInterface $block): void
                   'label' => 'form.label_current',
                 ]],
                 ['pageId', PageSelectorType::class, [
-                    'model_manager' => $form->getAdmin()->getModelManager(),
-                    'class' => $form->getAdmin()->getClass(),
+                    'model_manager' => $this->pageAdmin->getModelManager(),
+                    'class' => $this->pageAdmin->getClass(),
                     'site' => $block->getPage()->getSite(),
                     'required' => false,
                     'label' => 'form.label_page',
@@ -116,9 +139,13 @@ public function buildEditForm(FormMapper $form, BlockInterface $block): void
         ]);
     }
 
-    public function getName(): string
+    public function configureCreateForm(FormMapper $form, BlockInterface $block): void
+    {
+        $this->configureEditForm($form, $block);
+    }
+
+    public function validate(ErrorElement $errorElement, BlockInterface $block): void
     {
-        return 'Children Page (core)';
     }
 
     public function configureSettings(OptionsResolver $resolver): void

diff --git a/src/Block/ContainerBlockService.php b/src/Block/ContainerBlockService.php
@@ -24,11 +24,8 @@
 use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Twig\Environment;
 
 /**
- * Render children pages.
- *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  */
 final class ContainerBlockService implements BlockServiceInterface, EditableBlockService
@@ -40,16 +37,6 @@ public function __construct(BaseContainerBlockService $containerBlockService)
         $this->containerBlockService = $containerBlockService;
     }
 
-    public function getName(): string
-    {
-        return 'sonata.page.block.container';
-    }
-
-    public function getTwig(): Environment
-    {
-        return $this->containerBlockService->getTwig();
-    }
-
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
     {
         return $this->containerBlockService->execute($blockContext, $response);
@@ -80,9 +67,9 @@ public function validate(ErrorElement $errorElement, BlockInterface $block): voi
         $this->containerBlockService->validate($errorElement, $block);
     }
 
-    public function getMetadata($code = null): MetadataInterface
+    public function getMetadata(): MetadataInterface
     {
-        return new Metadata($this->getName(), $code ?? $this->getName(), null, 'SonataPageBundle', [
+        return new Metadata('sonata.page.block.container', null, null, 'SonataPageBundle', [
             'class' => 'fa fa-square-o',
         ]);
     }

diff --git a/src/Block/PageListBlockService.php b/src/Block/PageListBlockService.php
@@ -13,7 +13,6 @@
 
 namespace Sonata\PageBundle\Block;
 
-use Sonata\AdminBundle\Form\FormMapper as AdminFormMapper;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
@@ -35,50 +34,15 @@ final class PageListBlockService extends AbstractBlockService implements Editabl
 {
     private PageManagerInterface $pageManager;
 
-    public function __construct(Environment $twig, PageManagerInterface $pageManager)
-    {
+    public function __construct(
+        Environment $twig,
+        PageManagerInterface $pageManager
+    ) {
         parent::__construct($twig);
 
         $this->pageManager = $pageManager;
     }
 
-    public function getName(): string
-    {
-        return 'sonata.page.block.pagelist';
-    }
-
-    public function buildEditForm(AdminFormMapper $form, BlockInterface $block): void
-    {
-        $form->add('settings', ImmutableArrayType::class, [
-            'keys' => [
-                ['title', TextType::class, [
-                    'label' => 'form.label_title',
-                    'required' => false,
-                ]],
-                ['translation_domain', TextType::class, [
-                    'label' => 'form.label_translation_domain',
-                    'required' => false,
-                ]],
-                ['icon', TextType::class, [
-                    'label' => 'form.label_icon',
-                    'required' => false,
-                ]],
-                ['class', TextType::class, [
-                    'label' => 'form.label_class',
-                    'required' => false,
-                ]],
-                ['mode', ChoiceType::class, [
-                    'label' => 'form.label_mode',
-                    'choices' => [
-                        'public' => 'form.choice_public',
-                        'admin' => 'form.choice_admin',
-                    ],
-                ]],
-            ],
-            'translation_domain' => 'SonataPageBundle',
-        ]);
-    }
-
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
     {
         $pageList = $this->pageManager->findBy([
@@ -111,15 +75,43 @@ public function configureSettings(OptionsResolver $resolver): void
         ]);
     }
 
-    public function getMetadata($code = null): MetadataInterface
+    public function getMetadata(): MetadataInterface
     {
-        return new Metadata($this->getName(), $code ?? $this->getName(), null, 'SonataPageBundle', [
+        return new Metadata('sonata.page.block.pagelist', null, null, 'SonataPageBundle', [
             'class' => 'fa fa-home',
         ]);
     }
 
     public function configureEditForm(FormMapper $form, BlockInterface $block): void
     {
+        $form->add('settings', ImmutableArrayType::class, [
+            'keys' => [
+                ['title', TextType::class, [
+                    'label' => 'form.label_title',
+                    'required' => false,
+                ]],
+                ['translation_domain', TextType::class, [
+                    'label' => 'form.label_translation_domain',
+                    'required' => false,
+                ]],
+                ['icon', TextType::class, [
+                    'label' => 'form.label_icon',
+                    'required' => false,
+                ]],
+                ['class', TextType::class, [
+                    'label' => 'form.label_class',
+                    'required' => false,
+                ]],
+                ['mode', ChoiceType::class, [
+                    'label' => 'form.label_mode',
+                    'choices' => [
+                        'public' => 'form.choice_public',
+                        'admin' => 'form.choice_admin',
+                    ],
+                ]],
+            ],
+            'translation_domain' => 'SonataPageBundle',
+        ]);
     }
 
     public function configureCreateForm(FormMapper $form, BlockInterface $block): void