Merge 4.x into 5.x

composer.json

@@ -85,7 +85,7 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^0.18",
-        "sonata-project/admin-bundle": "^4.9",
+        "sonata-project/admin-bundle": "^4.28",
         "sonata-project/block-bundle": "^4.11 || ^5.0",
         "sonata-project/classification-bundle": "^4.0",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",

src/Controller/GalleryAdminController.php

@@ -56,7 +56,7 @@ public function listAction(Request $request): Response
             $exportFormats = $exporter->getAvailableFormats($this->admin);
         }
 
-        return $this->renderWithExtraParams($this->admin->getTemplateRegistry()->getTemplate('list'), [
+        return $this->render($this->admin->getTemplateRegistry()->getTemplate('list'), [
             'action' => 'list',
             'form' => $formView,
             'datagrid' => $datagrid,

src/Controller/MediaAdminController.php

@@ -44,7 +44,7 @@ public function createAction(Request $request): Response
             $pool = $this->container->get('sonata.media.pool');
             \assert($pool instanceof Pool);
 
-            return $this->renderWithExtraParams('@SonataMedia/MediaAdmin/select_provider.html.twig', [
+            return $this->render('@SonataMedia/MediaAdmin/select_provider.html.twig', [
                 'providers' => $pool->getProvidersByContext(
                     $request->query->get('context', $pool->getDefaultContext())
                 ),
@@ -128,7 +128,7 @@ public function listAction(Request $request): Response
             $exportFormats = $exporter->getAvailableFormats($this->admin);
         }
 
-        return $this->renderWithExtraParams($this->admin->getTemplateRegistry()->getTemplate('list'), [
+        return $this->render($this->admin->getTemplateRegistry()->getTemplate('list'), [
             'action' => 'list',
             'form' => $formView,
             'datagrid' => $datagrid,

src/Model/Media.php

@@ -41,7 +41,7 @@ abstract class Media implements MediaInterface, \Stringable
 
     protected ?int $height = null;
 
-    protected ?float $length = null;
+    protected ?string $length = null;
 
     protected ?string $copyright = null;
 
@@ -184,12 +184,12 @@ public function getHeight(): ?int
 
     public function setLength(?float $length): void
     {
-        $this->length = $length;
+        $this->length = null !== $length ? (string) $length : null;
     }
 
     public function getLength(): ?float
     {
-        return $this->length;
+        return null !== $this->length ? (float) $this->length : null;
     }
 
     public function setCopyright(?string $copyright): void

src/Provider/ImageProvider.php

@@ -107,7 +107,7 @@ public function getHelperProperties(MediaInterface $media, string $format, array
             }
 
             unset($options['picture']);
-            $pictureParams['img'] = $params + $options;
+            $pictureParams['img'] = array_merge($params, $options);
             $params = ['picture' => $pictureParams];
         } elseif (MediaProviderInterface::FORMAT_ADMIN !== $format) {
             $srcSetFormats = $this->getFormats();