Revert "Add PHPdoc for params parameter"

This reverts commit 2df6a6c.
sabre-io · Dec 9, 2021 · 32fe7e3 · 32fe7e3
1 parent 5d73987
commit 32fe7e3
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 22 deletions.
diff --git a/lib/CalDAV/CalendarObject.php b/lib/CalDAV/CalendarObject.php
@@ -92,7 +92,6 @@ public function get()
      * Updates the ICalendar-formatted object.
      *
      * @param string|resource $calendarData
-     * @param object|null     $params
      *
      * @return string
      */

diff --git a/lib/CalDAV/Schedule/SchedulingObject.php b/lib/CalDAV/Schedule/SchedulingObject.php
@@ -59,7 +59,6 @@ public function get()
      * Updates the ICalendar-formatted object.
      *
      * @param string|resource $calendarData
-     * @param object|null     $params
      *
      * @return string
      */

diff --git a/lib/CardDAV/Card.php b/lib/CardDAV/Card.php
@@ -78,8 +78,7 @@ public function get()
     /**
      * Updates the VCard-formatted object.
      *
-     * @param string      $cardData
-     * @param object|null $params
+     * @param string $cardData
      *
      * @return string|null
      */

diff --git a/lib/DAV/FS/File.php b/lib/DAV/FS/File.php
@@ -18,8 +18,7 @@ class File extends Node implements DAV\IFile
     /**
      * Updates the data.
      *
-     * @param resource    $data
-     * @param object|null $params
+     * @param resource $data
      */
     public function put($data, $params = null)
     {

diff --git a/lib/DAV/FSExt/File.php b/lib/DAV/FSExt/File.php
@@ -22,7 +22,6 @@ class File extends Node implements DAV\PartialUpdate\IPatchSupport
      * Data is a readable stream resource.
      *
      * @param resource|string $data
-     * @param object|null     $params
      *
      * @return string
      */

diff --git a/lib/DAV/File.php b/lib/DAV/File.php
@@ -34,7 +34,6 @@ abstract class File extends Node implements IFile
      * return an ETag, and just return null.
      *
      * @param string|resource $data
-     * @param object|null     $params
      *
      * @return string|null
      */

diff --git a/lib/DAV/IFile.php b/lib/DAV/IFile.php
@@ -35,7 +35,6 @@ interface IFile extends INode
      * return an ETag, and just return null.
      *
      * @param resource|string $data
-     * @param object|null     $params
      *
      * @return string|null
      */

diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -1114,14 +1114,13 @@ public function createFile($uri, $data, &$etag = null)
      *
      * This method will return true if the file was actually updated
      *
-     * @param string      $uri
-     * @param resource    $data
-     * @param string      $etag
-     * @param object|null $params
+     * @param string   $uri
+     * @param resource $data
+     * @param string   $etag
      *
      * @return bool
      */
-    public function updateFile($uri, $data, &$etag = null, $params = null)
+    public function updateFile($uri, $data, &$etag = null, $params)
     {
         $node = $this->tree->getNodeForPath($uri);
 

diff --git a/tests/Sabre/DAV/Mock/File.php b/tests/Sabre/DAV/Mock/File.php
@@ -82,8 +82,7 @@ public function setName($name)
      * different object on a subsequent GET you are strongly recommended to not
      * return an ETag, and just return null.
      *
-     * @param resource    $data
-     * @param object|null $params
+     * @param resource $data
      *
      * @return string|null
      */

diff --git a/tests/Sabre/DAV/Mock/StreamingFile.php b/tests/Sabre/DAV/Mock/StreamingFile.php
@@ -35,8 +35,7 @@ class StreamingFile extends File
      * different object on a subsequent GET you are strongly recommended to not
      * return an ETag, and just return null.
      *
-     * @param resource    $data
-     * @param object|null $params
+     * @param resource $data
      *
      * @return string|null
      */

diff --git a/tests/Sabre/DAV/PartialUpdate/FileMock.php b/tests/Sabre/DAV/PartialUpdate/FileMock.php
@@ -10,12 +10,12 @@ class FileMock implements IPatchSupport
 {
     protected $data = '';
 
-    public function put($data, $params = null)
+    public function put($str, $params = null)
     {
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
+        if (is_resource($str)) {
+            $str = stream_get_contents($str);
         }
-        $this->data = $data;
+        $this->data = $str;
     }
 
     /**