FormFieldHandler must return Value object

Author: MarioBlazek

bundle/Form/FieldTypeHandler/EnhancedFile.php

@@ -7,6 +7,7 @@
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\SPI\FieldType\Value;
 use Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler;
+use Netgen\Bundle\EnhancedBinaryFileBundle\Core\FieldType\EnhancedBinaryFile\Value as EnhancedFileValue;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Validator\Constraints;
@@ -43,11 +44,13 @@ public function convertFieldValueFromForm($data)
             return null;
         }
 
-        return array(
-            'inputUri' => $data->getFileInfo()->getRealPath(),
-            'fileName' => $data->getClientOriginalName(),
-            'fileSize' => $data->getSize(),
-            'mimeType' => $data->getClientMimeType(),
+        return new EnhancedFileValue(
+            [
+                'path' => $data->getFileInfo()->getRealPath(),
+                'fileName' => $data->getClientOriginalName(),
+                'fileSize' => $data->getSize(),
+                'mimeType' => $data->getClientMimeType(),
+            ]
         );
     }
 

tests/Form/FieldTypeHandler/EnhancedFileTest.php

@@ -50,11 +50,11 @@ public function testConvertFieldValueFromFormWithFile()
         $file->getClientMimeType();
         $result = $this->handler->convertFieldValueFromForm($file);
 
-        $this->assertInternalType('array', $result);
-        $this->assertEquals($file->getFileInfo()->getRealPath(), $result['inputUri']);
-        $this->assertEquals($file->getClientOriginalName(), $result['fileName']);
-        $this->assertEquals($file->getSize(), $result['fileSize']);
-        $this->assertEquals($file->getClientMimeType(), $result['mimeType']);
+        $this->assertInstanceOf(Value::class, $result);
+        $this->assertEquals($file->getFileInfo()->getRealPath(), $result->inputUri);
+        $this->assertEquals($file->getClientOriginalName(), $result->fileName);
+        $this->assertEquals($file->getSize(), $result->fileSize);
+        $this->assertEquals($file->getClientMimeType(), $result->mimeType);
     }
 
     public function testBuildFieldCreateForm()