Merge pull request #1500 from laurentmuller/master

Updated the PropertyMapping to accept array for the getUploadDir() function.

Author: laurentmuller

src/Mapping/PropertyMapping.php

@@ -288,7 +288,7 @@ public function getUploadName(object $obj): string
      *
      * @return string|null The upload directory
      */
-    public function getUploadDir(object $obj): ?string
+    public function getUploadDir(object|array $obj): ?string
     {
         if (!$this->hasDirectoryNamer()) {
             return '';

tests/Mapping/PropertyMappingTest.php

@@ -6,6 +6,7 @@
 use Vich\TestBundle\Entity\Article;
 use Vich\TestBundle\Naming\DummyNamer;
 use Vich\UploaderBundle\Mapping\PropertyMapping;
+use Vich\UploaderBundle\Naming\ConfigurableDirectoryNamer;
 use Vich\UploaderBundle\Naming\DirectoryNamerInterface;
 use Vich\UploaderBundle\Naming\NamerInterface;
 use Vich\UploaderBundle\Tests\DummyEntity;
@@ -157,4 +158,22 @@ public function testErase(): void
         self::assertNull($object->getMimeTypeField());
         self::assertNull($object->getSizeField());
     }
+
+    public function testWithArray(): void
+    {
+        $prop = new PropertyMapping(
+            'image',
+            'imageName',
+        );
+
+        $directoryNamer = new ConfigurableDirectoryNamer();
+        $directoryNamer->configure([
+            'directory_path' => 'fake',
+        ]);
+        $prop->setDirectoryNamer($directoryNamer);
+
+        $object = [];
+        $actual = $prop->getUploadDir($object);
+        self::assertEquals('fake', $actual);
+    }
 }