From 1e33b98e7a388b3e05b480b9f68936abca00c873 Mon Sep 17 00:00:00 2001 From: Niels Nijens Date: Wed, 11 May 2016 14:54:38 +0200 Subject: [PATCH 1/2] Add possibility to unset a file upload in UploadTrait --- Model/UploadTrait.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Model/UploadTrait.php b/Model/UploadTrait.php index 7b78c76..afd7422 100644 --- a/Model/UploadTrait.php +++ b/Model/UploadTrait.php @@ -53,7 +53,10 @@ public function setFileUpload(UploadedFile $file = null) { $propertyName = $this->getFileUploadPropertyName(); - $this->fileUploads[$propertyName] = $file; + unset($this->fileUploads[$propertyName]); + if ($file instanceof UploadedFile) { + $this->fileUploads[$propertyName] = $file; + } } /** From bedb46083acd01df61a4c32ec36049c3d6190ad0 Mon Sep 17 00:00:00 2001 From: Niels Nijens Date: Wed, 11 May 2016 14:56:38 +0200 Subject: [PATCH 2/2] Add unsetting of file uploads after being processed to ObjectUploadSubscriber --- EventListener/ObjectUploadSubscriber.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EventListener/ObjectUploadSubscriber.php b/EventListener/ObjectUploadSubscriber.php index 40c55d9..5352608 100644 --- a/EventListener/ObjectUploadSubscriber.php +++ b/EventListener/ObjectUploadSubscriber.php @@ -167,8 +167,11 @@ private function storeFileUploads(UploadObjectInterface $object) $fileFieldProperty = lcfirst($camelizedFieldName); if (isset($fileUploads[$fileFieldProperty])) { $getter = 'get'.$camelizedFieldName; + $setter = 'set'.$camelizedFieldName.'Upload'; $fileUploads[$fileFieldProperty]->move($this->getFilePath($objectName, $fileFieldConfiguration['name']), $object->$getter()); + + $object->$setter(null); } } }