Merge 4.x into 5.x

sonata-project · Nov 19, 2021 · 652d1f5 · 652d1f5
2 parents bc4a12b + bc4c763
commit 652d1f5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/src/Block/GalleryBlockService.php b/src/Block/GalleryBlockService.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Twig\Environment;
@@ -44,19 +45,19 @@ final class GalleryBlockService extends AbstractBlockService implements Editable
     private Pool $pool;
 
     /**
-     * @var AdminInterface<GalleryInterface>
+     * @var AdminInterface<GalleryInterface>|null
      */
-    private AdminInterface $galleryAdmin;
+    private ?AdminInterface $galleryAdmin;
 
     private GalleryManagerInterface $galleryManager;
 
     /**
-     * @param AdminInterface<GalleryInterface> $galleryAdmin
+     * @param AdminInterface<GalleryInterface>|null $galleryAdmin
      */
     public function __construct(
         Environment $twig,
         Pool $pool,
-        AdminInterface $galleryAdmin,
+        ?AdminInterface $galleryAdmin,
         GalleryManagerInterface $galleryManager
     ) {
         parent::__construct($twig);
@@ -107,18 +108,6 @@ public function configureEditForm(FormMapper $form, BlockInterface $block): void
             }
         }
 
-        $fieldDescription = $this->galleryAdmin->createFieldDescription('media', [
-            'translation_domain' => 'SonataMediaBundle',
-            'edit' => 'list',
-        ]);
-
-        $builder = $form->create('galleryId', ModelListType::class, [
-            'sonata_field_description' => $fieldDescription,
-            'class' => $this->galleryAdmin->getClass(),
-            'model_manager' => $this->galleryAdmin->getModelManager(),
-            'label' => 'form.label_gallery',
-        ]);
-
         $form->add('settings', ImmutableArrayType::class, [
             'keys' => [
                 ['title', TextType::class, [
@@ -147,7 +136,7 @@ public function configureEditForm(FormMapper $form, BlockInterface $block): void
                     'choices' => $formatChoices,
                     'label' => 'form.label_format',
                 ]],
-                [$builder, null, []],
+                [$this->getGalleryBuilder($form), null, []],
                 ['pauseTime', NumberType::class, [
                     'label' => 'form.label_pause_time',
                 ]],
@@ -207,6 +196,25 @@ public function validate(ErrorElement $errorElement, BlockInterface $block): voi
     {
     }
 
+    private function getGalleryBuilder(FormMapper $form): FormBuilderInterface
+    {
+        if (null === $this->galleryAdmin) {
+            throw new \LogicException('The SonataAdminBundle is required to render the edit form.');
+        }
+
+        $fieldDescription = $this->galleryAdmin->createFieldDescription('gallery', [
+            'translation_domain' => 'SonataMediaBundle',
+            'edit' => 'list',
+        ]);
+
+        return $form->create('galleryId', ModelListType::class, [
+            'sonata_field_description' => $fieldDescription,
+            'class' => $this->galleryAdmin->getClass(),
+            'model_manager' => $this->galleryAdmin->getModelManager(),
+            'label' => 'form.label_gallery',
+        ]);
+    }
+
     /**
      * @return array<string, MediaInterface|string|null>
      *

diff --git a/src/Resources/config/block.php b/src/Resources/config/block.php
@@ -45,7 +45,7 @@
             ->args([
                 new ReferenceConfigurator('twig'),
                 new ReferenceConfigurator('sonata.media.pool'),
-                new ReferenceConfigurator('sonata.media.admin.gallery'),
+                (new ReferenceConfigurator('sonata.media.admin.gallery'))->nullOnInvalid(),
                 new ReferenceConfigurator('sonata.media.manager.gallery'),
             ])
 

diff --git a/tests/Block/GalleryBlockServiceTest.php b/tests/Block/GalleryBlockServiceTest.php
@@ -14,6 +14,7 @@
 namespace Sonata\MediaBundle\Tests\Block;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\MockObject\Stub;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Model\Block;
@@ -31,10 +32,13 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        /** @var AdminInterface<GalleryInterface>&Stub $galleryAdmin */
+        $galleryAdmin = $this->createStub(AdminInterface::class);
+
         $this->blockService = new GalleryBlockService(
             $this->twig,
             new Pool('default'),
-            $this->createStub(AdminInterface::class),
+            $galleryAdmin,
             $this->createStub(GalleryManagerInterface::class)
         );
     }