Update Zip.php

mouyong · web-flow · commit a15c44aacfec · 2022-08-01T23:06:16.000+08:00
diff --git a/src/Utils/Zip.php b/src/Utils/Zip.php
@@ -106,15 +106,15 @@ public function unpack(string $sourcePath, ?string $dirname = null): ?string
         return null;
     }
 
-    public function ensureDoesntHaveSubdir(string $sourcePath)
+    public function ensureDoesntHaveSubdir(string $sourcePath): string
     {
         $targetPath = $sourcePath ?? storage_path('app/extensions/.tmp');
 
         $pattern = sprintf("%s/*", rtrim($sourcePath, DIRECTORY_SEPARATOR));
         $files = File::glob($pattern);
 
         if (count($files) > 1) {
-            return false;
+            return $targetPath;
         }
 
         $tmpDir = $targetPath . '-subdir';

Original file line number	Diff line number	Diff line change
`@@ -106,15 +106,15 @@ public function unpack(string $sourcePath, ?string $dirname = null): ?string`
`106`	`106`	`return null;`
`107`	`107`	`}`
`108`	`108`
`109`		`- public function ensureDoesntHaveSubdir(string $sourcePath)`
	`109`	`+ public function ensureDoesntHaveSubdir(string $sourcePath): string`
`110`	`110`	`{`
`111`	`111`	`$targetPath = $sourcePath ?? storage_path('app/extensions/.tmp');`
`112`	`112`
`113`	`113`	`$pattern = sprintf("%s/*", rtrim($sourcePath, DIRECTORY_SEPARATOR));`
`114`	`114`	`$files = File::glob($pattern);`
`115`	`115`
`116`	`116`	`if (count($files) > 1) {`
`117`		`- return false;`
	`117`	`+ return $targetPath;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`$tmpDir = $targetPath . '-subdir';`