add params for put interface

for later usage like nextcloud/server#22019
phil-davis · Nov 17, 2021 · 6432caa · 6432caa
1 parent 75e3e88
commit 6432caa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/lib/CalDAV/CalendarObject.php b/lib/CalDAV/CalendarObject.php
@@ -95,7 +95,7 @@ public function get()
  *
  * @return string
  */
- public function put($calendarData)
+ public function put($calendarData,$params=null)
  {
  if (is_resource($calendarData)) {
  $calendarData = stream_get_contents($calendarData);

diff --git a/lib/CalDAV/Schedule/SchedulingObject.php b/lib/CalDAV/Schedule/SchedulingObject.php
@@ -62,7 +62,7 @@ public function get()
  *
  * @return string
  */
- public function put($calendarData)
+ public function put($calendarData,$params=null)
  {
  throw new MethodNotAllowed('Updating scheduling objects is not supported');
  }

diff --git a/lib/CardDAV/Card.php b/lib/CardDAV/Card.php
@@ -82,7 +82,7 @@ public function get()
  *
  * @return string|null
  */
- public function put($cardData)
+ public function put($cardData,$params=null)
  {
  if (is_resource($cardData)) {
  $cardData = stream_get_contents($cardData);

diff --git a/lib/DAV/CorePlugin.php b/lib/DAV/CorePlugin.php
@@ -429,6 +429,7 @@ public function httpPut(RequestInterface $request, ResponseInterface $response)
  {
  $body = $request->getBodyAsStream();
  $path = $request->getPath();
+ $params = (object) array('versioning' => $request->getHeader('versioning'));
 
  // Intercepting Content-Range
  if ($request->getHeader('Content-Range')) {
@@ -489,7 +490,7 @@ public function httpPut(RequestInterface $request, ResponseInterface $response)
  if (!($node instanceof IFile)) {
  throw new Exception\Conflict('PUT is not allowed on non-files.');
  }
- if (!$this->server->updateFile($path, $body, $etag)) {
+ if (!$this->server->updateFile($path, $body, $etag,$params)) {
  return false;
  }
 

diff --git a/lib/DAV/FS/File.php b/lib/DAV/FS/File.php
@@ -20,7 +20,7 @@ class File extends Node implements DAV\IFile
  *
  * @param resource $data
  */
- public function put($data)
+ public function put($data,$params=null)
  {
  file_put_contents($this->path, $data);
  clearstatcache(true, $this->path);

diff --git a/lib/DAV/FSExt/File.php b/lib/DAV/FSExt/File.php
@@ -25,7 +25,7 @@ class File extends Node implements DAV\PartialUpdate\IPatchSupport
  *
  * @return string
  */
- public function put($data)
+ public function put($data,$params=null)
  {
  file_put_contents($this->path, $data);
  clearstatcache(true, $this->path);

diff --git a/lib/DAV/File.php b/lib/DAV/File.php
@@ -37,7 +37,7 @@ abstract class File extends Node implements IFile
  *
  * @return string|null
  */
- public function put($data)
+ public function put($data,$params=null)
  {
  throw new Exception\Forbidden('Permission denied to change data');
  }

diff --git a/lib/DAV/IFile.php b/lib/DAV/IFile.php
@@ -38,7 +38,7 @@ interface IFile extends INode
  *
  * @return string|null
  */
- public function put($data);
+ public function put($data,$params=null);
 
  /**
  * Returns the data.

diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -1120,7 +1120,7 @@ public function createFile($uri, $data, &$etag = null)
  *
  * @return bool
  */
- public function updateFile($uri, $data, &$etag = null)
+ public function updateFile($uri, $data, &$etag = null,$params)
  {
  $node = $this->tree->getNodeForPath($uri);
 
@@ -1133,8 +1133,7 @@ public function updateFile($uri, $data, &$etag = null)
  if (!$this->emit('beforeWriteContent', [$uri, $node, &$data, &$modified])) {
  return false;
  }
-
- $etag = $node->put($data);
+ $etag = $node->put($data,$params);
  if ($modified) {
  $etag = null;
  }