Made the behavior work with the UploadedFile object

burzum · Nov 2, 2020 · 794f153 · 794f153
1 parent 0437ad8
commit 794f153
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/FileStorage/DataTransformer.php b/src/FileStorage/DataTransformer.php
@@ -49,7 +49,11 @@ public function entityToFileObject(EntityInterface $entity): FileInterface
         }
 
         if ($entity->has('file')) {
-            $file = $file->withFile($entity->get('file')['tmp_name']);
+            /**
+             * @var $uploadedFile \Psr\Http\Message\UploadedFileInterface
+             */
+            $uploadedFile = $entity->get('file');
+            $file = $file->withFile($uploadedFile->getStream()->getMetadata('uri'));
         }
 
         return $file;

diff --git a/src/Model/Behavior/FileStorageBehavior.php b/src/Model/Behavior/FileStorageBehavior.php
@@ -108,7 +108,7 @@ protected function isFileUploadPresent($entity)
     {
         $field = $this->getConfig('fileField');
         if ($this->getConfig('ignoreEmptyFile') === true) {
-            if (!isset($entity[$field]['error']) || $entity[$field]['error'] === UPLOAD_ERR_NO_FILE) {
+            if (!isset($entity[$field]) || $entity[$field]->getError() === UPLOAD_ERR_NO_FILE) {
                 return false;
             }
         }
@@ -148,7 +148,7 @@ public function beforeSave(Event $event, EntityInterface $entity)
         $this->dispatchEvent('FileStorage.beforeSave', [
             'entity' => $entity,
             'storageAdapter' => $this->getStorageAdapter($entity->get('adapter'))
-        ], $this->_table);
+        ], $this->getTable());
     }
 
     /**
@@ -182,6 +182,7 @@ public function afterSave(Event $event, EntityInterface $entity, $options)
                 );
             } catch (Throwable $exception) {
                 $this->getTable()->delete($entity);
+                throw $exception;
             }
         }
 
@@ -223,7 +224,7 @@ public function afterDelete(Event $event, EntityInterface $entity, $options)
     {
         $this->dispatchEvent('FileStorage.afterDelete', [
             'entity' => $entity,
-        ], $this->_table);
+        ], $this->getTable());
 
         $file = $this->entityToFileObject($entity);
         $this->fileStorage->remove($file);
@@ -242,16 +243,15 @@ public function afterDelete(Event $event, EntityInterface $entity, $options)
      */
     protected function getFileInfoFromUpload(&$upload, $field = 'file')
     {
-        if (!empty($upload[$field]['tmp_name'])) {
-            $File = new \Cake\Filesystem\File($upload[$field]['tmp_name']);
-            $upload['filesize'] = filesize($upload[$field]['tmp_name']);
-            $upload['mime_type'] = $File->mime();
-        }
-
-        if (!empty($upload[$field]['name'])) {
-            $upload['extension'] = pathinfo($upload[$field]['name'], PATHINFO_EXTENSION);
-            $upload['filename'] = $upload[$field]['name'];
-        }
+        /**
+         * @var $uploadedFile \Psr\Http\Message\UploadedFileInterface
+         */
+        $uploadedFile = $upload[$field];
+
+        $upload['filesize'] = $uploadedFile->getSize();
+        $upload['mime_type'] = $uploadedFile->getClientMediaType();
+        $upload['extension'] = pathinfo($uploadedFile->getClientFilename(), PATHINFO_EXTENSION);
+        $upload['filename'] = $uploadedFile->getClientFilename();
     }
 
     /**

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 namespace Burzum\FileStorage;
 
 use Cake\Core\BasePlugin;