Remove values for each file-related property on remove

dustin10 · May 6, 2017 · 68eab14 · 68eab14
1 parent 9fdcc61
commit 68eab14
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 9 deletions.
diff --git a/Handler/UploadHandler.php b/Handler/UploadHandler.php
@@ -103,7 +103,7 @@ public function remove($obj, $fieldName)
         $this->dispatch(Events::PRE_REMOVE, new Event($obj, $mapping));
 
         $this->storage->remove($obj, $mapping);
-        $mapping->setFileName($obj, null);
+        $mapping->erase($obj);
 
         $this->dispatch(Events::POST_REMOVE, new Event($obj, $mapping));
     }

diff --git a/Mapping/PropertyMapping.php b/Mapping/PropertyMapping.php
@@ -110,6 +110,18 @@ public function setFileName($obj, $value)
         $this->writeProperty($obj, 'name', $value);
     }
 
+    /**
+     * Removes value for each file-related property of the given object.
+     *
+     * @param object $obj The object
+     */
+    public function erase($obj)
+    {
+        foreach (['name', 'size', 'mimeType', 'originalName'] as $property) {
+            $this->writeProperty($obj, $property, null);
+        }
+    }
+
     /**
      * Reads property of the given object.
      *

diff --git a/Tests/Handler/UploadHandlerTest.php b/Tests/Handler/UploadHandlerTest.php
@@ -2,10 +2,10 @@
 
 namespace Vich\UploaderBundle\Tests\Handler;
 
+use Vich\TestBundle\Entity\Article;
 use Vich\UploaderBundle\Event\Event;
 use Vich\UploaderBundle\Event\Events;
 use Vich\UploaderBundle\Handler\UploadHandler;
-use Vich\UploaderBundle\Tests\DummyEntity;
 use Vich\UploaderBundle\Tests\TestCase;
 
 /**
@@ -18,10 +18,13 @@ class UploadHandlerTest extends TestCase
     protected $injector;
     protected $dispatcher;
     protected $mapping;
+    /**
+     * @var Article
+     */
     protected $object;
     protected $handler;
 
-    const FILE_FIELD = 'file_field';
+    const FILE_FIELD = 'image';
 
     public function setUp()
     {
@@ -30,7 +33,7 @@ public function setUp()
         $this->injector = $this->getInjectorMock();
         $this->dispatcher = $this->getDispatcherMock();
         $this->mapping = $this->getPropertyMappingMock();
-        $this->object = new DummyEntity();
+        $this->object = new Article();
 
         $this->handler = new UploadHandler($this->factory, $this->storage, $this->injector, $this->dispatcher);
         $this->factory
@@ -167,6 +170,12 @@ public function testRemove()
             ->with($this->object)
             ->will($this->returnValue('something not null'));
 
+        $this->mapping
+            ->expects($this->once())
+            ->method('erase')
+            ->with($this->object)
+            ->will($this->returnValue(null));
+
         $this->storage
             ->expects($this->once())
             ->method('remove')

diff --git a/Tests/Mapping/PropertyMappingTest.php b/Tests/Mapping/PropertyMappingTest.php
@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Mapping;
 
+use Vich\TestBundle\Entity\Article;
 use Vich\UploaderBundle\Mapping\PropertyMapping;
 use Vich\UploaderBundle\Naming\NamerInterface;
 use Vich\UploaderBundle\Tests\DummyEntity;
@@ -181,4 +182,29 @@ public function directoryProvider()
             ['other_dir\\sub_dir\\', 'other_dir\\sub_dir'],
         ];
     }
+
+    public function testErase()
+    {
+        $object = new Article();
+
+        $object->setImageName('generated.jpeg');
+        $object->setOriginalNameField('original.jpeg');
+        $object->setMimeTypeField('image/jpeg');
+        $object->setSizeField(100);
+
+        $prop = new PropertyMapping(
+            'imageName', 'image', [
+                'size' => 'sizeField',
+                'mimeType' => 'mimeTypeField',
+                'originalName' => 'originalNameField',
+            ]
+        );
+
+        $prop->erase($object);
+
+        $this->assertNull($object->getImageName());
+        $this->assertNull($object->getOriginalNameField());
+        $this->assertNull($object->getMimeTypeField());
+        $this->assertNull($object->getSizeField());
+    }
 }
diff --git a/Tests/TestCase.php b/Tests/TestCase.php
@@ -3,14 +3,18 @@
 namespace Vich\UploaderBundle\Tests;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Vich\UploaderBundle\Mapping\PropertyMapping;
 use Vich\UploaderBundle\Mapping\PropertyMappingFactory;
 
 class TestCase extends BaseTestCase
 {
+    /**
+     * @return UploadedFile
+     */
     protected function getUploadedFileMock()
     {
-        return $this->getMockBuilder('Symfony\Component\HttpFoundation\File\UploadedFile')
+        return $this->getMockBuilder(UploadedFile::class)
             ->setConstructorArgs(['lala', 'lala', $mimeType = null, $size = null, $error = 'other than UPLOAD_ERR_OK', $test = true])
             ->getMock();
     }
@@ -20,19 +24,17 @@ protected function getUploadedFileMock()
      */
     protected function getPropertyMappingMock()
     {
-        return $this->getMockBuilder('Vich\UploaderBundle\Mapping\PropertyMapping')
+        return $this->getMockBuilder(PropertyMapping::class)
             ->disableOriginalConstructor()
             ->getMock();
     }
 
     /**
-     * Creates a mock property mapping factory.
-     *
      * @return PropertyMappingFactory
      */
     protected function getPropertyMappingFactoryMock()
     {
-        return $this->getMockBuilder('Vich\UploaderBundle\Mapping\PropertyMappingFactory')
+        return $this->getMockBuilder(PropertyMappingFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
     }