Merge branch 'develop'

k-holy · Apr 27, 2023 · 0f145e5 · 0f145e5
2 parents 10b4e5d + 1a6a0d9
commit 0f145e5
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "homepage": "https://github.com/k-holy/volcanus-file-uploader",
   "type": "library",
   "description": "file uploader",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "license": "MIT",
   "authors": [
     {

diff --git a/src/Uploader.php b/src/Uploader.php
@@ -154,8 +154,14 @@ public function validate(FileInterface $file, FileValidator $validator): bool
      */
     public function move(FileInterface $file): string
     {
-        $moveDirectory = $this->config('moveDirectory');
-        $moveRetry = $this->config('moveRetry');
+        $moveDirectory = (string)$this->config('moveDirectory');
+        if (!isset($moveDirectory) || strlen($moveDirectory) === 0) {
+            throw new UploaderException('moveDirectory is not specified.');
+        }
+        $moveRetry = (int)$this->config('moveRetry');
+        if (!isset($moveRetry) || $moveRetry === 0) {
+            throw new UploaderException('moveRetry is not specified.');
+        }
         if ($file->isValid()) {
             $this->prepareMove($moveDirectory);
             $extension = $file->getClientExtension();

diff --git a/tests/Volcanus/FileUploader/Test/UploaderTest.php b/tests/Volcanus/FileUploader/Test/UploaderTest.php
@@ -283,6 +283,42 @@ public function testMove()
         $this->assertFileExists($movedPath);
     }
 
+    public function testMoveRaiseExceptionWhenMoveDirectoryIsNotSpecified()
+    {
+        $this->expectException(UploaderException::class);
+
+        $file = $this->copyFile(
+            __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'this-is.jpg'
+        );
+
+        unlink($file->getPath());
+
+        $uploader = new Uploader([
+            'moveDirectory' => null,
+            'moveRetry' => 1,
+        ]);
+
+        $uploader->move($file);
+    }
+
+    public function testMoveRaiseExceptionWhenMoveRetryIsNotSpecified()
+    {
+        $this->expectException(UploaderException::class);
+
+        $file = $this->copyFile(
+            __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'this-is.jpg'
+        );
+
+        unlink($file->getPath());
+
+        $uploader = new Uploader([
+            'moveDirectory' => $this->tempDir,
+            'moveRetry' => null,
+        ]);
+
+        $uploader->move($file);
+    }
+
     public function testMoveRaiseExceptionWhenAllRetryFailed()
     {
         $this->expectException(UploaderException::class);