chore: Fix code style

Signed-off-by: Ferdinand Thiessen <[email protected]>
sabre-io · Sep 5, 2024 · 3e722c3 · 3e722c3
1 parent 069c16d
commit 3e722c3
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 32 deletions.
diff --git a/lib/DAV/CorePlugin.php b/lib/DAV/CorePlugin.php
@@ -590,7 +590,7 @@ public function httpMove(RequestInterface $request, ResponseInterface $response)
         $moveInfo = $this->server->getCopyAndMoveInfo($request);
 
         // MOVE does only allow "infinity" every other header value is considered invalid
-        if ($moveInfo['depth'] !== 'infinity') {
+        if ('infinity' !== $moveInfo['depth']) {
             throw new BadRequest('The HTTP Depth header must only contain "infinity" for MOVE');
         }
 

diff --git a/lib/DAV/ICopyTarget.php b/lib/DAV/ICopyTarget.php
@@ -28,12 +28,12 @@ interface ICopyTarget extends ICollection
      * is that the copy was successful.
      * If you return false, sabre/dav will handle the copy itself.
      *
-     * @param string $targetName new local file/collection name
-     * @param string $sourcePath Full path to source node
-     * @param INode  $sourceNode Source node itself
-     * @param string|int $depth How many level of children to copy.
-     *                          The value can be 'infinity' or a positiv number including zero.
-     *                          Zero means to only copy a shallow collection with props but without children.
+     * @param string     $targetName new local file/collection name
+     * @param string     $sourcePath Full path to source node
+     * @param INode      $sourceNode Source node itself
+     * @param string|int $depth      How many level of children to copy.
+     *                               The value can be 'infinity' or a positiv number including zero.
+     *                               Zero means to only copy a shallow collection with props but without children.
      *
      * @return bool
      */

diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -728,8 +728,8 @@ public function getCopyAndMoveInfo(RequestInterface $request)
 
         // Depth of inifinty is valid for MOVE and COPY. If it is not set the RFC requires to act like it was 'infinity'.
         $depth = strtolower($request->getHeader('Depth') ?? 'infinity');
-        if ($depth !== 'infinity' && is_numeric($depth)) {
-            $depth = (int)$depth;
+        if ('infinity' !== $depth && is_numeric($depth)) {
+            $depth = (int) $depth;
             if ($depth < 0) {
                 throw new Exception\BadRequest('The HTTP Depth header may only be "infinity", 0 or a positiv number');
             }

diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
@@ -135,11 +135,11 @@ public function nodeExists($path)
     /**
      * Copies a file from path to another.
      *
-     * @param string $sourcePath      The source location
-     * @param string $destinationPath The full destination path
-     * @param int|string $depth How much levle of children to copy.
-     *                          The value can be 'infinity' or a positiv integer, including zero.
-     *                          Zero means only copy the collection without children but with its properties.
+     * @param string     $sourcePath      The source location
+     * @param string     $destinationPath The full destination path
+     * @param int|string $depth           How much levle of children to copy.
+     *                                    The value can be 'infinity' or a positiv integer, including zero.
+     *                                    Zero means only copy the collection without children but with its properties.
      */
     public function copy($sourcePath, $destinationPath, $depth = 'infinity')
     {
@@ -310,8 +310,8 @@ public function getMultipleNodes($paths)
     /**
      * copyNode.
      *
-     * @param string $destinationName
-     * @param int|string $depth How many children of the node to copy
+     * @param string     $destinationName
+     * @param int|string $depth           How many children of the node to copy
      */
     protected function copyNode(INode $source, ICollection $destinationParent, ?string $destinationName = null, $depth = 'infinity')
     {
@@ -338,9 +338,9 @@ protected function copyNode(INode $source, ICollection $destinationParent, ?stri
             $destination = $destinationParent->getChild($destinationName);
 
             // Copy children if depth is not zero
-            if ($depth !== 0) {
+            if (0 !== $depth) {
                 // Adjust next depth for children (keep 'infinity' or decrease)
-                $depth = $depth === 'infinity' ? 'infinity' : $depth - 1;
+                $depth = 'infinity' === $depth ? 'infinity' : $depth - 1;
                 $destination = $destinationParent->getChild($destinationName);
                 foreach ($source->getChildren() as $child) {
                     $this->copyNode($child, $destination, null, $depth);

diff --git a/tests/Sabre/DAV/CorePluginTest.php b/tests/Sabre/DAV/CorePluginTest.php
@@ -16,18 +16,21 @@ public function testGetInfo()
         self::assertEquals('core', $corePlugin->getPluginInfo()['name']);
     }
 
-    public function moveInvalidDepthHeaderProvider() {
+    public function moveInvalidDepthHeaderProvider()
+    {
         return [
             [0],
             [1],
         ];
     }
 
     /**
-     * MOVE does only allow "infinity" every other header value is considered invalid
+     * MOVE does only allow "infinity" every other header value is considered invalid.
+     *
      * @dataProvider moveInvalidDepthHeaderProvider
      */
-    public function testMoveWithInvalidDepth($depthHeader) {
+    public function testMoveWithInvalidDepth($depthHeader)
+    {
         $request = new HTTP\Request('MOVE', '/path/');
         $response = new HTTP\Response();
 
@@ -45,9 +48,10 @@ public function testMoveWithInvalidDepth($depthHeader) {
     }
 
     /**
-     * MOVE does only allow "infinity" every other header value is considered invalid
+     * MOVE does only allow "infinity" every other header value is considered invalid.
      */
-    public function testMoveSupportsDepth() {
+    public function testMoveSupportsDepth()
+    {
         $request = new HTTP\Request('MOVE', '/path/');
         $response = new HTTP\Response();
 

diff --git a/tests/Sabre/DAV/Mock/PropertiesCollection.php b/tests/Sabre/DAV/Mock/PropertiesCollection.php
@@ -49,6 +49,7 @@ public function propPatch(PropPatch $proppatch)
                     foreach ($updateProperties as $k => $v) {
                         $this->properties[$k] = $v;
                     }
+
                     return true;
                 case 'updatepropsarray':
                     $r = [];
@@ -81,7 +82,7 @@ public function propPatch(PropPatch $proppatch)
      */
     public function getProperties($requestedProperties)
     {
-        if (count($requestedProperties) === 0) {
+        if (0 === count($requestedProperties)) {
             return $this->properties;
         }
 
@@ -97,7 +98,7 @@ public function getProperties($requestedProperties)
     }
 
     /**
-     * Creates a new subdirectory. (Override to ensure props are preserved)
+     * Creates a new subdirectory. (Override to ensure props are preserved).
      *
      * @param string $name
      */

diff --git a/tests/Sabre/DAV/ServerCopyMoveTest.php b/tests/Sabre/DAV/ServerCopyMoveTest.php
@@ -7,21 +7,23 @@
 use Sabre\DAV\Exception\BadRequest;
 use Sabre\HTTP;
 
-class ServerCopyMoveTest extends AbstractServer
+class ServerCopyMoveTest extends AbstractServerTestCase
 {
     /**
-     * Only 'infinity' and positiv (incl. 0) numbers are allowed
+     * Only 'infinity' and positive (incl. 0) numbers are allowed.
+     *
      * @dataProvider dataInvalidDepthHeader
      */
     public function testInvalidDepthHeader(?string $headerValue)
     {
-        $request = new HTTP\Request('COPY', '/', $headerValue !== null ? ['Depth' => $headerValue] : []);
+        $request = new HTTP\Request('COPY', '/', null !== $headerValue ? ['Depth' => $headerValue] : []);
 
         $this->expectException(BadRequest::class);
         $this->server->getCopyAndMoveInfo($request);
     }
 
-    public function dataInvalidDepthHeader() {
+    public function dataInvalidDepthHeader()
+    {
         return [
             ['-1'],
             ['0.5'],
@@ -31,17 +33,21 @@ public function dataInvalidDepthHeader() {
     }
 
     /**
-     * Only 'infinity' and positiv (incl. 0) numbers are allowed
+     * Only 'infinity' and positive (incl. 0) numbers are allowed.
+     *
      * @dataProvider dataDepthHeader
+     *
+     * @param string|int $expectedDepth
      */
-    public function testValidDepthHeader(array $depthHeader, string|int $expectedDepth)
+    public function testValidDepthHeader(array $depthHeader, $expectedDepth)
     {
         $request = new HTTP\Request('COPY', '/', array_merge(['Destination' => '/dst'], $depthHeader));
 
         $this->assertEquals($expectedDepth, $this->server->getCopyAndMoveInfo($request)['depth']);
     }
 
-    public function dataDepthHeader() {
+    public function dataDepthHeader()
+    {
         return [
             [
                 [],