modify normalizeWorkingDir()

serwin35 · Dec 11, 2017 · c16ca8c · c16ca8c
1 parent 79d98d6
commit c16ca8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/src/Lfm.php b/src/Lfm.php
@@ -115,8 +115,15 @@ public function getUserSlug()
         return empty(auth()->user()) ? '' : auth()->user()->$config;
     }
 
-    public function getRootFolder($type)
+    public function getRootFolder($type = null)
     {
+        if (is_null($type)) {
+            $type = 'share';
+            if ($this->allowFolderType('user')) {
+                $type = 'user';
+            }
+        }
+
         if ($type === 'user') {
             $folder = $this->getUserSlug();
         } else {

diff --git a/src/LfmPath.php b/src/LfmPath.php
@@ -156,18 +156,9 @@ public function createFolder()
 
     public function normalizeWorkingDir()
     {
-        $working_dir = $this->working_dir ?: $this->helper->input('working_dir');
-
-        if (empty($working_dir)) {
-            $default_folder_type = 'share';
-            if ($this->helper->allowFolderType('user')) {
-                $default_folder_type = 'user';
-            }
-
-            $working_dir = $this->helper->getRootFolder($default_folder_type);
-        }
-
-        return $working_dir;
+        return $this->working_dir
+            ?: $this->helper->input('working_dir')
+            ?: $this->helper->getRootFolder();
     }
 
     /**

diff --git a/tests/LfmPathTest.php b/tests/LfmPathTest.php
@@ -73,8 +73,7 @@ public function testSetNameAndGetName()
     public function testPath()
     {
         $helper = m::mock(Lfm::class);
-        $helper->shouldReceive('allowFolderType')->with('user')->andReturn(true);
-        $helper->shouldReceive('getRootFolder')->with('user')->andReturn('/foo');
+        $helper->shouldReceive('getRootFolder')->andReturn('/foo');
         $helper->shouldReceive('basePath')->andReturn(realpath(__DIR__ . '/../'));
         $helper->shouldReceive('input')->with('working_dir')->andReturnNull();
         $helper->shouldReceive('getCategoryName')->andReturn('files');
@@ -94,8 +93,7 @@ public function testPath()
     public function testUrl()
     {
         $helper = m::mock(Lfm::class);
-        $helper->shouldReceive('allowFolderType')->with('user')->once()->andReturn(true);
-        $helper->shouldReceive('getRootFolder')->with('user')->once()->andReturn('/foo');
+        $helper->shouldReceive('getRootFolder')->once()->andReturn('/foo');
         $helper->shouldReceive('input')->with('working_dir')->once()->andReturnNull();
         $helper->shouldReceive('getCategoryName')->andReturn('files');
         $helper->shouldReceive('isRunningOnWindows')->andReturn(false);

diff --git a/tests/LfmTest.php b/tests/LfmTest.php
@@ -122,6 +122,7 @@ public function testGetUserSlug()
     public function testGetRootFolder()
     {
         $config = m::mock(Config::class);
+        $config->shouldReceive('get')->with('lfm.allow_multi_user')->andReturn(true);
         $config->shouldReceive('get')->with('lfm.user_folder_name')->once()->andReturn(function () {
             return 'foo';
         });