Merge pull request #33 from rsf123/master

Add rename/replace behavior to upload and createFolder

Author: dcblogdev

changelog.md

@@ -302,4 +302,20 @@ Added files import for MsGraphAdmin
 
 ## Added
 
-- added commands `msgraphadmin:keep-alive` and `msgraph:keep-alive` to allow refresh tokens to be automated by running these commands on a schedule 
+- added commands `msgraphadmin:keep-alive` and `msgraph:keep-alive` to allow refresh tokens to be automated by running these commands on a schedule 
+
+### 3.1.5
+
+Added support in Files.php to support replace/rename behavior on createFolder and file upload functions. Default behavior is to rename.
+
+Usage for createFolder:
+```php
+MsGraph::files()->createFolder($name, $path, $type = 'me', $behavior='rename')
+```
+Where $behavior is either rename or replace
+
+Usage for upload:
+```php
+MsGraph::files()->upload($name, $uploadPath, $path=null, $type='me',$behavior='rename')
+```
+Where $behavior is either rename or replace

src/Resources/Files.php

@@ -41,14 +41,14 @@ public function deleteFile($id, $type = 'me')
         return MsGraph::delete($type."/drive/items/$id");
     }
 
-    public function createFolder($name, $path, $type = 'me')
+    public function createFolder($name, $path, $type = 'me', $behavior = 'rename')
     {
         $path = $path === null ? $type.'/drive/root/children' : $type.'/drive/root:'.$this->forceStartingSlash($path).':/children';
 
         return MsGraph::post($path, [
             'name'                              => $name,
             'folder'                            => new \stdClass(),
-            '@microsoft.graph.conflictBehavior' => 'rename',
+            '@microsoft.graph.conflictBehavior' => $behavior,
         ]);
     }
 
@@ -66,9 +66,9 @@ public function rename($name, $id, $type = 'me')
         ]);
     }
 
-    public function upload($name, $uploadPath, $path = null, $type = 'me')
+    public function upload($name, $uploadPath, $path = null, $type = 'me', $behavior = 'rename')
     {
-        $uploadSession = $this->createUploadSession($name, $path, $type);
+        $uploadSession = $this->createUploadSession($name, $path, $type, $behavior);
         $uploadUrl     = $uploadSession['uploadUrl'];
 
         $fragSize       = 320 * 1024;
@@ -110,13 +110,13 @@ public function upload($name, $uploadPath, $path = null, $type = 'me')
         }
     }
 
-    protected function createUploadSession($name, $path = null, $type = 'me')
+    protected function createUploadSession($name, $path = null, $type = 'me', $behavior = 'rename')
     {
         $path = $path === null ? $type."/drive/root:/$name:/createUploadSession" : $type.'/drive/root:'.$this->forceStartingSlash($path)."/$name:/createUploadSession";
 
         return MsGraph::post($path, [
             'item' => [
-                '@microsoft.graph.conflictBehavior' => 'rename',
+                '@microsoft.graph.conflictBehavior' => $behavior,
                 'name'                              => $name,
             ],
         ]);