[framework] FileUpload: set position for the new images only (#3381)

shopsys · Aug 29, 2024 · a4403d1 · a4403d1
1 parent 7b2c8e2
commit a4403d1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Component/FileUpload/EntityFileUploadInterface.php b/src/Component/FileUpload/EntityFileUploadInterface.php
@@ -23,7 +23,7 @@ public function setFileAsUploaded(string $key, string $originalFilename): void;
     public function setFileKeyAsUploaded(string $key): void;
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getId();
 }
diff --git a/src/Component/FileUpload/FileUpload.php b/src/Component/FileUpload/FileUpload.php
@@ -177,7 +177,7 @@ public function preFlushEntity(EntityFileUploadInterface $entity)
             $entity->setFileAsUploaded($key, $originalFilename);
         }
 
-        if ($entity instanceof Image && $entity->getPosition() === Image::DEFAULT_IMAGE_POSITION) {
+        if ($entity instanceof Image && $entity->getId() === null) {
             $entity->setPosition($this->getPositionForNewEntity($entity));
         }
     }

diff --git a/src/Component/Image/Image.php b/src/Component/Image/Image.php
@@ -26,7 +26,7 @@ class Image extends AbstractTranslatableEntity implements EntityFileUploadInterf
     public const int DEFAULT_IMAGE_POSITION = 0;
 
     /**
-     * @var int
+     * @var int|null
      * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
@@ -226,7 +226,7 @@ public function getFilename(): string
     }
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getId()
     {

diff --git a/src/Component/UploadedFile/UploadedFile.php b/src/Component/UploadedFile/UploadedFile.php
@@ -147,7 +147,7 @@ public function getFilename(): string
     }
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getId()
     {