Validating the field value in afterDelete

Author: andrade-leonardo

src/Model/Behavior/UploadBehavior.php

@@ -163,7 +163,7 @@ public function afterDelete(EventInterface $event, EntityInterface $entity, Arra
         $result = true;
 
         foreach ($this->getConfig(null, []) as $field => $settings) {
-            if (in_array($field, $this->protectedFieldNames) || Hash::get($settings, 'keepFilesOnDelete', true)) {
+            if (in_array($field, $this->protectedFieldNames) || Hash::get($settings, 'keepFilesOnDelete', true) || $entity->get($field) === null) {
                 continue;
             }
 

tests/TestCase/Model/Behavior/UploadBehaviorTest.php

@@ -524,7 +524,7 @@ public function testAfterDeleteUsesPathProcessorToDetectPathToTheFile()
             ->with('dir')
             ->will($this->returnValue(false));
 
-        $this->entity->expects($this->exactly(2))
+        $this->entity->expects($this->exactly(3))
             ->method('get')
             ->with('field')
             ->will($this->returnValue($field));
@@ -601,7 +601,7 @@ public function testAfterDeleteNoDeleteCallback()
         $this->configOk['field']['deleteCallback'] = null;
 
         $behavior->setConfig($this->configOk);
-        $this->entity->expects($this->exactly(2))
+        $this->entity->expects($this->exactly(3))
             ->method('get')
             ->with('field')
             ->will($this->returnValue($field));
@@ -642,7 +642,7 @@ public function testAfterDeleteUsesDeleteCallback()
         };
 
         $behavior->setConfig($this->configOk);
-        $this->entity->expects($this->exactly(4))
+        $this->entity->expects($this->exactly(5))
             ->method('get')
             ->with('field')
             ->will($this->returnValue($field));
@@ -687,6 +687,26 @@ public function testAfterDeleteWithProtectedFieldName()
         $this->assertTrue($behavior->afterDelete(new Event('fake.event'), $this->entity, new ArrayObject()));
     }
 
+    public function testAfterDeleteWithNullableFileField()
+    {
+        $methods = array_diff($this->behaviorMethods, ['afterDelete', 'config', 'setConfig', 'getConfig']);
+        $behavior = $this->getMockBuilder('Josegonzalez\Upload\Model\Behavior\UploadBehavior')
+            ->onlyMethods($methods)
+            ->setConstructorArgs([$this->table, $this->settings])
+            ->getMock();
+        $behavior->setConfig($this->configOk);
+
+        $this->entity->expects($this->once())
+            ->method('get')
+            ->with('field')
+            ->will($this->returnValue(null));
+
+        $behavior->expects($this->never())
+            ->method('getPathProcessor');
+
+        $behavior->afterDelete(new Event('fake.event'), $this->entity, new ArrayObject());
+    }
+
     public function testGetWriter()
     {
         $processor = $this->behavior->getWriter($this->entity, new UploadedFile(fopen('php://temp', 'rw+'), 1, UPLOAD_ERR_OK, 'file.txt'), 'field', []);
@@ -783,12 +803,6 @@ public function testGetPathProcessor()
         $this->assertInstanceOf('Josegonzalez\Upload\File\Path\ProcessorInterface', $processor);
     }
 
-    public function testGetPathProcessorWithNoFile()
-    {
-        $processor = $this->behavior->getPathProcessor($this->entity, null, 'field', []);
-        $this->assertInstanceOf('Josegonzalez\Upload\File\Path\ProcessorInterface', $processor);
-    }
-
     public function testNameCallback()
     {
         $table = $this->getTableLocator()->get('Files');