Merge pull request #132 from michaelzangerle/fix-media-adapter

Fix media creation in ImageMediaAdapter
sulu · Dec 11, 2023 · 1875720 · 1875720
2 parents 30c5582 + f6f5cf1
commit 1875720
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,6 @@ Tests/Application/var
 # npm
 Resources/js/package-lock.json
 Resources/js/node_modules
+
+# IDE
+./.idea
diff --git a/Adapter/ImageMediaAdapter.php b/Adapter/ImageMediaAdapter.php
@@ -20,6 +20,7 @@
 use Sulu\Bundle\MediaBundle\Entity\FileVersionMeta;
 use Sulu\Bundle\MediaBundle\Entity\Media;
 use Sulu\Bundle\MediaBundle\Entity\MediaInterface;
+use Sulu\Bundle\MediaBundle\Entity\MediaRepositoryInterface;
 use Sulu\Bundle\MediaBundle\Entity\MediaType;
 use Sulu\Bundle\MediaBundle\Media\Storage\StorageInterface;
 use Sulu\Bundle\SyliusConsumerBundle\Payload\ImagePayload;
@@ -63,20 +64,35 @@ class ImageMediaAdapter implements ImageAdapterInterface
      */
     private $syliusImageDownloader;
 
+    /**
+     * @var MediaRepositoryInterface|null
+     */
+    private $mediaRepository;
+
     public function __construct(
         ImageMediaBridgeRepositoryInterface $mediaBridgeRepository,
         EntityManagerInterface $entityManager,
         StorageInterface $storage,
         SystemCollectionManagerInterface $systemCollectionManager,
         SyliusImageDownloaderInterface $syliusImageDownloader,
-        string $collectionKey
+        string $collectionKey,
+        ?MediaRepositoryInterface $mediaRepository = null
     ) {
         $this->mediaBridgeRepository = $mediaBridgeRepository;
         $this->entityManager = $entityManager;
         $this->storage = $storage;
         $this->systemCollectionManager = $systemCollectionManager;
         $this->collectionKey = $collectionKey;
         $this->syliusImageDownloader = $syliusImageDownloader;
+        $this->mediaRepository = $mediaRepository;
+
+        if (null === $mediaRepository) {
+            @trigger_deprecation(
+                'sulu/sylius-consumer-bundle',
+                '0.5',
+                'Omitting the "mediaRepository" argument is deprecated and will not longer work in SuluSyliusConsumerBundle 1.0.'
+            );
+        }
     }
 
     public function synchronize(ImagePayload $payload): void
@@ -103,7 +119,7 @@ private function handlePayload(ImagePayload $payload): void
     {
         $bridge = $this->mediaBridgeRepository->findById($payload->getId());
         if (!$bridge) {
-            $media = new Media();
+            $media = $this->mediaRepository ? $this->mediaRepository->createNew() : new Media();
             $bridge = $this->mediaBridgeRepository->create($payload->getId(), $media);
         }
 

diff --git a/Resources/config/image_media_adapter.xml b/Resources/config/image_media_adapter.xml
@@ -12,6 +12,7 @@
             <argument type="service" id="sulu_media.system_collections.manager"/>
             <argument type="service" id="Sulu\Bundle\SyliusConsumerBundle\Service\SyliusImageDownloaderInterface"/>
             <argument>%sulu_sylius_consumer.media_collection.key%</argument>
+            <argument type="service" id="sulu.repository.media" />
 
             <tag name="sulu_sylius_consumer.adapter.image" priority="1024"/>
         </service>
@@ -23,4 +24,4 @@
             <argument>%sulu_sylius_consumer.sylius_base_url%</argument>
         </service>
     </services>
-</container>
+</container>