Inspection of "Merge pull request #26304 from nextcloud-pr-bot/au..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 630edd...09718c )

by Morris

created 2021-03-26 06:08 UTC

Status

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -27,21 +27,21 @@
 block discarded – undo
 
 class PropFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$componentName = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $componentName = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($componentName)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
-		}
+        if (!is_string($componentName)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
+        }
 
-		return $componentName;
-	}
+        return $componentName;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php 1 patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -27,28 +27,28 @@
 block discarded – undo
 
 class ParamFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$property = $att['property'];
-		$parameter = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $property = $att['property'];
+        $parameter = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($property)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
-		}
-		if (!is_string($parameter)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
-		}
+        if (!is_string($property)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
+        }
+        if (!is_string($parameter)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
+        }
 
-		return [
-			'property' => $property,
-			'parameter' => $parameter,
-		];
-	}
+        return [
+            'property' => $property,
+            'parameter' => $parameter,
+        ];
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php 1 patch

Indentation +140 added lines, -140 removed lines patch added patch discarded remove patch

@@ -35,144 +35,144 @@
 block discarded – undo
 
 class SystemTagsByIdCollection implements ICollection {
 
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * SystemTagsByIdCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		$this->tagManager = $tagManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 *
-	 * @return bool true if the user is an admin
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create tags by id');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function getChild($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
-			}
-			return $this->makeNode($tag);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
-		}
-	}
-
-	public function getChildren() {
-		$visibilityFilter = true;
-		if ($this->isAdmin()) {
-			$visibilityFilter = null;
-		}
-
-		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
-			return $this->makeNode($tag);
-		}, $tags);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function childExists($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				return false;
-			}
-			return true;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return 'systemtags';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the given system tag
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
-	}
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * SystemTagsByIdCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        $this->tagManager = $tagManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     *
+     * @return bool true if the user is an admin
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create tags by id');
+    }
+
+    /**
+     * @param string $name
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $name
+     */
+    public function getChild($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                throw new NotFound('Tag with id ' . $name . ' not found');
+            }
+            return $this->makeNode($tag);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+        }
+    }
+
+    public function getChildren() {
+        $visibilityFilter = true;
+        if ($this->isAdmin()) {
+            $visibilityFilter = null;
+        }
+
+        $tags = $this->tagManager->getAllTags($visibilityFilter);
+        return array_map(function ($tag) {
+            return $this->makeNode($tag);
+        }, $tags);
+    }
+
+    /**
+     * @param string $name
+     */
+    public function childExists($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                return false;
+            }
+            return true;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return 'systemtags';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the given system tag
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php 1 patch

Indentation +132 added lines, -132 removed lines patch added patch discarded remove patch

@@ -38,136 +38,136 @@
 block discarded – undo
  */
 class SystemTagsObjectTypeCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var \Closure
-	 **/
-	protected $childExistsFunction;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectType object type
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param \Closure $childExistsFunction
-	 */
-	public function __construct(
-		$objectType,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		\Closure $childExistsFunction
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectType = $objectType;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->childExistsFunction = $childExistsFunction;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create nodes');
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $objectId
-	 * @return SystemTagsObjectMappingCollection
-	 * @throws NotFound
-	 */
-	public function getChild($objectId) {
-		// make sure the object exists and is reachable
-		if (!$this->childExists($objectId)) {
-			throw new NotFound('Entity does not exist or is not available');
-		}
-		return new SystemTagsObjectMappingCollection(
-			$objectId,
-			$this->objectType,
-			$this->userSession->getUser(),
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
-
-	public function getChildren() {
-		// do not list object ids
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		return call_user_func($this->childExistsFunction, $name);
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return $this->objectType;
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var \Closure
+     **/
+    protected $childExistsFunction;
+
+    /**
+     * Constructor
+     *
+     * @param string $objectType object type
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param \Closure $childExistsFunction
+     */
+    public function __construct(
+        $objectType,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        \Closure $childExistsFunction
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectType = $objectType;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->childExistsFunction = $childExistsFunction;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create nodes');
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $objectId
+     * @return SystemTagsObjectMappingCollection
+     * @throws NotFound
+     */
+    public function getChild($objectId) {
+        // make sure the object exists and is reachable
+        if (!$this->childExists($objectId)) {
+            throw new NotFound('Entity does not exist or is not available');
+        }
+        return new SystemTagsObjectMappingCollection(
+            $objectId,
+            $this->objectType,
+            $this->userSession->getUser(),
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
+
+    public function getChildren() {
+        // do not list object ids
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        return call_user_func($this->childExistsFunction, $name);
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return $this->objectType;
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Capabilities.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -25,11 +25,11 @@
 block discarded – undo
 use OCP\Capabilities\ICapability;
 
 class Capabilities implements ICapability {
-	public function getCapabilities() {
-		return [
-			'dav' => [
-				'chunking' => '1.0',
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'dav' => [
+                'chunking' => '1.0',
+            ]
+        ];
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Upload/FutureFile.php 1 patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

@@ -36,87 +36,87 @@
 block discarded – undo
  */
 class FutureFile implements \Sabre\DAV\IFile {
 
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	public function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    public function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function ($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    public function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function ($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/DeleteOrphanedSharesJob.php 1 patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -31,35 +31,35 @@
 block discarded – undo
  */
 class DeleteOrphanedSharesJob extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 15;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 15;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
-			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
+        $sql =
+            'DELETE FROM `*PREFIX*share` ' .
+            'WHERE `item_type` in (\'file\', \'folder\') ' .
+            'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
-		$deletedEntries = $connection->executeUpdate($sql);
-		$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
-	}
+        $deletedEntries = $connection->executeUpdate($sql);
+        $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
+    }
 }

Please login to merge, or discard this patch.

apps/testing/appinfo/routes.php 1 patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -21,62 +21,62 @@
 block discarded – undo
  */
 
 return [
-	'routes' => [
-		[
-			'name' => 'RateLimitTest#userAndAnonProtected',
-			'url' => '/userAndAnonProtected',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'RateLimitTest#onlyAnonProtected',
-			'url' => '/anonProtected',
-			'verb' => 'GET',
-		],
-	],
+    'routes' => [
+        [
+            'name' => 'RateLimitTest#userAndAnonProtected',
+            'url' => '/userAndAnonProtected',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'RateLimitTest#onlyAnonProtected',
+            'url' => '/anonProtected',
+            'verb' => 'GET',
+        ],
+    ],
 
-	'ocs' => [
-		[
-			'name' => 'Config#setAppValue',
-			'url' => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Config#deleteAppValue',
-			'url' => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#isLockingEnabled',
-			'url' => '/api/v1/lockprovisioning',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#isLocked',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#acquireLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Locking#changeLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'Locking#releaseLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#releaseAll',
-			'url' => '/api/v1/lockprovisioning/{type}',
-			'verb' => 'DELETE',
-			'defaults' => [
-				'type' => null
-			]
-		],
-	],
+    'ocs' => [
+        [
+            'name' => 'Config#setAppValue',
+            'url' => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Config#deleteAppValue',
+            'url' => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#isLockingEnabled',
+            'url' => '/api/v1/lockprovisioning',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#isLocked',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#acquireLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Locking#changeLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'Locking#releaseLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#releaseAll',
+            'url' => '/api/v1/lockprovisioning/{type}',
+            'verb' => 'DELETE',
+            'defaults' => [
+                'type' => null
+            ]
+        ],
+    ],
 ];

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/PriorityTrait.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -29,31 +29,31 @@
 block discarded – undo
  */
 trait PriorityTrait {
 
-	/** @var int initial priority */
-	protected $priority = BackendService::PRIORITY_DEFAULT;
+    /** @var int initial priority */
+    protected $priority = BackendService::PRIORITY_DEFAULT;
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * @param int $priority
-	 * @return self
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-		return $this;
-	}
+    /**
+     * @param int $priority
+     * @return self
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+        return $this;
+    }
 
-	/**
-	 * @param PriorityTrait $a
-	 * @param PriorityTrait $b
-	 * @return int
-	 */
-	public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
-		return ($a->getPriority() - $b->getPriority());
-	}
+    /**
+     * @param PriorityTrait $a
+     * @param PriorityTrait $b
+     * @return int
+     */
+    public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
+        return ($a->getPriority() - $b->getPriority());
+    }
 }

Please login to merge, or discard this patch.

		@@ -27,21 +27,21 @@
		block discarded – undo
27	27
28	28	class PropFilter implements XmlDeserializable {
29	29
30		- /**
31		- * @param Reader $reader
32		- * @throws BadRequest
33		- * @return string
34		- */
35		- public static function xmlDeserialize(Reader $reader) {
36		- $att = $reader->parseAttributes();
37		- $componentName = $att['name'];
	30	+ /**
	31	+ * @param Reader $reader
	32	+ * @throws BadRequest
	33	+ * @return string
	34	+ */
	35	+ public static function xmlDeserialize(Reader $reader) {
	36	+ $att = $reader->parseAttributes();
	37	+ $componentName = $att['name'];
38	38
39		- $reader->parseInnerTree();
	39	+ $reader->parseInnerTree();
40	40
41		- if (!is_string($componentName)) {
42		- throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
43		- }
	41	+ if (!is_string($componentName)) {
	42	+ throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
	43	+ }
44	44
45		- return $componentName;
46		- }
	45	+ return $componentName;
	46	+ }
47	47	}

		@@ -27,28 +27,28 @@
		block discarded – undo
27	27
28	28	class ParamFilter implements XmlDeserializable {
29	29
30		- /**
31		- * @param Reader $reader
32		- * @throws BadRequest
33		- * @return string
34		- */
35		- public static function xmlDeserialize(Reader $reader) {
36		- $att = $reader->parseAttributes();
37		- $property = $att['property'];
38		- $parameter = $att['name'];
	30	+ /**
	31	+ * @param Reader $reader
	32	+ * @throws BadRequest
	33	+ * @return string
	34	+ */
	35	+ public static function xmlDeserialize(Reader $reader) {
	36	+ $att = $reader->parseAttributes();
	37	+ $property = $att['property'];
	38	+ $parameter = $att['name'];
39	39
40		- $reader->parseInnerTree();
	40	+ $reader->parseInnerTree();
41	41
42		- if (!is_string($property)) {
43		- throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
44		- }
45		- if (!is_string($parameter)) {
46		- throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
47		- }
	42	+ if (!is_string($property)) {
	43	+ throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
	44	+ }
	45	+ if (!is_string($parameter)) {
	46	+ throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
	47	+ }
48	48
49		- return [
50		- 'property' => $property,
51		- 'parameter' => $parameter,
52		- ];
53		- }
	49	+ return [
	50	+ 'property' => $property,
	51	+ 'parameter' => $parameter,
	52	+ ];
	53	+ }
54	54	}

		@@ -35,144 +35,144 @@
		block discarded – undo
35	35
36	36	class SystemTagsByIdCollection implements ICollection {
37	37
38		- /**
39		- * @var ISystemTagManager
40		- */
41		- private $tagManager;
42		-
43		- /**
44		- * @var IGroupManager
45		- */
46		- private $groupManager;
47		-
48		- /**
49		- * @var IUserSession
50		- */
51		- private $userSession;
52		-
53		- /**
54		- * SystemTagsByIdCollection constructor.
55		- *
56		- * @param ISystemTagManager $tagManager
57		- * @param IUserSession $userSession
58		- * @param IGroupManager $groupManager
59		- */
60		- public function __construct(
61		- ISystemTagManager $tagManager,
62		- IUserSession $userSession,
63		- IGroupManager $groupManager
64		- ) {
65		- $this->tagManager = $tagManager;
66		- $this->userSession = $userSession;
67		- $this->groupManager = $groupManager;
68		- }
69		-
70		- /**
71		- * Returns whether the currently logged in user is an administrator
72		- *
73		- * @return bool true if the user is an admin
74		- */
75		- private function isAdmin() {
76		- $user = $this->userSession->getUser();
77		- if ($user !== null) {
78		- return $this->groupManager->isAdmin($user->getUID());
79		- }
80		- return false;
81		- }
82		-
83		- /**
84		- * @param string $name
85		- * @param resource\|string $data Initial payload
86		- * @throws Forbidden
87		- */
88		- public function createFile($name, $data = null) {
89		- throw new Forbidden('Cannot create tags by id');
90		- }
91		-
92		- /**
93		- * @param string $name
94		- */
95		- public function createDirectory($name) {
96		- throw new Forbidden('Permission denied to create collections');
97		- }
98		-
99		- /**
100		- * @param string $name
101		- */
102		- public function getChild($name) {
103		- try {
104		- $tag = $this->tagManager->getTagsByIds([$name]);
105		- $tag = current($tag);
106		- if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
107		- throw new NotFound('Tag with id ' . $name . ' not found');
108		- }
109		- return $this->makeNode($tag);
110		- } catch (\InvalidArgumentException $e) {
111		- throw new BadRequest('Invalid tag id', 0, $e);
112		- } catch (TagNotFoundException $e) {
113		- throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
114		- }
115		- }
116		-
117		- public function getChildren() {
118		- $visibilityFilter = true;
119		- if ($this->isAdmin()) {
120		- $visibilityFilter = null;
121		- }
122		-
123		- $tags = $this->tagManager->getAllTags($visibilityFilter);
124		- return array_map(function ($tag) {
125		- return $this->makeNode($tag);
126		- }, $tags);
127		- }
128		-
129		- /**
130		- * @param string $name
131		- */
132		- public function childExists($name) {
133		- try {
134		- $tag = $this->tagManager->getTagsByIds([$name]);
135		- $tag = current($tag);
136		- if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
137		- return false;
138		- }
139		- return true;
140		- } catch (\InvalidArgumentException $e) {
141		- throw new BadRequest('Invalid tag id', 0, $e);
142		- } catch (TagNotFoundException $e) {
143		- return false;
144		- }
145		- }
146		-
147		- public function delete() {
148		- throw new Forbidden('Permission denied to delete this collection');
149		- }
150		-
151		- public function getName() {
152		- return 'systemtags';
153		- }
154		-
155		- public function setName($name) {
156		- throw new Forbidden('Permission denied to rename this collection');
157		- }
158		-
159		- /**
160		- * Returns the last modification time, as a unix timestamp
161		- *
162		- * @return int
163		- */
164		- public function getLastModified() {
165		- return null;
166		- }
167		-
168		- /**
169		- * Create a sabre node for the given system tag
170		- *
171		- * @param ISystemTag $tag
172		- *
173		- * @return SystemTagNode
174		- */
175		- private function makeNode(ISystemTag $tag) {
176		- return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
177		- }
	38	+ /**
	39	+ * @var ISystemTagManager
	40	+ */
	41	+ private $tagManager;
	42	+
	43	+ /**
	44	+ * @var IGroupManager
	45	+ */
	46	+ private $groupManager;
	47	+
	48	+ /**
	49	+ * @var IUserSession
	50	+ */
	51	+ private $userSession;
	52	+
	53	+ /**
	54	+ * SystemTagsByIdCollection constructor.
	55	+ *
	56	+ * @param ISystemTagManager $tagManager
	57	+ * @param IUserSession $userSession
	58	+ * @param IGroupManager $groupManager
	59	+ */
	60	+ public function __construct(
	61	+ ISystemTagManager $tagManager,
	62	+ IUserSession $userSession,
	63	+ IGroupManager $groupManager
	64	+ ) {
	65	+ $this->tagManager = $tagManager;
	66	+ $this->userSession = $userSession;
	67	+ $this->groupManager = $groupManager;
	68	+ }
	69	+
	70	+ /**
	71	+ * Returns whether the currently logged in user is an administrator
	72	+ *
	73	+ * @return bool true if the user is an admin
	74	+ */
	75	+ private function isAdmin() {
	76	+ $user = $this->userSession->getUser();
	77	+ if ($user !== null) {
	78	+ return $this->groupManager->isAdmin($user->getUID());
	79	+ }
	80	+ return false;
	81	+ }
	82	+
	83	+ /**
	84	+ * @param string $name
	85	+ * @param resource\|string $data Initial payload
	86	+ * @throws Forbidden
	87	+ */
	88	+ public function createFile($name, $data = null) {
	89	+ throw new Forbidden('Cannot create tags by id');
	90	+ }
	91	+
	92	+ /**
	93	+ * @param string $name
	94	+ */
	95	+ public function createDirectory($name) {
	96	+ throw new Forbidden('Permission denied to create collections');
	97	+ }
	98	+
	99	+ /**
	100	+ * @param string $name
	101	+ */
	102	+ public function getChild($name) {
	103	+ try {
	104	+ $tag = $this->tagManager->getTagsByIds([$name]);
	105	+ $tag = current($tag);
	106	+ if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
	107	+ throw new NotFound('Tag with id ' . $name . ' not found');
	108	+ }
	109	+ return $this->makeNode($tag);
	110	+ } catch (\InvalidArgumentException $e) {
	111	+ throw new BadRequest('Invalid tag id', 0, $e);
	112	+ } catch (TagNotFoundException $e) {
	113	+ throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
	114	+ }
	115	+ }
	116	+
	117	+ public function getChildren() {
	118	+ $visibilityFilter = true;
	119	+ if ($this->isAdmin()) {
	120	+ $visibilityFilter = null;
	121	+ }
	122	+
	123	+ $tags = $this->tagManager->getAllTags($visibilityFilter);
	124	+ return array_map(function ($tag) {
	125	+ return $this->makeNode($tag);
	126	+ }, $tags);
	127	+ }
	128	+
	129	+ /**
	130	+ * @param string $name
	131	+ */
	132	+ public function childExists($name) {
	133	+ try {
	134	+ $tag = $this->tagManager->getTagsByIds([$name]);
	135	+ $tag = current($tag);
	136	+ if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
	137	+ return false;
	138	+ }
	139	+ return true;
	140	+ } catch (\InvalidArgumentException $e) {
	141	+ throw new BadRequest('Invalid tag id', 0, $e);
	142	+ } catch (TagNotFoundException $e) {
	143	+ return false;
	144	+ }
	145	+ }
	146	+
	147	+ public function delete() {
	148	+ throw new Forbidden('Permission denied to delete this collection');
	149	+ }
	150	+
	151	+ public function getName() {
	152	+ return 'systemtags';
	153	+ }
	154	+
	155	+ public function setName($name) {
	156	+ throw new Forbidden('Permission denied to rename this collection');
	157	+ }
	158	+
	159	+ /**
	160	+ * Returns the last modification time, as a unix timestamp
	161	+ *
	162	+ * @return int
	163	+ */
	164	+ public function getLastModified() {
	165	+ return null;
	166	+ }
	167	+
	168	+ /**
	169	+ * Create a sabre node for the given system tag
	170	+ *
	171	+ * @param ISystemTag $tag
	172	+ *
	173	+ * @return SystemTagNode
	174	+ */
	175	+ private function makeNode(ISystemTag $tag) {
	176	+ return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
	177	+ }
178	178	}

		@@ -38,136 +38,136 @@
		block discarded – undo
38	38	*/
39	39	class SystemTagsObjectTypeCollection implements ICollection {
40	40
41		- /**
42		- * @var string
43		- */
44		- private $objectType;
45		-
46		- /**
47		- * @var ISystemTagManager
48		- */
49		- private $tagManager;
50		-
51		- /**
52		- * @var ISystemTagObjectMapper
53		- */
54		- private $tagMapper;
55		-
56		- /**
57		- * @var IGroupManager
58		- */
59		- private $groupManager;
60		-
61		- /**
62		- * @var IUserSession
63		- */
64		- private $userSession;
65		-
66		- /**
67		- * @var \Closure
68		- **/
69		- protected $childExistsFunction;
70		-
71		- /**
72		- * Constructor
73		- *
74		- * @param string $objectType object type
75		- * @param ISystemTagManager $tagManager
76		- * @param ISystemTagObjectMapper $tagMapper
77		- * @param IUserSession $userSession
78		- * @param IGroupManager $groupManager
79		- * @param \Closure $childExistsFunction
80		- */
81		- public function __construct(
82		- $objectType,
83		- ISystemTagManager $tagManager,
84		- ISystemTagObjectMapper $tagMapper,
85		- IUserSession $userSession,
86		- IGroupManager $groupManager,
87		- \Closure $childExistsFunction
88		- ) {
89		- $this->tagManager = $tagManager;
90		- $this->tagMapper = $tagMapper;
91		- $this->objectType = $objectType;
92		- $this->userSession = $userSession;
93		- $this->groupManager = $groupManager;
94		- $this->childExistsFunction = $childExistsFunction;
95		- }
96		-
97		- /**
98		- * @param string $name
99		- * @param resource\|string $data Initial payload
100		- * @return null\|string
101		- * @throws Forbidden
102		- */
103		- public function createFile($name, $data = null) {
104		- throw new Forbidden('Permission denied to create nodes');
105		- }
106		-
107		- /**
108		- * @param string $name
109		- * @throws Forbidden
110		- */
111		- public function createDirectory($name) {
112		- throw new Forbidden('Permission denied to create collections');
113		- }
114		-
115		- /**
116		- * @param string $objectId
117		- * @return SystemTagsObjectMappingCollection
118		- * @throws NotFound
119		- */
120		- public function getChild($objectId) {
121		- // make sure the object exists and is reachable
122		- if (!$this->childExists($objectId)) {
123		- throw new NotFound('Entity does not exist or is not available');
124		- }
125		- return new SystemTagsObjectMappingCollection(
126		- $objectId,
127		- $this->objectType,
128		- $this->userSession->getUser(),
129		- $this->tagManager,
130		- $this->tagMapper
131		- );
132		- }
133		-
134		- public function getChildren() {
135		- // do not list object ids
136		- throw new MethodNotAllowed();
137		- }
138		-
139		- /**
140		- * Checks if a child-node with the specified name exists
141		- *
142		- * @param string $name
143		- * @return bool
144		- */
145		- public function childExists($name) {
146		- return call_user_func($this->childExistsFunction, $name);
147		- }
148		-
149		- public function delete() {
150		- throw new Forbidden('Permission denied to delete this collection');
151		- }
152		-
153		- public function getName() {
154		- return $this->objectType;
155		- }
156		-
157		- /**
158		- * @param string $name
159		- * @throws Forbidden
160		- */
161		- public function setName($name) {
162		- throw new Forbidden('Permission denied to rename this collection');
163		- }
164		-
165		- /**
166		- * Returns the last modification time, as a unix timestamp
167		- *
168		- * @return int
169		- */
170		- public function getLastModified() {
171		- return null;
172		- }
	41	+ /**
	42	+ * @var string
	43	+ */
	44	+ private $objectType;
	45	+
	46	+ /**
	47	+ * @var ISystemTagManager
	48	+ */
	49	+ private $tagManager;
	50	+
	51	+ /**
	52	+ * @var ISystemTagObjectMapper
	53	+ */
	54	+ private $tagMapper;
	55	+
	56	+ /**
	57	+ * @var IGroupManager
	58	+ */
	59	+ private $groupManager;
	60	+
	61	+ /**
	62	+ * @var IUserSession
	63	+ */
	64	+ private $userSession;
	65	+
	66	+ /**
	67	+ * @var \Closure
	68	+ **/
	69	+ protected $childExistsFunction;
	70	+
	71	+ /**
	72	+ * Constructor
	73	+ *
	74	+ * @param string $objectType object type
	75	+ * @param ISystemTagManager $tagManager
	76	+ * @param ISystemTagObjectMapper $tagMapper
	77	+ * @param IUserSession $userSession
	78	+ * @param IGroupManager $groupManager
	79	+ * @param \Closure $childExistsFunction
	80	+ */
	81	+ public function __construct(
	82	+ $objectType,
	83	+ ISystemTagManager $tagManager,
	84	+ ISystemTagObjectMapper $tagMapper,
	85	+ IUserSession $userSession,
	86	+ IGroupManager $groupManager,
	87	+ \Closure $childExistsFunction
	88	+ ) {
	89	+ $this->tagManager = $tagManager;
	90	+ $this->tagMapper = $tagMapper;
	91	+ $this->objectType = $objectType;
	92	+ $this->userSession = $userSession;
	93	+ $this->groupManager = $groupManager;
	94	+ $this->childExistsFunction = $childExistsFunction;
	95	+ }
	96	+
	97	+ /**
	98	+ * @param string $name
	99	+ * @param resource\|string $data Initial payload
	100	+ * @return null\|string
	101	+ * @throws Forbidden
	102	+ */
	103	+ public function createFile($name, $data = null) {
	104	+ throw new Forbidden('Permission denied to create nodes');
	105	+ }
	106	+
	107	+ /**
	108	+ * @param string $name
	109	+ * @throws Forbidden
	110	+ */
	111	+ public function createDirectory($name) {
	112	+ throw new Forbidden('Permission denied to create collections');
	113	+ }
	114	+
	115	+ /**
	116	+ * @param string $objectId
	117	+ * @return SystemTagsObjectMappingCollection
	118	+ * @throws NotFound
	119	+ */
	120	+ public function getChild($objectId) {
	121	+ // make sure the object exists and is reachable
	122	+ if (!$this->childExists($objectId)) {
	123	+ throw new NotFound('Entity does not exist or is not available');
	124	+ }
	125	+ return new SystemTagsObjectMappingCollection(
	126	+ $objectId,
	127	+ $this->objectType,
	128	+ $this->userSession->getUser(),
	129	+ $this->tagManager,
	130	+ $this->tagMapper
	131	+ );
	132	+ }
	133	+
	134	+ public function getChildren() {
	135	+ // do not list object ids
	136	+ throw new MethodNotAllowed();
	137	+ }
	138	+
	139	+ /**
	140	+ * Checks if a child-node with the specified name exists
	141	+ *
	142	+ * @param string $name
	143	+ * @return bool
	144	+ */
	145	+ public function childExists($name) {
	146	+ return call_user_func($this->childExistsFunction, $name);
	147	+ }
	148	+
	149	+ public function delete() {
	150	+ throw new Forbidden('Permission denied to delete this collection');
	151	+ }
	152	+
	153	+ public function getName() {
	154	+ return $this->objectType;
	155	+ }
	156	+
	157	+ /**
	158	+ * @param string $name
	159	+ * @throws Forbidden
	160	+ */
	161	+ public function setName($name) {
	162	+ throw new Forbidden('Permission denied to rename this collection');
	163	+ }
	164	+
	165	+ /**
	166	+ * Returns the last modification time, as a unix timestamp
	167	+ *
	168	+ * @return int
	169	+ */
	170	+ public function getLastModified() {
	171	+ return null;
	172	+ }
173	173	}

		@@ -25,11 +25,11 @@
		block discarded – undo
25	25	use OCP\Capabilities\ICapability;
26	26
27	27	class Capabilities implements ICapability {
28		- public function getCapabilities() {
29		- return [
30		- 'dav' => [
31		- 'chunking' => '1.0',
32		- ]
33		- ];
34		- }
	28	+ public function getCapabilities() {
	29	+ return [
	30	+ 'dav' => [
	31	+ 'chunking' => '1.0',
	32	+ ]
	33	+ ];
	34	+ }
35	35	}

		@@ -36,87 +36,87 @@
		block discarded – undo
36	36	*/
37	37	class FutureFile implements \Sabre\DAV\IFile {
38	38
39		- /** @var Directory */
40		- private $root;
41		- /** @var string */
42		- private $name;
	39	+ /** @var Directory */
	40	+ private $root;
	41	+ /** @var string */
	42	+ private $name;
43	43
44		- /**
45		- * @param Directory $root
46		- * @param string $name
47		- */
48		- public function __construct(Directory $root, $name) {
49		- $this->root = $root;
50		- $this->name = $name;
51		- }
	44	+ /**
	45	+ * @param Directory $root
	46	+ * @param string $name
	47	+ */
	48	+ public function __construct(Directory $root, $name) {
	49	+ $this->root = $root;
	50	+ $this->name = $name;
	51	+ }
52	52
53		- /**
54		- * @inheritdoc
55		- */
56		- public function put($data) {
57		- throw new Forbidden('Permission denied to put into this file');
58		- }
	53	+ /**
	54	+ * @inheritdoc
	55	+ */
	56	+ public function put($data) {
	57	+ throw new Forbidden('Permission denied to put into this file');
	58	+ }
59	59
60		- /**
61		- * @inheritdoc
62		- */
63		- public function get() {
64		- $nodes = $this->root->getChildren();
65		- return AssemblyStream::wrap($nodes);
66		- }
	60	+ /**
	61	+ * @inheritdoc
	62	+ */
	63	+ public function get() {
	64	+ $nodes = $this->root->getChildren();
	65	+ return AssemblyStream::wrap($nodes);
	66	+ }
67	67
68		- /**
69		- * @inheritdoc
70		- */
71		- public function getContentType() {
72		- return 'application/octet-stream';
73		- }
	68	+ /**
	69	+ * @inheritdoc
	70	+ */
	71	+ public function getContentType() {
	72	+ return 'application/octet-stream';
	73	+ }
74	74
75		- /**
76		- * @inheritdoc
77		- */
78		- public function getETag() {
79		- return $this->root->getETag();
80		- }
	75	+ /**
	76	+ * @inheritdoc
	77	+ */
	78	+ public function getETag() {
	79	+ return $this->root->getETag();
	80	+ }
81	81
82		- /**
83		- * @inheritdoc
84		- */
85		- public function getSize() {
86		- $children = $this->root->getChildren();
87		- $sizes = array_map(function ($node) {
88		- /** @var IFile $node */
89		- return $node->getSize();
90		- }, $children);
	82	+ /**
	83	+ * @inheritdoc
	84	+ */
	85	+ public function getSize() {
	86	+ $children = $this->root->getChildren();
	87	+ $sizes = array_map(function ($node) {
	88	+ /** @var IFile $node */
	89	+ return $node->getSize();
	90	+ }, $children);
91	91
92		- return array_sum($sizes);
93		- }
	92	+ return array_sum($sizes);
	93	+ }
94	94
95		- /**
96		- * @inheritdoc
97		- */
98		- public function delete() {
99		- $this->root->delete();
100		- }
	95	+ /**
	96	+ * @inheritdoc
	97	+ */
	98	+ public function delete() {
	99	+ $this->root->delete();
	100	+ }
101	101
102		- /**
103		- * @inheritdoc
104		- */
105		- public function getName() {
106		- return $this->name;
107		- }
	102	+ /**
	103	+ * @inheritdoc
	104	+ */
	105	+ public function getName() {
	106	+ return $this->name;
	107	+ }
108	108
109		- /**
110		- * @inheritdoc
111		- */
112		- public function setName($name) {
113		- throw new Forbidden('Permission denied to rename this file');
114		- }
	109	+ /**
	110	+ * @inheritdoc
	111	+ */
	112	+ public function setName($name) {
	113	+ throw new Forbidden('Permission denied to rename this file');
	114	+ }
115	115
116		- /**
117		- * @inheritdoc
118		- */
119		- public function getLastModified() {
120		- return $this->root->getLastModified();
121		- }
	116	+ /**
	117	+ * @inheritdoc
	118	+ */
	119	+ public function getLastModified() {
	120	+ return $this->root->getLastModified();
	121	+ }
122	122	}

		@@ -31,35 +31,35 @@
		block discarded – undo
31	31	*/
32	32	class DeleteOrphanedSharesJob extends TimedJob {
33	33
34		- /**
35		- * Default interval in minutes
36		- *
37		- * @var int $defaultIntervalMin
38		- **/
39		- protected $defaultIntervalMin = 15;
	34	+ /**
	35	+ * Default interval in minutes
	36	+ *
	37	+ * @var int $defaultIntervalMin
	38	+ **/
	39	+ protected $defaultIntervalMin = 15;
40	40
41		- /**
42		- * sets the correct interval for this timed job
43		- */
44		- public function __construct() {
45		- $this->interval = $this->defaultIntervalMin * 60;
46		- }
	41	+ /**
	42	+ * sets the correct interval for this timed job
	43	+ */
	44	+ public function __construct() {
	45	+ $this->interval = $this->defaultIntervalMin * 60;
	46	+ }
47	47
48		- /**
49		- * Makes the background job do its work
50		- *
51		- * @param array $argument unused argument
52		- */
53		- public function run($argument) {
54		- $connection = \OC::$server->getDatabaseConnection();
55		- $logger = \OC::$server->getLogger();
	48	+ /**
	49	+ * Makes the background job do its work
	50	+ *
	51	+ * @param array $argument unused argument
	52	+ */
	53	+ public function run($argument) {
	54	+ $connection = \OC::$server->getDatabaseConnection();
	55	+ $logger = \OC::$server->getLogger();
56	56
57		- $sql =
58		- 'DELETE FROM `PREFIXshare` ' .
59		- 'WHERE `item_type` in (\'file\', \'folder\') ' .
60		- 'AND NOT EXISTS (SELECT `fileid` FROM `PREFIXfilecache` WHERE `file_source` = `fileid`)';
	57	+ $sql =
	58	+ 'DELETE FROM `PREFIXshare` ' .
	59	+ 'WHERE `item_type` in (\'file\', \'folder\') ' .
	60	+ 'AND NOT EXISTS (SELECT `fileid` FROM `PREFIXfilecache` WHERE `file_source` = `fileid`)';
61	61
62		- $deletedEntries = $connection->executeUpdate($sql);
63		- $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
64		- }
	62	+ $deletedEntries = $connection->executeUpdate($sql);
	63	+ $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
	64	+ }
65	65	}

		@@ -21,62 +21,62 @@
		block discarded – undo
21	21	*/
22	22
23	23	return [
24		- 'routes' => [
25		- [
26		- 'name' => 'RateLimitTest#userAndAnonProtected',
27		- 'url' => '/userAndAnonProtected',
28		- 'verb' => 'GET',
29		- ],
30		- [
31		- 'name' => 'RateLimitTest#onlyAnonProtected',
32		- 'url' => '/anonProtected',
33		- 'verb' => 'GET',
34		- ],
35		- ],
	24	+ 'routes' => [
	25	+ [
	26	+ 'name' => 'RateLimitTest#userAndAnonProtected',
	27	+ 'url' => '/userAndAnonProtected',
	28	+ 'verb' => 'GET',
	29	+ ],
	30	+ [
	31	+ 'name' => 'RateLimitTest#onlyAnonProtected',
	32	+ 'url' => '/anonProtected',
	33	+ 'verb' => 'GET',
	34	+ ],
	35	+ ],
36	36
37		- 'ocs' => [
38		- [
39		- 'name' => 'Config#setAppValue',
40		- 'url' => '/api/v1/app/{appid}/{configkey}',
41		- 'verb' => 'POST',
42		- ],
43		- [
44		- 'name' => 'Config#deleteAppValue',
45		- 'url' => '/api/v1/app/{appid}/{configkey}',
46		- 'verb' => 'DELETE',
47		- ],
48		- [
49		- 'name' => 'Locking#isLockingEnabled',
50		- 'url' => '/api/v1/lockprovisioning',
51		- 'verb' => 'GET',
52		- ],
53		- [
54		- 'name' => 'Locking#isLocked',
55		- 'url' => '/api/v1/lockprovisioning/{type}/{user}',
56		- 'verb' => 'GET',
57		- ],
58		- [
59		- 'name' => 'Locking#acquireLock',
60		- 'url' => '/api/v1/lockprovisioning/{type}/{user}',
61		- 'verb' => 'POST',
62		- ],
63		- [
64		- 'name' => 'Locking#changeLock',
65		- 'url' => '/api/v1/lockprovisioning/{type}/{user}',
66		- 'verb' => 'PUT',
67		- ],
68		- [
69		- 'name' => 'Locking#releaseLock',
70		- 'url' => '/api/v1/lockprovisioning/{type}/{user}',
71		- 'verb' => 'DELETE',
72		- ],
73		- [
74		- 'name' => 'Locking#releaseAll',
75		- 'url' => '/api/v1/lockprovisioning/{type}',
76		- 'verb' => 'DELETE',
77		- 'defaults' => [
78		- 'type' => null
79		- ]
80		- ],
81		- ],
	37	+ 'ocs' => [
	38	+ [
	39	+ 'name' => 'Config#setAppValue',
	40	+ 'url' => '/api/v1/app/{appid}/{configkey}',
	41	+ 'verb' => 'POST',
	42	+ ],
	43	+ [
	44	+ 'name' => 'Config#deleteAppValue',
	45	+ 'url' => '/api/v1/app/{appid}/{configkey}',
	46	+ 'verb' => 'DELETE',
	47	+ ],
	48	+ [
	49	+ 'name' => 'Locking#isLockingEnabled',
	50	+ 'url' => '/api/v1/lockprovisioning',
	51	+ 'verb' => 'GET',
	52	+ ],
	53	+ [
	54	+ 'name' => 'Locking#isLocked',
	55	+ 'url' => '/api/v1/lockprovisioning/{type}/{user}',
	56	+ 'verb' => 'GET',
	57	+ ],
	58	+ [
	59	+ 'name' => 'Locking#acquireLock',
	60	+ 'url' => '/api/v1/lockprovisioning/{type}/{user}',
	61	+ 'verb' => 'POST',
	62	+ ],
	63	+ [
	64	+ 'name' => 'Locking#changeLock',
	65	+ 'url' => '/api/v1/lockprovisioning/{type}/{user}',
	66	+ 'verb' => 'PUT',
	67	+ ],
	68	+ [
	69	+ 'name' => 'Locking#releaseLock',
	70	+ 'url' => '/api/v1/lockprovisioning/{type}/{user}',
	71	+ 'verb' => 'DELETE',
	72	+ ],
	73	+ [
	74	+ 'name' => 'Locking#releaseAll',
	75	+ 'url' => '/api/v1/lockprovisioning/{type}',
	76	+ 'verb' => 'DELETE',
	77	+ 'defaults' => [
	78	+ 'type' => null
	79	+ ]
	80	+ ],
	81	+ ],
82	82	];

		@@ -29,31 +29,31 @@
		block discarded – undo
29	29	*/
30	30	trait PriorityTrait {
31	31
32		- /** @var int initial priority */
33		- protected $priority = BackendService::PRIORITY_DEFAULT;
	32	+ /** @var int initial priority */
	33	+ protected $priority = BackendService::PRIORITY_DEFAULT;
34	34
35		- /**
36		- * @return int
37		- */
38		- public function getPriority() {
39		- return $this->priority;
40		- }
	35	+ /**
	36	+ * @return int
	37	+ */
	38	+ public function getPriority() {
	39	+ return $this->priority;
	40	+ }
41	41
42		- /**
43		- * @param int $priority
44		- * @return self
45		- */
46		- public function setPriority($priority) {
47		- $this->priority = $priority;
48		- return $this;
49		- }
	42	+ /**
	43	+ * @param int $priority
	44	+ * @return self
	45	+ */
	46	+ public function setPriority($priority) {
	47	+ $this->priority = $priority;
	48	+ return $this;
	49	+ }
50	50
51		- /**
52		- * @param PriorityTrait $a
53		- * @param PriorityTrait $b
54		- * @return int
55		- */
56		- public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
57		- return ($a->getPriority() - $b->getPriority());
58		- }
	51	+ /**
	52	+ * @param PriorityTrait $a
	53	+ * @param PriorityTrait $b
	54	+ * @return int
	55	+ */
	56	+ public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
	57	+ return ($a->getPriority() - $b->getPriority());
	58	+ }
59	59	}

nextcloud / server

Push — master ( 630edd...09718c )

Status

Category

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Indentation +140 added lines, -140 removed lines patch added patch discarded remove patch

Indentation +132 added lines, -132 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch