Merge pull request #548 from FriendsOfCake/beforesave

Skip processing in beforeSave() if value is not instance of UploadedFileInterface
FriendsOfCake · Oct 27, 2020 · ec02c87 · ec02c87
2 parents 2b0e781 + 7fc65ea
commit ec02c87
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Model/Behavior/UploadBehavior.php b/src/Model/Behavior/UploadBehavior.php
@@ -95,11 +95,15 @@ public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObj
     public function beforeSave(EventInterface $event, EntityInterface $entity, ArrayObject $options)
     {
         foreach ($this->getConfig(null, []) as $field => $settings) {
-            if (in_array($field, $this->protectedFieldNames)) {
+            if (
+                in_array($field, $this->protectedFieldNames, true)
+                || !$entity->isDirty($field)
+            ) {
                 continue;
             }
 
-            if (empty($entity->get($field)) || !$entity->isDirty($field)) {
+            $data = $entity->get($field);
+            if (!$data instanceof UploadedFileInterface) {
                 continue;
             }
 
@@ -111,7 +115,6 @@ public function beforeSave(EventInterface $event, EntityInterface $entity, Array
                 continue;
             }
 
-            $data = $entity->get($field);
             $path = $this->getPathProcessor($entity, $data, $field, $settings);
             $basepath = $path->basepath();
             $filename = $path->filename();

diff --git a/tests/TestCase/Model/Behavior/UploadBehaviorTest.php b/tests/TestCase/Model/Behavior/UploadBehaviorTest.php
@@ -383,6 +383,27 @@ public function testBeforeSaveWithProtectedFieldName()
         $this->assertNull($behavior->beforeSave(new Event('fake.event'), $this->entity, new ArrayObject()));
     }
 
+    public function testBeforeSaveWithFieldValueAsString()
+    {
+        $methods = array_diff($this->behaviorMethods, ['beforeSave', 'config', 'setConfig', 'getConfig']);
+        /** @var \Josegonzalez\Upload\Model\Behavior\UploadBehavior $behavior */
+        $behavior = $this->getMockBuilder(UploadBehavior::class)
+            ->onlyMethods($methods)
+            ->setConstructorArgs([$this->table, $this->settings])
+            ->getMock();
+
+        $this->entity->expects($this->any())
+            ->method('get')
+            ->with('field')
+            ->will($this->returnValue('file.jpg'));
+        $this->entity->expects($this->any())
+            ->method('isDirty')
+            ->with('field')
+            ->will($this->returnValue(true));
+
+        $this->assertNull($behavior->beforeSave(new Event('fake.event'), $this->entity, new ArrayObject()));
+    }
+
     public function testAfterDeleteOk()
     {
         $methods = array_diff($this->behaviorMethods, ['afterDelete', 'config', 'setConfig', 'getConfig']);