Inspection of "Merge pull request #21546 from nextcloud/techdebt/..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 284ca3...2651df )

by Joas

created 2020-06-23 18:55 UTC

Status

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

@@ -31,129 +31,129 @@
 block discarded – undo
  */
 trait FrontendDefinitionTrait {
 
-	/** @var string human-readable mechanism name */
-	private $text;
-
-	/** @var DefinitionParameter[] parameters for mechanism */
-	private $parameters = [];
-
-	/** @var string[] custom JS */
-	private $customJs = [];
-
-	/**
-	 * @return string
-	 */
-	public function getText() {
-		return $this->text;
-	}
-
-	/**
-	 * @param string $text
-	 * @return $this
-	 */
-	public function setText($text) {
-		$this->text = $text;
-		return $this;
-	}
-
-	/**
-	 * @param FrontendDefinitionTrait $a
-	 * @param FrontendDefinitionTrait $b
-	 * @return int
-	 */
-	public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
-		return strcmp($a->getText(), $b->getText());
-	}
-
-	/**
-	 * @return DefinitionParameter[]
-	 */
-	public function getParameters() {
-		return $this->parameters;
-	}
-
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return self
-	 */
-	public function addParameters(array $parameters) {
-		foreach ($parameters as $parameter) {
-			$this->addParameter($parameter);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param DefinitionParameter $parameter
-	 * @return self
-	 */
-	public function addParameter(DefinitionParameter $parameter) {
-		$this->parameters[$parameter->getName()] = $parameter;
-		return $this;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getCustomJs() {
-		return $this->customJs;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 */
-	public function addCustomJs($custom) {
-		$this->customJs[] = $custom;
-		return $this;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 * @deprecated 9.1.0, use addCustomJs() instead
-	 */
-	public function setCustomJs($custom) {
-		$this->customJs = [$custom];
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerializeDefinition() {
-		$configuration = [];
-		foreach ($this->getParameters() as $parameter) {
-			$configuration[$parameter->getName()] = $parameter;
-		}
-
-		$data = [
-			'name' => $this->getText(),
-			'configuration' => $configuration,
-			'custom' => $this->getCustomJs(),
-		];
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorageDefinition(StorageConfig $storage) {
-		foreach ($this->getParameters() as $name => $parameter) {
-			$value = $storage->getBackendOption($name);
-			if (!is_null($value) || !$parameter->isOptional()) {
-				if (!$parameter->validateValue($value)) {
-					return false;
-				}
-				$storage->setBackendOption($name, $value);
-			}
-		}
-		return true;
-	}
+    /** @var string human-readable mechanism name */
+    private $text;
+
+    /** @var DefinitionParameter[] parameters for mechanism */
+    private $parameters = [];
+
+    /** @var string[] custom JS */
+    private $customJs = [];
+
+    /**
+     * @return string
+     */
+    public function getText() {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     * @return $this
+     */
+    public function setText($text) {
+        $this->text = $text;
+        return $this;
+    }
+
+    /**
+     * @param FrontendDefinitionTrait $a
+     * @param FrontendDefinitionTrait $b
+     * @return int
+     */
+    public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
+        return strcmp($a->getText(), $b->getText());
+    }
+
+    /**
+     * @return DefinitionParameter[]
+     */
+    public function getParameters() {
+        return $this->parameters;
+    }
+
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return self
+     */
+    public function addParameters(array $parameters) {
+        foreach ($parameters as $parameter) {
+            $this->addParameter($parameter);
+        }
+        return $this;
+    }
+
+    /**
+     * @param DefinitionParameter $parameter
+     * @return self
+     */
+    public function addParameter(DefinitionParameter $parameter) {
+        $this->parameters[$parameter->getName()] = $parameter;
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getCustomJs() {
+        return $this->customJs;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     */
+    public function addCustomJs($custom) {
+        $this->customJs[] = $custom;
+        return $this;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     * @deprecated 9.1.0, use addCustomJs() instead
+     */
+    public function setCustomJs($custom) {
+        $this->customJs = [$custom];
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerializeDefinition() {
+        $configuration = [];
+        foreach ($this->getParameters() as $parameter) {
+            $configuration[$parameter->getName()] = $parameter;
+        }
+
+        $data = [
+            'name' => $this->getText(),
+            'configuration' => $configuration,
+            'custom' => $this->getCustomJs(),
+        ];
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorageDefinition(StorageConfig $storage) {
+        foreach ($this->getParameters() as $name => $parameter) {
+            $value = $storage->getBackendOption($name);
+            if (!is_null($value) || !$parameter->isOptional()) {
+                if (!$parameter->validateValue($value)) {
+                    return false;
+                }
+                $storage->setBackendOption($name, $value);
+            }
+        }
+        return true;
+    }
 
 }

Please login to merge, or discard this patch.

files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php 1 patch

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

@@ -29,15 +29,15 @@
 block discarded – undo
  * Authentication mechanism or backend has insufficient data
  */
 class InsufficientDataForMeaningfulAnswerException extends StorageNotAvailableException {
-	/**
-	 * StorageNotAvailableException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 6.0.0
-	 */
-	public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * StorageNotAvailableException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 6.0.0
+     */
+    public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
+        parent::__construct($message, $code, $previous);
+    }
 }

Please login to merge, or discard this patch.

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

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

@@ -28,76 +28,76 @@
 block discarded – undo
  */
 trait IdentifierTrait {
 
-	/** @var string */
-	protected $identifier;
+    /** @var string */
+    protected $identifier;
 
-	/** @var string[] */
-	protected $identifierAliases = [];
+    /** @var string[] */
+    protected $identifierAliases = [];
 
-	/** @var IdentifierTrait */
-	protected $deprecateTo = null;
+    /** @var IdentifierTrait */
+    protected $deprecateTo = null;
 
-	/**
-	 * @return string
-	 */
-	public function getIdentifier() {
-		return $this->identifier;
-	}
+    /**
+     * @return string
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
 
-	/**
-	 * @param string $identifier
-	 * @return $this
-	 */
-	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
-		$this->identifierAliases[] = $identifier;
-		return $this;
-	}
+    /**
+     * @param string $identifier
+     * @return $this
+     */
+    public function setIdentifier($identifier) {
+        $this->identifier = $identifier;
+        $this->identifierAliases[] = $identifier;
+        return $this;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getIdentifierAliases() {
-		return $this->identifierAliases;
-	}
+    /**
+     * @return string[]
+     */
+    public function getIdentifierAliases() {
+        return $this->identifierAliases;
+    }
 
-	/**
-	 * @param string $alias
-	 * @return $this
-	 */
-	public function addIdentifierAlias($alias) {
-		$this->identifierAliases[] = $alias;
-		return $this;
-	}
+    /**
+     * @param string $alias
+     * @return $this
+     */
+    public function addIdentifierAlias($alias) {
+        $this->identifierAliases[] = $alias;
+        return $this;
+    }
 
-	/**
-	 * @return object|null
-	 */
-	public function getDeprecateTo() {
-		return $this->deprecateTo;
-	}
+    /**
+     * @return object|null
+     */
+    public function getDeprecateTo() {
+        return $this->deprecateTo;
+    }
 
-	/**
-	 * @param object $destinationObject
-	 * @return self
-	 */
-	public function deprecateTo($destinationObject) {
-		$this->deprecateTo = $destinationObject;
-		return $this;
-	}
+    /**
+     * @param object $destinationObject
+     * @return self
+     */
+    public function deprecateTo($destinationObject) {
+        $this->deprecateTo = $destinationObject;
+        return $this;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function jsonSerializeIdentifier() {
-		$data = [
-			'identifier' => $this->identifier,
-			'identifierAliases' => $this->identifierAliases,
-		];
-		if ($this->deprecateTo) {
-			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
-		}
-		return $data;
-	}
+    /**
+     * @return array
+     */
+    public function jsonSerializeIdentifier() {
+        $data = [
+            'identifier' => $this->identifier,
+            'identifierAliases' => $this->identifierAliases,
+        ];
+        if ($this->deprecateTo) {
+            $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+        }
+        return $data;
+    }
 
 }

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.

lib/public/Route/IRouter.php 1 patch

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

@@ -36,91 +36,91 @@
 block discarded – undo
  */
 interface IRouter {
 
-	/**
-	 * Get the files to load the routes from
-	 *
-	 * @return string[]
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getRoutingFiles();
+    /**
+     * Get the files to load the routes from
+     *
+     * @return string[]
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getRoutingFiles();
 
-	/**
-	 * @return string
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getCacheKey();
+    /**
+     * @return string
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getCacheKey();
 
-	/**
-	 * Loads the routes
-	 *
-	 * @param null|string $app
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function loadRoutes($app = null);
+    /**
+     * Loads the routes
+     *
+     * @param null|string $app
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function loadRoutes($app = null);
 
-	/**
-	 * Sets the collection to use for adding routes
-	 *
-	 * @param string $name Name of the collection to use.
-	 * @return void
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function useCollection($name);
+    /**
+     * Sets the collection to use for adding routes
+     *
+     * @param string $name Name of the collection to use.
+     * @return void
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function useCollection($name);
 
-	/**
-	 * returns the current collection name in use for adding routes
-	 *
-	 * @return string the collection name
-	 * @since 8.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getCurrentCollection();
+    /**
+     * returns the current collection name in use for adding routes
+     *
+     * @return string the collection name
+     * @since 8.0.0
+     * @deprecated 9.0.0
+     */
+    public function getCurrentCollection();
 
-	/**
-	 * Create a \OCP\Route\IRoute.
-	 *
-	 * @param string $name Name of the route to create.
-	 * @param string $pattern The pattern to match
-	 * @param array $defaults An array of default parameter values
-	 * @param array $requirements An array of requirements for parameters (regexes)
-	 * @return \OCP\Route\IRoute
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function create($name, $pattern, array $defaults = [], array $requirements = []);
+    /**
+     * Create a \OCP\Route\IRoute.
+     *
+     * @param string $name Name of the route to create.
+     * @param string $pattern The pattern to match
+     * @param array $defaults An array of default parameter values
+     * @param array $requirements An array of requirements for parameters (regexes)
+     * @return \OCP\Route\IRoute
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function create($name, $pattern, array $defaults = [], array $requirements = []);
 
-	/**
-	 * Find the route matching $url.
-	 *
-	 * @param string $url The url to find
-	 * @throws \Exception
-	 * @return void
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function match($url);
+    /**
+     * Find the route matching $url.
+     *
+     * @param string $url The url to find
+     * @throws \Exception
+     * @return void
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function match($url);
 
-	/**
-	 * Get the url generator
-	 *
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getGenerator();
+    /**
+     * Get the url generator
+     *
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getGenerator();
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function generate($name, $parameters = [], $absolute = false);
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function generate($name, $parameters = [], $absolute = false);
 }

Please login to merge, or discard this patch.

lib/public/Files/LockNotAcquiredException.php 1 patch

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

@@ -36,27 +36,27 @@
 block discarded – undo
  * @since 7.0.0
  */
 class LockNotAcquiredException extends \Exception {
-	/** @var string $path The path that could not be locked */
-	public $path;
+    /** @var string $path The path that could not be locked */
+    public $path;
 
-	/** @var integer $lockType The type of the lock that was attempted */
-	public $lockType;
+    /** @var integer $lockType The type of the lock that was attempted */
+    public $lockType;
 
-	/**
-	 * @since 7.0.0
-	 */
-	public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
-		$message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * @since 7.0.0
+     */
+    public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
+        $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * custom string representation of object
-	 *
-	 * @return string
-	 * @since 7.0.0
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
-	}
+    /**
+     * custom string representation of object
+     *
+     * @return string
+     * @since 7.0.0
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
 }

Please login to merge, or discard this patch.

lib/public/DB/QueryBuilder/ICompositeExpression.php 1 patch

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

@@ -28,39 +28,39 @@
 block discarded – undo
  * @since 8.2.0
  */
 interface ICompositeExpression {
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function addMultiple(array $parts = []);
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function addMultiple(array $parts = []);
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function add($part);
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function add($part);
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function count();
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function count();
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType();
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType();
 }

Please login to merge, or discard this patch.

lib/public/ITagManager.php 1 patch

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

@@ -46,17 +46,17 @@
 block discarded – undo
  */
 interface ITagManager {
 
-	/**
-	 * Create a new \OCP\ITags instance and load tags from db for the current user.
-	 *
-	 * @see \OCP\ITags
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
-	 * logged in user
-	 * @return \OCP\ITags
-	 * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
-	 */
-	public function load($type, $defaultTags = [], $includeShared = false, $userId = null);
+    /**
+     * Create a new \OCP\ITags instance and load tags from db for the current user.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     * logged in user
+     * @return \OCP\ITags
+     * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
+     */
+    public function load($type, $defaultTags = [], $includeShared = false, $userId = null);
 }

Please login to merge, or discard this patch.

lib/public/Search/Result.php 1 patch

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

@@ -31,47 +31,47 @@
 block discarded – undo
  */
 class Result {
 
-	/**
-	 * A unique identifier for the result, usually given as the item ID in its
-	 * corresponding application.
-	 * @var string
-	 * @since 7.0.0
-	 */
-	public $id;
+    /**
+     * A unique identifier for the result, usually given as the item ID in its
+     * corresponding application.
+     * @var string
+     * @since 7.0.0
+     */
+    public $id;
 
-	/**
-	 * The name of the item returned; this will be displayed in the search
-	 * results.
-	 * @var string
-	 * @since 7.0.0
-	 */
-	public $name;
+    /**
+     * The name of the item returned; this will be displayed in the search
+     * results.
+     * @var string
+     * @since 7.0.0
+     */
+    public $name;
 
-	/**
-	 * URL to the application item.
-	 * @var string
-	 * @since 7.0.0
-	 */
-	public $link;
+    /**
+     * URL to the application item.
+     * @var string
+     * @since 7.0.0
+     */
+    public $link;
 
-	/**
-	 * The type of search result returned; for consistency, name this the same
-	 * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
-	 * @var string
-	 * @since 7.0.0
-	 */
-	public $type = 'generic';
+    /**
+     * The type of search result returned; for consistency, name this the same
+     * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
+     * @var string
+     * @since 7.0.0
+     */
+    public $type = 'generic';
 
-	/**
-	 * Create a new search result
-	 * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
-	 * @param string $name displayed text of result
-	 * @param string $link URL to the result within its app
-	 * @since 7.0.0
-	 */
-	public function __construct($id = null, $name = null, $link = null) {
-		$this->id = $id;
-		$this->name = $name;
-		$this->link = $link;
-	}
+    /**
+     * Create a new search result
+     * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
+     * @param string $name displayed text of result
+     * @param string $link URL to the result within its app
+     * @since 7.0.0
+     */
+    public function __construct($id = null, $name = null, $link = null) {
+        $this->id = $id;
+        $this->name = $name;
+        $this->link = $link;
+    }
 }

Please login to merge, or discard this patch.

		@@ -31,129 +31,129 @@
		block discarded – undo
31	31	*/
32	32	trait FrontendDefinitionTrait {
33	33
34		- /** @var string human-readable mechanism name */
35		- private $text;
36		-
37		- /** @var DefinitionParameter[] parameters for mechanism */
38		- private $parameters = [];
39		-
40		- /** @var string[] custom JS */
41		- private $customJs = [];
42		-
43		- /**
44		- * @return string
45		- */
46		- public function getText() {
47		- return $this->text;
48		- }
49		-
50		- /**
51		- * @param string $text
52		- * @return $this
53		- */
54		- public function setText($text) {
55		- $this->text = $text;
56		- return $this;
57		- }
58		-
59		- /**
60		- * @param FrontendDefinitionTrait $a
61		- * @param FrontendDefinitionTrait $b
62		- * @return int
63		- */
64		- public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
65		- return strcmp($a->getText(), $b->getText());
66		- }
67		-
68		- /**
69		- * @return DefinitionParameter[]
70		- */
71		- public function getParameters() {
72		- return $this->parameters;
73		- }
74		-
75		- /**
76		- * @param DefinitionParameter[] $parameters
77		- * @return self
78		- */
79		- public function addParameters(array $parameters) {
80		- foreach ($parameters as $parameter) {
81		- $this->addParameter($parameter);
82		- }
83		- return $this;
84		- }
85		-
86		- /**
87		- * @param DefinitionParameter $parameter
88		- * @return self
89		- */
90		- public function addParameter(DefinitionParameter $parameter) {
91		- $this->parameters[$parameter->getName()] = $parameter;
92		- return $this;
93		- }
94		-
95		- /**
96		- * @return string[]
97		- */
98		- public function getCustomJs() {
99		- return $this->customJs;
100		- }
101		-
102		- /**
103		- * @param string $custom
104		- * @return self
105		- */
106		- public function addCustomJs($custom) {
107		- $this->customJs[] = $custom;
108		- return $this;
109		- }
110		-
111		- /**
112		- * @param string $custom
113		- * @return self
114		- * @deprecated 9.1.0, use addCustomJs() instead
115		- */
116		- public function setCustomJs($custom) {
117		- $this->customJs = [$custom];
118		- return $this;
119		- }
120		-
121		- /**
122		- * Serialize into JSON for client-side JS
123		- *
124		- * @return array
125		- */
126		- public function jsonSerializeDefinition() {
127		- $configuration = [];
128		- foreach ($this->getParameters() as $parameter) {
129		- $configuration[$parameter->getName()] = $parameter;
130		- }
131		-
132		- $data = [
133		- 'name' => $this->getText(),
134		- 'configuration' => $configuration,
135		- 'custom' => $this->getCustomJs(),
136		- ];
137		- return $data;
138		- }
139		-
140		- /**
141		- * Check if parameters are satisfied in a StorageConfig
142		- *
143		- * @param StorageConfig $storage
144		- * @return bool
145		- */
146		- public function validateStorageDefinition(StorageConfig $storage) {
147		- foreach ($this->getParameters() as $name => $parameter) {
148		- $value = $storage->getBackendOption($name);
149		- if (!is_null($value) \|\| !$parameter->isOptional()) {
150		- if (!$parameter->validateValue($value)) {
151		- return false;
152		- }
153		- $storage->setBackendOption($name, $value);
154		- }
155		- }
156		- return true;
157		- }
	34	+ /** @var string human-readable mechanism name */
	35	+ private $text;
	36	+
	37	+ /** @var DefinitionParameter[] parameters for mechanism */
	38	+ private $parameters = [];
	39	+
	40	+ /** @var string[] custom JS */
	41	+ private $customJs = [];
	42	+
	43	+ /**
	44	+ * @return string
	45	+ */
	46	+ public function getText() {
	47	+ return $this->text;
	48	+ }
	49	+
	50	+ /**
	51	+ * @param string $text
	52	+ * @return $this
	53	+ */
	54	+ public function setText($text) {
	55	+ $this->text = $text;
	56	+ return $this;
	57	+ }
	58	+
	59	+ /**
	60	+ * @param FrontendDefinitionTrait $a
	61	+ * @param FrontendDefinitionTrait $b
	62	+ * @return int
	63	+ */
	64	+ public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
	65	+ return strcmp($a->getText(), $b->getText());
	66	+ }
	67	+
	68	+ /**
	69	+ * @return DefinitionParameter[]
	70	+ */
	71	+ public function getParameters() {
	72	+ return $this->parameters;
	73	+ }
	74	+
	75	+ /**
	76	+ * @param DefinitionParameter[] $parameters
	77	+ * @return self
	78	+ */
	79	+ public function addParameters(array $parameters) {
	80	+ foreach ($parameters as $parameter) {
	81	+ $this->addParameter($parameter);
	82	+ }
	83	+ return $this;
	84	+ }
	85	+
	86	+ /**
	87	+ * @param DefinitionParameter $parameter
	88	+ * @return self
	89	+ */
	90	+ public function addParameter(DefinitionParameter $parameter) {
	91	+ $this->parameters[$parameter->getName()] = $parameter;
	92	+ return $this;
	93	+ }
	94	+
	95	+ /**
	96	+ * @return string[]
	97	+ */
	98	+ public function getCustomJs() {
	99	+ return $this->customJs;
	100	+ }
	101	+
	102	+ /**
	103	+ * @param string $custom
	104	+ * @return self
	105	+ */
	106	+ public function addCustomJs($custom) {
	107	+ $this->customJs[] = $custom;
	108	+ return $this;
	109	+ }
	110	+
	111	+ /**
	112	+ * @param string $custom
	113	+ * @return self
	114	+ * @deprecated 9.1.0, use addCustomJs() instead
	115	+ */
	116	+ public function setCustomJs($custom) {
	117	+ $this->customJs = [$custom];
	118	+ return $this;
	119	+ }
	120	+
	121	+ /**
	122	+ * Serialize into JSON for client-side JS
	123	+ *
	124	+ * @return array
	125	+ */
	126	+ public function jsonSerializeDefinition() {
	127	+ $configuration = [];
	128	+ foreach ($this->getParameters() as $parameter) {
	129	+ $configuration[$parameter->getName()] = $parameter;
	130	+ }
	131	+
	132	+ $data = [
	133	+ 'name' => $this->getText(),
	134	+ 'configuration' => $configuration,
	135	+ 'custom' => $this->getCustomJs(),
	136	+ ];
	137	+ return $data;
	138	+ }
	139	+
	140	+ /**
	141	+ * Check if parameters are satisfied in a StorageConfig
	142	+ *
	143	+ * @param StorageConfig $storage
	144	+ * @return bool
	145	+ */
	146	+ public function validateStorageDefinition(StorageConfig $storage) {
	147	+ foreach ($this->getParameters() as $name => $parameter) {
	148	+ $value = $storage->getBackendOption($name);
	149	+ if (!is_null($value) \|\| !$parameter->isOptional()) {
	150	+ if (!$parameter->validateValue($value)) {
	151	+ return false;
	152	+ }
	153	+ $storage->setBackendOption($name, $value);
	154	+ }
	155	+ }
	156	+ return true;
	157	+ }
158	158
159	159	}

		@@ -29,15 +29,15 @@
		block discarded – undo
29	29	* Authentication mechanism or backend has insufficient data
30	30	*/
31	31	class InsufficientDataForMeaningfulAnswerException extends StorageNotAvailableException {
32		- /**
33		- * StorageNotAvailableException constructor.
34		- *
35		- * @param string $message
36		- * @param int $code
37		- * @param \Exception\|null $previous
38		- * @since 6.0.0
39		- */
40		- public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
41		- parent::__construct($message, $code, $previous);
42		- }
	32	+ /**
	33	+ * StorageNotAvailableException constructor.
	34	+ *
	35	+ * @param string $message
	36	+ * @param int $code
	37	+ * @param \Exception\|null $previous
	38	+ * @since 6.0.0
	39	+ */
	40	+ public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
	41	+ parent::__construct($message, $code, $previous);
	42	+ }
43	43	}

		@@ -28,76 +28,76 @@
		block discarded – undo
28	28	*/
29	29	trait IdentifierTrait {
30	30
31		- /** @var string */
32		- protected $identifier;
	31	+ /** @var string */
	32	+ protected $identifier;
33	33
34		- /** @var string[] */
35		- protected $identifierAliases = [];
	34	+ /** @var string[] */
	35	+ protected $identifierAliases = [];
36	36
37		- /** @var IdentifierTrait */
38		- protected $deprecateTo = null;
	37	+ /** @var IdentifierTrait */
	38	+ protected $deprecateTo = null;
39	39
40		- /**
41		- * @return string
42		- */
43		- public function getIdentifier() {
44		- return $this->identifier;
45		- }
	40	+ /**
	41	+ * @return string
	42	+ */
	43	+ public function getIdentifier() {
	44	+ return $this->identifier;
	45	+ }
46	46
47		- /**
48		- * @param string $identifier
49		- * @return $this
50		- */
51		- public function setIdentifier($identifier) {
52		- $this->identifier = $identifier;
53		- $this->identifierAliases[] = $identifier;
54		- return $this;
55		- }
	47	+ /**
	48	+ * @param string $identifier
	49	+ * @return $this
	50	+ */
	51	+ public function setIdentifier($identifier) {
	52	+ $this->identifier = $identifier;
	53	+ $this->identifierAliases[] = $identifier;
	54	+ return $this;
	55	+ }
56	56
57		- /**
58		- * @return string[]
59		- */
60		- public function getIdentifierAliases() {
61		- return $this->identifierAliases;
62		- }
	57	+ /**
	58	+ * @return string[]
	59	+ */
	60	+ public function getIdentifierAliases() {
	61	+ return $this->identifierAliases;
	62	+ }
63	63
64		- /**
65		- * @param string $alias
66		- * @return $this
67		- */
68		- public function addIdentifierAlias($alias) {
69		- $this->identifierAliases[] = $alias;
70		- return $this;
71		- }
	64	+ /**
	65	+ * @param string $alias
	66	+ * @return $this
	67	+ */
	68	+ public function addIdentifierAlias($alias) {
	69	+ $this->identifierAliases[] = $alias;
	70	+ return $this;
	71	+ }
72	72
73		- /**
74		- * @return object\|null
75		- */
76		- public function getDeprecateTo() {
77		- return $this->deprecateTo;
78		- }
	73	+ /**
	74	+ * @return object\|null
	75	+ */
	76	+ public function getDeprecateTo() {
	77	+ return $this->deprecateTo;
	78	+ }
79	79
80		- /**
81		- * @param object $destinationObject
82		- * @return self
83		- */
84		- public function deprecateTo($destinationObject) {
85		- $this->deprecateTo = $destinationObject;
86		- return $this;
87		- }
	80	+ /**
	81	+ * @param object $destinationObject
	82	+ * @return self
	83	+ */
	84	+ public function deprecateTo($destinationObject) {
	85	+ $this->deprecateTo = $destinationObject;
	86	+ return $this;
	87	+ }
88	88
89		- /**
90		- * @return array
91		- */
92		- public function jsonSerializeIdentifier() {
93		- $data = [
94		- 'identifier' => $this->identifier,
95		- 'identifierAliases' => $this->identifierAliases,
96		- ];
97		- if ($this->deprecateTo) {
98		- $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
99		- }
100		- return $data;
101		- }
	89	+ /**
	90	+ * @return array
	91	+ */
	92	+ public function jsonSerializeIdentifier() {
	93	+ $data = [
	94	+ 'identifier' => $this->identifier,
	95	+ 'identifierAliases' => $this->identifierAliases,
	96	+ ];
	97	+ if ($this->deprecateTo) {
	98	+ $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
	99	+ }
	100	+ return $data;
	101	+ }
102	102
103	103	}

		@@ -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	];

		@@ -36,91 +36,91 @@
		block discarded – undo
36	36	*/
37	37	interface IRouter {
38	38
39		- /**
40		- * Get the files to load the routes from
41		- *
42		- * @return string[]
43		- * @since 7.0.0
44		- * @deprecated 9.0.0
45		- */
46		- public function getRoutingFiles();
	39	+ /**
	40	+ * Get the files to load the routes from
	41	+ *
	42	+ * @return string[]
	43	+ * @since 7.0.0
	44	+ * @deprecated 9.0.0
	45	+ */
	46	+ public function getRoutingFiles();
47	47
48		- /**
49		- * @return string
50		- * @since 7.0.0
51		- * @deprecated 9.0.0
52		- */
53		- public function getCacheKey();
	48	+ /**
	49	+ * @return string
	50	+ * @since 7.0.0
	51	+ * @deprecated 9.0.0
	52	+ */
	53	+ public function getCacheKey();
54	54
55		- /**
56		- * Loads the routes
57		- *
58		- * @param null\|string $app
59		- * @since 7.0.0
60		- * @deprecated 9.0.0
61		- */
62		- public function loadRoutes($app = null);
	55	+ /**
	56	+ * Loads the routes
	57	+ *
	58	+ * @param null\|string $app
	59	+ * @since 7.0.0
	60	+ * @deprecated 9.0.0
	61	+ */
	62	+ public function loadRoutes($app = null);
63	63
64		- /**
65		- * Sets the collection to use for adding routes
66		- *
67		- * @param string $name Name of the collection to use.
68		- * @return void
69		- * @since 7.0.0
70		- * @deprecated 9.0.0
71		- */
72		- public function useCollection($name);
	64	+ /**
	65	+ * Sets the collection to use for adding routes
	66	+ *
	67	+ * @param string $name Name of the collection to use.
	68	+ * @return void
	69	+ * @since 7.0.0
	70	+ * @deprecated 9.0.0
	71	+ */
	72	+ public function useCollection($name);
73	73
74		- /**
75		- * returns the current collection name in use for adding routes
76		- *
77		- * @return string the collection name
78		- * @since 8.0.0
79		- * @deprecated 9.0.0
80		- */
81		- public function getCurrentCollection();
	74	+ /**
	75	+ * returns the current collection name in use for adding routes
	76	+ *
	77	+ * @return string the collection name
	78	+ * @since 8.0.0
	79	+ * @deprecated 9.0.0
	80	+ */
	81	+ public function getCurrentCollection();
82	82
83		- /**
84		- * Create a \OCP\Route\IRoute.
85		- *
86		- * @param string $name Name of the route to create.
87		- * @param string $pattern The pattern to match
88		- * @param array $defaults An array of default parameter values
89		- * @param array $requirements An array of requirements for parameters (regexes)
90		- * @return \OCP\Route\IRoute
91		- * @since 7.0.0
92		- * @deprecated 9.0.0
93		- */
94		- public function create($name, $pattern, array $defaults = [], array $requirements = []);
	83	+ /**
	84	+ * Create a \OCP\Route\IRoute.
	85	+ *
	86	+ * @param string $name Name of the route to create.
	87	+ * @param string $pattern The pattern to match
	88	+ * @param array $defaults An array of default parameter values
	89	+ * @param array $requirements An array of requirements for parameters (regexes)
	90	+ * @return \OCP\Route\IRoute
	91	+ * @since 7.0.0
	92	+ * @deprecated 9.0.0
	93	+ */
	94	+ public function create($name, $pattern, array $defaults = [], array $requirements = []);
95	95
96		- /**
97		- * Find the route matching $url.
98		- *
99		- * @param string $url The url to find
100		- * @throws \Exception
101		- * @return void
102		- * @since 7.0.0
103		- * @deprecated 9.0.0
104		- */
105		- public function match($url);
	96	+ /**
	97	+ * Find the route matching $url.
	98	+ *
	99	+ * @param string $url The url to find
	100	+ * @throws \Exception
	101	+ * @return void
	102	+ * @since 7.0.0
	103	+ * @deprecated 9.0.0
	104	+ */
	105	+ public function match($url);
106	106
107		- /**
108		- * Get the url generator
109		- *
110		- * @since 7.0.0
111		- * @deprecated 9.0.0
112		- */
113		- public function getGenerator();
	107	+ /**
	108	+ * Get the url generator
	109	+ *
	110	+ * @since 7.0.0
	111	+ * @deprecated 9.0.0
	112	+ */
	113	+ public function getGenerator();
114	114
115		- /**
116		- * Generate url based on $name and $parameters
117		- *
118		- * @param string $name Name of the route to use.
119		- * @param array $parameters Parameters for the route
120		- * @param bool $absolute
121		- * @return string
122		- * @since 7.0.0
123		- * @deprecated 9.0.0
124		- */
125		- public function generate($name, $parameters = [], $absolute = false);
	115	+ /**
	116	+ * Generate url based on $name and $parameters
	117	+ *
	118	+ * @param string $name Name of the route to use.
	119	+ * @param array $parameters Parameters for the route
	120	+ * @param bool $absolute
	121	+ * @return string
	122	+ * @since 7.0.0
	123	+ * @deprecated 9.0.0
	124	+ */
	125	+ public function generate($name, $parameters = [], $absolute = false);
126	126	}

		@@ -36,27 +36,27 @@
		block discarded – undo
36	36	* @since 7.0.0
37	37	*/
38	38	class LockNotAcquiredException extends \Exception {
39		- /** @var string $path The path that could not be locked */
40		- public $path;
	39	+ /** @var string $path The path that could not be locked */
	40	+ public $path;
41	41
42		- /** @var integer $lockType The type of the lock that was attempted */
43		- public $lockType;
	42	+ /** @var integer $lockType The type of the lock that was attempted */
	43	+ public $lockType;
44	44
45		- /**
46		- * @since 7.0.0
47		- */
48		- public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
49		- $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
50		- parent::__construct($message, $code, $previous);
51		- }
	45	+ /**
	46	+ * @since 7.0.0
	47	+ */
	48	+ public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
	49	+ $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
	50	+ parent::__construct($message, $code, $previous);
	51	+ }
52	52
53		- /**
54		- * custom string representation of object
55		- *
56		- * @return string
57		- * @since 7.0.0
58		- */
59		- public function __toString() {
60		- return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
61		- }
	53	+ /**
	54	+ * custom string representation of object
	55	+ *
	56	+ * @return string
	57	+ * @since 7.0.0
	58	+ */
	59	+ public function __toString() {
	60	+ return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
	61	+ }
62	62	}

		@@ -28,39 +28,39 @@
		block discarded – undo
28	28	* @since 8.2.0
29	29	*/
30	30	interface ICompositeExpression {
31		- /**
32		- * Adds multiple parts to composite expression.
33		- *
34		- * @param array $parts
35		- *
36		- * @return ICompositeExpression
37		- * @since 8.2.0
38		- */
39		- public function addMultiple(array $parts = []);
	31	+ /**
	32	+ * Adds multiple parts to composite expression.
	33	+ *
	34	+ * @param array $parts
	35	+ *
	36	+ * @return ICompositeExpression
	37	+ * @since 8.2.0
	38	+ */
	39	+ public function addMultiple(array $parts = []);
40	40
41		- /**
42		- * Adds an expression to composite expression.
43		- *
44		- * @param mixed $part
45		- *
46		- * @return ICompositeExpression
47		- * @since 8.2.0
48		- */
49		- public function add($part);
	41	+ /**
	42	+ * Adds an expression to composite expression.
	43	+ *
	44	+ * @param mixed $part
	45	+ *
	46	+ * @return ICompositeExpression
	47	+ * @since 8.2.0
	48	+ */
	49	+ public function add($part);
50	50
51		- /**
52		- * Retrieves the amount of expressions on composite expression.
53		- *
54		- * @return integer
55		- * @since 8.2.0
56		- */
57		- public function count();
	51	+ /**
	52	+ * Retrieves the amount of expressions on composite expression.
	53	+ *
	54	+ * @return integer
	55	+ * @since 8.2.0
	56	+ */
	57	+ public function count();
58	58
59		- /**
60		- * Returns the type of this composite expression (AND/OR).
61		- *
62		- * @return string
63		- * @since 8.2.0
64		- */
65		- public function getType();
	59	+ /**
	60	+ * Returns the type of this composite expression (AND/OR).
	61	+ *
	62	+ * @return string
	63	+ * @since 8.2.0
	64	+ */
	65	+ public function getType();
66	66	}

		@@ -46,17 +46,17 @@
		block discarded – undo
46	46	*/
47	47	interface ITagManager {
48	48
49		- /**
50		- * Create a new \OCP\ITags instance and load tags from db for the current user.
51		- *
52		- * @see \OCP\ITags
53		- * @param string $type The type identifier e.g. 'contact' or 'event'.
54		- * @param array $defaultTags An array of default tags to be used if none are stored.
55		- * @param boolean $includeShared Whether to include tags for items shared with this user by others.
56		- * @param string $userId user for which to retrieve the tags, defaults to the currently
57		- * logged in user
58		- * @return \OCP\ITags
59		- * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
60		- */
61		- public function load($type, $defaultTags = [], $includeShared = false, $userId = null);
	49	+ /**
	50	+ * Create a new \OCP\ITags instance and load tags from db for the current user.
	51	+ *
	52	+ * @see \OCP\ITags
	53	+ * @param string $type The type identifier e.g. 'contact' or 'event'.
	54	+ * @param array $defaultTags An array of default tags to be used if none are stored.
	55	+ * @param boolean $includeShared Whether to include tags for items shared with this user by others.
	56	+ * @param string $userId user for which to retrieve the tags, defaults to the currently
	57	+ * logged in user
	58	+ * @return \OCP\ITags
	59	+ * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
	60	+ */
	61	+ public function load($type, $defaultTags = [], $includeShared = false, $userId = null);
62	62	}

		@@ -31,47 +31,47 @@
		block discarded – undo
31	31	*/
32	32	class Result {
33	33
34		- /**
35		- * A unique identifier for the result, usually given as the item ID in its
36		- * corresponding application.
37		- * @var string
38		- * @since 7.0.0
39		- */
40		- public $id;
	34	+ /**
	35	+ * A unique identifier for the result, usually given as the item ID in its
	36	+ * corresponding application.
	37	+ * @var string
	38	+ * @since 7.0.0
	39	+ */
	40	+ public $id;
41	41
42		- /**
43		- * The name of the item returned; this will be displayed in the search
44		- * results.
45		- * @var string
46		- * @since 7.0.0
47		- */
48		- public $name;
	42	+ /**
	43	+ * The name of the item returned; this will be displayed in the search
	44	+ * results.
	45	+ * @var string
	46	+ * @since 7.0.0
	47	+ */
	48	+ public $name;
49	49
50		- /**
51		- * URL to the application item.
52		- * @var string
53		- * @since 7.0.0
54		- */
55		- public $link;
	50	+ /**
	51	+ * URL to the application item.
	52	+ * @var string
	53	+ * @since 7.0.0
	54	+ */
	55	+ public $link;
56	56
57		- /**
58		- * The type of search result returned; for consistency, name this the same
59		- * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
60		- * @var string
61		- * @since 7.0.0
62		- */
63		- public $type = 'generic';
	57	+ /**
	58	+ * The type of search result returned; for consistency, name this the same
	59	+ * as the class name (e.g. \OC\Search\File -> 'file') in lowercase.
	60	+ * @var string
	61	+ * @since 7.0.0
	62	+ */
	63	+ public $type = 'generic';
64	64
65		- /**
66		- * Create a new search result
67		- * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
68		- * @param string $name displayed text of result
69		- * @param string $link URL to the result within its app
70		- * @since 7.0.0
71		- */
72		- public function __construct($id = null, $name = null, $link = null) {
73		- $this->id = $id;
74		- $this->name = $name;
75		- $this->link = $link;
76		- }
	65	+ /**
	66	+ * Create a new search result
	67	+ * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
	68	+ * @param string $name displayed text of result
	69	+ * @param string $link URL to the result within its app
	70	+ * @since 7.0.0
	71	+ */
	72	+ public function __construct($id = null, $name = null, $link = null) {
	73	+ $this->id = $id;
	74	+ $this->name = $name;
	75	+ $this->link = $link;
	76	+ }
77	77	}

nextcloud / server

Push — master ( 284ca3...2651df )

Status

Category

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

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

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

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

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

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

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

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

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