Merge pull request #162 from herman322/fix-double-slash-in-path

fix double slash issue if no pathPrefix specified
yii-starter-kit · Jul 20, 2020 · e7fbf1a · e7fbf1a
2 parents 0955c02 + b57a49e
commit e7fbf1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Storage.php b/src/Storage.php
@@ -129,11 +129,11 @@ public function save($file, $preserveFileName = false, $overwrite = false, $conf
                     Yii::$app->security->generateRandomString(),
                     $fileObj->getExtension()
                 ]);
-                $path = implode(DIRECTORY_SEPARATOR, [$pathPrefix, $dirIndex, $filename]);
+                $path = implode(DIRECTORY_SEPARATOR, array_filter([$pathPrefix, $dirIndex, $filename]));
             } while ($this->getFilesystem()->has($path));
         } else {
             $filename = $fileObj->getPathInfo('filename');
-            $path = implode(DIRECTORY_SEPARATOR, [$pathPrefix, $dirIndex, $filename]);
+            $path = implode(DIRECTORY_SEPARATOR, array_filter([$pathPrefix, $dirIndex, $filename]));
         }
 
         $this->beforeSave($fileObj->getPath(), $this->getFilesystem());