Fix bug when running on windows that was causing file upload validati…

…on to fail
talvbansal · Jun 11, 2017 · e433da9 · mopo922 · Jun 17, 2017 · ruchernchong
1 parent 1d67a56
commit e433da9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/public/js/media-manager.js b/public/js/media-manager.js
diff --git a/src/Http/Requests/UploadFileRequest.php b/src/Http/Requests/UploadFileRequest.php
@@ -24,8 +24,9 @@ public function authorize()
     public function rules()
     {
         return [
-            'files'  => 'required|array',
+            'files.*'  => 'required|file',
             'folder' => 'required',
         ];
     }
+
 }
diff --git a/src/Services/MediaManager.php b/src/Services/MediaManager.php
@@ -113,7 +113,7 @@ public function folderInfo($folder = '/')
      */
     protected function cleanFolder($folder)
     {
-        return '/'.trim(str_replace('..', '', $folder), '/');
+        return DIRECTORY_SEPARATOR.trim(str_replace('..', '', $folder), DIRECTORY_SEPARATOR);
     }
 
     /**

diff --git a/tests/Unit/MediaManagerTest.php b/tests/Unit/MediaManagerTest.php
@@ -167,7 +167,7 @@ public function test_does_not_list_hidden_files()
      */
     public function test_can_create_folder()
     {
-        $folderName = DIRECTORY_SEPARATOR.date('Y-m-d H:i:s');
+        $folderName = DIRECTORY_SEPARATOR.date('Y-m-d');
 
         // create
         $response = $this->mediaManager->createDirectory($folderName);
@@ -208,7 +208,7 @@ public function test_cannot_create_a_folder_that_already_exists()
     public function test_can_delete_a_folder()
     {
         // create a folder
-        $folderName = DIRECTORY_SEPARATOR.date('Y-m-d H:i:s');
+        $folderName = DIRECTORY_SEPARATOR.date('Y-m-d');
         $response = $this->mediaManager->createDirectory($folderName);
 
         // is created ?
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ public function folderInfo($folder = '/') @@
          */
         protected function cleanFolder($folder)
         {
-            return '/'.trim(str_replace('..', '', $folder), '/');
+            return DIRECTORY_SEPARATOR.trim(str_replace('..', '', $folder), DIRECTORY_SEPARATOR);
         }
         /**
@@ Expand Down @@