nextcloud / server

lib/private/Route/Route.php

Indentation +115 added lines, -115 removed lines

@@ -33,128 +33,128 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = [$class, $function];
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = [$class, $function];
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = function ($param) use ($file) {
-			unset($param["_route"]);
-			$_GET = array_merge($_GET, $param);
-			unset($param);
-			require_once "$file";
-		} ;
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = function ($param) use ($file) {
+            unset($param["_route"]);
+            $_GET = array_merge($_GET, $param);
+            unset($param);
+            require_once "$file";
+        } ;
+        $this->action($function);
+    }
 }

lib/private/AppFramework/Http.php

Indentation +90 added lines, -90 removed lines

@@ -33,99 +33,99 @@
 use OCP\AppFramework\Http as BaseHttp;
 
 class Http extends BaseHttp {
-	private $server;
-	private $protocolVersion;
-	protected $headers;
+    private $server;
+    private $protocolVersion;
+    protected $headers;
 
-	/**
-	 * @param array $server $_SERVER
-	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-	 */
-	public function __construct($server, $protocolVersion = 'HTTP/1.1') {
-		$this->server = $server;
-		$this->protocolVersion = $protocolVersion;
+    /**
+     * @param array $server $_SERVER
+     * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+     */
+    public function __construct($server, $protocolVersion = 'HTTP/1.1') {
+        $this->server = $server;
+        $this->protocolVersion = $protocolVersion;
 
-		$this->headers = [
-			self::STATUS_CONTINUE => 'Continue',
-			self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-			self::STATUS_PROCESSING => 'Processing',
-			self::STATUS_OK => 'OK',
-			self::STATUS_CREATED => 'Created',
-			self::STATUS_ACCEPTED => 'Accepted',
-			self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-			self::STATUS_NO_CONTENT => 'No Content',
-			self::STATUS_RESET_CONTENT => 'Reset Content',
-			self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-			self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-			self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-			self::STATUS_IM_USED => 'IM Used', // RFC 3229
-			self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-			self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-			self::STATUS_FOUND => 'Found',
-			self::STATUS_SEE_OTHER => 'See Other',
-			self::STATUS_NOT_MODIFIED => 'Not Modified',
-			self::STATUS_USE_PROXY => 'Use Proxy',
-			self::STATUS_RESERVED => 'Reserved',
-			self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-			self::STATUS_BAD_REQUEST => 'Bad request',
-			self::STATUS_UNAUTHORIZED => 'Unauthorized',
-			self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-			self::STATUS_FORBIDDEN => 'Forbidden',
-			self::STATUS_NOT_FOUND => 'Not Found',
-			self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-			self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-			self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-			self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-			self::STATUS_CONFLICT => 'Conflict',
-			self::STATUS_GONE => 'Gone',
-			self::STATUS_LENGTH_REQUIRED => 'Length Required',
-			self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-			self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-			self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-			self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-			self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-			self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-			self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-			self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-			self::STATUS_LOCKED => 'Locked', // RFC 4918
-			self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-			self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-			self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-			self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-			self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-			self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-			self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-			self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-			self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-			self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-			self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-			self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-			self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-			self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-			self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-			self::STATUS_NOT_EXTENDED => 'Not extended',
-			self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-		];
-	}
+        $this->headers = [
+            self::STATUS_CONTINUE => 'Continue',
+            self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+            self::STATUS_PROCESSING => 'Processing',
+            self::STATUS_OK => 'OK',
+            self::STATUS_CREATED => 'Created',
+            self::STATUS_ACCEPTED => 'Accepted',
+            self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+            self::STATUS_NO_CONTENT => 'No Content',
+            self::STATUS_RESET_CONTENT => 'Reset Content',
+            self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+            self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+            self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+            self::STATUS_IM_USED => 'IM Used', // RFC 3229
+            self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+            self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+            self::STATUS_FOUND => 'Found',
+            self::STATUS_SEE_OTHER => 'See Other',
+            self::STATUS_NOT_MODIFIED => 'Not Modified',
+            self::STATUS_USE_PROXY => 'Use Proxy',
+            self::STATUS_RESERVED => 'Reserved',
+            self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+            self::STATUS_BAD_REQUEST => 'Bad request',
+            self::STATUS_UNAUTHORIZED => 'Unauthorized',
+            self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+            self::STATUS_FORBIDDEN => 'Forbidden',
+            self::STATUS_NOT_FOUND => 'Not Found',
+            self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+            self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+            self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+            self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+            self::STATUS_CONFLICT => 'Conflict',
+            self::STATUS_GONE => 'Gone',
+            self::STATUS_LENGTH_REQUIRED => 'Length Required',
+            self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+            self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+            self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+            self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+            self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+            self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+            self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+            self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+            self::STATUS_LOCKED => 'Locked', // RFC 4918
+            self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+            self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+            self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+            self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+            self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+            self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+            self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+            self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+            self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+            self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+            self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+            self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+            self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+            self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+            self::STATUS_NOT_EXTENDED => 'Not extended',
+            self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+        ];
+    }
 
 
-	/**
-	 * Gets the correct header
-	 * @param int Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
-	 * @return string
-	 */
-	public function getStatusHeader($status) {
-		// we have one change currently for the http 1.0 header that differs
-		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-		// if this differs any more, we want to create childclasses for this
-		if ($status === self::STATUS_TEMPORARY_REDIRECT
-			&& $this->protocolVersion === 'HTTP/1.0') {
-			$status = self::STATUS_FOUND;
-		}
+    /**
+     * Gets the correct header
+     * @param int Http::CONSTANT $status the constant from the Http class
+     * @param \DateTime $lastModified formatted last modified date
+     * @param string $ETag the etag
+     * @return string
+     */
+    public function getStatusHeader($status) {
+        // we have one change currently for the http 1.0 header that differs
+        // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+        // if this differs any more, we want to create childclasses for this
+        if ($status === self::STATUS_TEMPORARY_REDIRECT
+            && $this->protocolVersion === 'HTTP/1.0') {
+            $status = self::STATUS_FOUND;
+        }
 
-		return $this->protocolVersion . ' ' . $status . ' ' .
-			$this->headers[$status];
-	}
+        return $this->protocolVersion . ' ' . $status . ' ' .
+            $this->headers[$status];
+    }
 }

lib/private/Collaboration/AutoComplete/Manager.php

Indentation +45 added lines, -45 removed lines

@@ -29,54 +29,54 @@
 use OCP\IServerContainer;
 
 class Manager implements IManager {
-	/** @var string[] */
-	protected $sorters = [];
+    /** @var string[] */
+    protected $sorters = [];
 
-	/** @var ISorter[]  */
-	protected $sorterInstances = [];
-	/** @var IServerContainer */
-	private $c;
+    /** @var ISorter[]  */
+    protected $sorterInstances = [];
+    /** @var IServerContainer */
+    private $c;
 
-	public function __construct(IServerContainer $container) {
-		$this->c = $container;
-	}
+    public function __construct(IServerContainer $container) {
+        $this->c = $container;
+    }
 
-	public function runSorters(array $sorters, array &$sortArray, array $context) {
-		$sorterInstances = $this->getSorters();
-		while ($sorter = array_shift($sorters)) {
-			if (isset($sorterInstances[$sorter])) {
-				$sorterInstances[$sorter]->sort($sortArray, $context);
-			} else {
-				$this->c->getLogger()->warning('No sorter for ID "{id}", skipping', [
-					'app' => 'core', 'id' => $sorter
-				]);
-			}
-		}
-	}
+    public function runSorters(array $sorters, array &$sortArray, array $context) {
+        $sorterInstances = $this->getSorters();
+        while ($sorter = array_shift($sorters)) {
+            if (isset($sorterInstances[$sorter])) {
+                $sorterInstances[$sorter]->sort($sortArray, $context);
+            } else {
+                $this->c->getLogger()->warning('No sorter for ID "{id}", skipping', [
+                    'app' => 'core', 'id' => $sorter
+                ]);
+            }
+        }
+    }
 
-	public function registerSorter($className) {
-		$this->sorters[] = $className;
-	}
+    public function registerSorter($className) {
+        $this->sorters[] = $className;
+    }
 
-	protected function getSorters() {
-		if (count($this->sorterInstances) === 0) {
-			foreach ($this->sorters as $sorter) {
-				/** @var ISorter $instance */
-				$instance = $this->c->resolve($sorter);
-				if (!$instance instanceof ISorter) {
-					$this->c->getLogger()->notice('Skipping sorter which is not an instance of ISorter. Class name: {class}',
-						['app' => 'core', 'class' => $sorter]);
-					continue;
-				}
-				$sorterId = trim($instance->getId());
-				if (trim($sorterId) === '') {
-					$this->c->getLogger()->notice('Skipping sorter with empty ID. Class name: {class}',
-						['app' => 'core', 'class' => $sorter]);
-					continue;
-				}
-				$this->sorterInstances[$sorterId] = $instance;
-			}
-		}
-		return $this->sorterInstances;
-	}
+    protected function getSorters() {
+        if (count($this->sorterInstances) === 0) {
+            foreach ($this->sorters as $sorter) {
+                /** @var ISorter $instance */
+                $instance = $this->c->resolve($sorter);
+                if (!$instance instanceof ISorter) {
+                    $this->c->getLogger()->notice('Skipping sorter which is not an instance of ISorter. Class name: {class}',
+                        ['app' => 'core', 'class' => $sorter]);
+                    continue;
+                }
+                $sorterId = trim($instance->getId());
+                if (trim($sorterId) === '') {
+                    $this->c->getLogger()->notice('Skipping sorter with empty ID. Class name: {class}',
+                        ['app' => 'core', 'class' => $sorter]);
+                    continue;
+                }
+                $this->sorterInstances[$sorterId] = $instance;
+            }
+        }
+        return $this->sorterInstances;
+    }
 }

lib/public/Log/IFileBased.php

Indentation +8 added lines, -8 removed lines

@@ -30,13 +30,13 @@
  * @since 14.0.0
  */
 interface IFileBased {
-	/**
-	 * @since 14.0.0
-	 */
-	public function getLogFilePath():string;
+    /**
+     * @since 14.0.0
+     */
+    public function getLogFilePath():string;
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function getEntries(int $limit = 50, int $offset = 0): array;
+    /**
+     * @since 14.0.0
+     */
+    public function getEntries(int $limit = 50, int $offset = 0): array;
 }

lib/public/Template.php

Indentation +87 added lines, -87 removed lines

@@ -34,98 +34,98 @@
  * @since 8.0.0
  */
 class Template extends \OC_Template {
-	/**
-	 * Make OC_Helper::imagePath available as a simple function
-	 *
-	 * @see \OCP\IURLGenerator::imagePath
-	 *
-	 * @param string $app
-	 * @param string $image
-	 * @return string to the image
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function image_path($app, $image) {
-		return \image_path($app, $image);
-	}
+    /**
+     * Make OC_Helper::imagePath available as a simple function
+     *
+     * @see \OCP\IURLGenerator::imagePath
+     *
+     * @param string $app
+     * @param string $image
+     * @return string to the image
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function image_path($app, $image) {
+        return \image_path($app, $image);
+    }
 
 
-	/**
-	 * Make OC_Helper::mimetypeIcon available as a simple function
-	 *
-	 * @param string $mimetype
-	 * @return string to the image of this file type.
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function mimetype_icon($mimetype) {
-		return \mimetype_icon($mimetype);
-	}
+    /**
+     * Make OC_Helper::mimetypeIcon available as a simple function
+     *
+     * @param string $mimetype
+     * @return string to the image of this file type.
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function mimetype_icon($mimetype) {
+        return \mimetype_icon($mimetype);
+    }
 
-	/**
-	 * Make preview_icon available as a simple function
-	 *
-	 * @param string $path path to file
-	 * @return string to the preview of the image
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function preview_icon($path) {
-		return \preview_icon($path);
-	}
+    /**
+     * Make preview_icon available as a simple function
+     *
+     * @param string $path path to file
+     * @return string to the preview of the image
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function preview_icon($path) {
+        return \preview_icon($path);
+    }
 
-	/**
-	 * Make publicpreview_icon available as a simple function
-	 * Returns the path to the preview of the image.
-	 *
-	 * @param string $path of file
-	 * @param string $token
-	 * @return string link to the preview
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function publicPreview_icon($path, $token) {
-		return \publicPreview_icon($path, $token);
-	}
+    /**
+     * Make publicpreview_icon available as a simple function
+     * Returns the path to the preview of the image.
+     *
+     * @param string $path of file
+     * @param string $token
+     * @return string link to the preview
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function publicPreview_icon($path, $token) {
+        return \publicPreview_icon($path, $token);
+    }
 
-	/**
-	 * Make OC_Helper::humanFileSize available as a simple function
-	 * Example: 2048 to 2 kB.
-	 *
-	 * @param int $bytes in bytes
-	 * @return string size as string
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function human_file_size($bytes) {
-		return \human_file_size($bytes);
-	}
+    /**
+     * Make OC_Helper::humanFileSize available as a simple function
+     * Example: 2048 to 2 kB.
+     *
+     * @param int $bytes in bytes
+     * @return string size as string
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function human_file_size($bytes) {
+        return \human_file_size($bytes);
+    }
 
-	/**
-	 * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
-	 *
-	 * @param int $timestamp unix timestamp
-	 * @param boolean $dateOnly
-	 * @return string human readable interpretation of the timestamp
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 * @suppress PhanTypeMismatchArgument
-	 */
-	public static function relative_modified_date($timestamp, $dateOnly = false) {
-		return \relative_modified_date($timestamp, null, $dateOnly);
-	}
+    /**
+     * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
+     *
+     * @param int $timestamp unix timestamp
+     * @param boolean $dateOnly
+     * @return string human readable interpretation of the timestamp
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     * @suppress PhanTypeMismatchArgument
+     */
+    public static function relative_modified_date($timestamp, $dateOnly = false) {
+        return \relative_modified_date($timestamp, null, $dateOnly);
+    }
 
-	/**
-	 * Generate html code for an options block.
-	 *
-	 * @param array $options the options
-	 * @param mixed $selected which one is selected?
-	 * @param array $params the parameters
-	 * @return string html options
-	 * @since 8.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function html_select_options($options, $selected, $params = []) {
-		return \html_select_options($options, $selected, $params);
-	}
+    /**
+     * Generate html code for an options block.
+     *
+     * @param array $options the options
+     * @param mixed $selected which one is selected?
+     * @param array $params the parameters
+     * @return string html options
+     * @since 8.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function html_select_options($options, $selected, $params = []) {
+        return \html_select_options($options, $selected, $params);
+    }
 }

lib/public/ILogger.php

Indentation +135 added lines, -135 removed lines

@@ -41,149 +41,149 @@
  * @deprecated 20.0.0 use the PSR-3 logger \Psr\Log\LoggerInterface
  */
 interface ILogger {
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const DEBUG = 0;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const INFO = 1;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const WARN = 2;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const ERROR = 3;
-	/**
-	 * @since 14.0.0
-	 * @deprecated 20.0.0
-	 */
-	public const FATAL = 4;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const DEBUG = 0;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const INFO = 1;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const WARN = 2;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const ERROR = 3;
+    /**
+     * @since 14.0.0
+     * @deprecated 20.0.0
+     */
+    public const FATAL = 4;
 
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::emergency
-	 */
-	public function emergency(string $message, array $context = []);
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::emergency
+     */
+    public function emergency(string $message, array $context = []);
 
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::alert
-	 */
-	public function alert(string $message, array $context = []);
+    /**
+     * Action must be taken immediately.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::alert
+     */
+    public function alert(string $message, array $context = []);
 
-	/**
-	 * Critical conditions.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::critical
-	 */
-	public function critical(string $message, array $context = []);
+    /**
+     * Critical conditions.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::critical
+     */
+    public function critical(string $message, array $context = []);
 
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::error
-	 */
-	public function error(string $message, array $context = []);
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::error
+     */
+    public function error(string $message, array $context = []);
 
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::warning
-	 */
-	public function warning(string $message, array $context = []);
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::warning
+     */
+    public function warning(string $message, array $context = []);
 
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::notice
-	 */
-	public function notice(string $message, array $context = []);
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::notice
+     */
+    public function notice(string $message, array $context = []);
 
-	/**
-	 * Interesting events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::info
-	 */
-	public function info(string $message, array $context = []);
+    /**
+     * Interesting events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::info
+     */
+    public function info(string $message, array $context = []);
 
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::debug
-	 */
-	public function debug(string $message, array $context = []);
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::debug
+     */
+    public function debug(string $message, array $context = []);
 
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param int $level
-	 * @param string $message
-	 * @param array $context
-	 * @return mixed
-	 * @since 7.0.0
-	 * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::log
-	 */
-	public function log(int $level, string $message, array $context = []);
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param int $level
+     * @param string $message
+     * @param array $context
+     * @return mixed
+     * @since 7.0.0
+     * @deprecated 20.0.0 use \Psr\Log\LoggerInterface::log
+     */
+    public function log(int $level, string $message, array $context = []);
 
-	/**
-	 * Logs an exception very detailed
-	 * An additional message can we written to the log by adding it to the
-	 * context.
-	 *
-	 * <code>
-	 * $logger->logException($ex, [
-	 *     'message' => 'Exception during background job execution'
-	 * ]);
-	 * </code>
-	 *
-	 * @param \Exception|\Throwable $exception
-	 * @param array $context
-	 * @return void
-	 * @since 8.2.0
-	 * @deprecated 20.0.0 use the `exception` entry in the context of any method in \Psr\Log\LoggerInterface
-	 */
-	public function logException(\Throwable $exception, array $context = []);
+    /**
+     * Logs an exception very detailed
+     * An additional message can we written to the log by adding it to the
+     * context.
+     *
+     * <code>
+     * $logger->logException($ex, [
+     *     'message' => 'Exception during background job execution'
+     * ]);
+     * </code>
+     *
+     * @param \Exception|\Throwable $exception
+     * @param array $context
+     * @return void
+     * @since 8.2.0
+     * @deprecated 20.0.0 use the `exception` entry in the context of any method in \Psr\Log\LoggerInterface
+     */
+    public function logException(\Throwable $exception, array $context = []);
 }

lib/public/Activity/IExtension.php

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  * @since 8.0.0
  */
 interface IExtension {
-	public const METHOD_STREAM = 'stream';
-	public const METHOD_MAIL = 'email';
-	public const METHOD_NOTIFICATION = 'notification';
+    public const METHOD_STREAM = 'stream';
+    public const METHOD_MAIL = 'email';
+    public const METHOD_NOTIFICATION = 'notification';
 
-	public const PRIORITY_VERYLOW = 10;
-	public const PRIORITY_LOW = 20;
-	public const PRIORITY_MEDIUM = 30;
-	public const PRIORITY_HIGH = 40;
-	public const PRIORITY_VERYHIGH = 50;
+    public const PRIORITY_VERYLOW = 10;
+    public const PRIORITY_LOW = 20;
+    public const PRIORITY_MEDIUM = 30;
+    public const PRIORITY_HIGH = 40;
+    public const PRIORITY_VERYHIGH = 50;
 }

apps/weather_status/lib/Controller/WeatherStatusController.php

Indentation +101 added lines, -101 removed lines

@@ -33,115 +33,115 @@
 
 class WeatherStatusController extends OCSController {
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var WeatherStatusService */
-	private $service;
+    /** @var WeatherStatusService */
+    private $service;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								ILogger $logger,
-								WeatherStatusService $service,
-								?string $userId) {
-		parent::__construct($appName, $request);
-		$this->userId = $userId;
-		$this->logger = $logger;
-		$this->service = $service;
-	}
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ILogger $logger,
+                                WeatherStatusService $service,
+                                ?string $userId) {
+        parent::__construct($appName, $request);
+        $this->userId = $userId;
+        $this->logger = $logger;
+        $this->service = $service;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Try to use the address set in user personal settings as weather location
-	 *
-	 * @return DataResponse with success state and address information
-	 */
-	public function usePersonalAddress(): DataResponse {
-		return new DataResponse($this->service->usePersonalAddress());
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Try to use the address set in user personal settings as weather location
+     *
+     * @return DataResponse with success state and address information
+     */
+    public function usePersonalAddress(): DataResponse {
+        return new DataResponse($this->service->usePersonalAddress());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Change the weather status mode. There are currently 2 modes:
-	 * - ask the browser
-	 * - use the user defined address
-	 *
-	 * @param int $mode New mode
-	 * @return DataResponse success state
-	 */
-	public function setMode(int $mode): DataResponse {
-		return new DataResponse($this->service->setMode($mode));
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Change the weather status mode. There are currently 2 modes:
+     * - ask the browser
+     * - use the user defined address
+     *
+     * @param int $mode New mode
+     * @return DataResponse success state
+     */
+    public function setMode(int $mode): DataResponse {
+        return new DataResponse($this->service->setMode($mode));
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set address and resolve it to get coordinates
-	 * or directly set coordinates and get address with reverse geocoding
-	 *
-	 * @param string|null $address Any approximative or exact address
-	 * @param float|null $lat Latitude in decimal degree format
-	 * @param float|null $lon Longitude in decimal degree format
-	 * @return DataResponse with success state and address information
-	 */
-	public function setLocation(?string $address, ?float $lat, ?float $lon): DataResponse {
-		$currentWeather = $this->service->setLocation($address, $lat, $lon);
-		return new DataResponse($currentWeather);
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Set address and resolve it to get coordinates
+     * or directly set coordinates and get address with reverse geocoding
+     *
+     * @param string|null $address Any approximative or exact address
+     * @param float|null $lat Latitude in decimal degree format
+     * @param float|null $lon Longitude in decimal degree format
+     * @return DataResponse with success state and address information
+     */
+    public function setLocation(?string $address, ?float $lat, ?float $lon): DataResponse {
+        $currentWeather = $this->service->setLocation($address, $lat, $lon);
+        return new DataResponse($currentWeather);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get stored user location
-	 *
-	 * @return DataResponse which contains coordinates, formatted address and current weather status mode
-	 */
-	public function getLocation(): DataResponse {
-		$location = $this->service->getLocation();
-		return new DataResponse($location);
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Get stored user location
+     *
+     * @return DataResponse which contains coordinates, formatted address and current weather status mode
+     */
+    public function getLocation(): DataResponse {
+        $location = $this->service->getLocation();
+        return new DataResponse($location);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get forecast for current location
-	 *
-	 * @return DataResponse which contains success state and filtered forecast data
-	 */
-	public function getForecast(): DataResponse {
-		$forecast = $this->service->getForecast();
-		if (isset($forecast['success']) && $forecast['success'] === false) {
-			return new DataResponse($forecast, Http::STATUS_NOT_FOUND);
-		} else {
-			return new DataResponse($forecast);
-		}
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Get forecast for current location
+     *
+     * @return DataResponse which contains success state and filtered forecast data
+     */
+    public function getForecast(): DataResponse {
+        $forecast = $this->service->getForecast();
+        if (isset($forecast['success']) && $forecast['success'] === false) {
+            return new DataResponse($forecast, Http::STATUS_NOT_FOUND);
+        } else {
+            return new DataResponse($forecast);
+        }
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get favorites list
-	 *
-	 * @return DataResponse which contains the favorite list
-	 */
-	public function getFavorites(): DataResponse {
-		return new DataResponse($this->service->getFavorites());
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Get favorites list
+     *
+     * @return DataResponse which contains the favorite list
+     */
+    public function getFavorites(): DataResponse {
+        return new DataResponse($this->service->getFavorites());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set favorites list
-	 *
-	 * @param array $favorites
-	 * @return DataResponse success state
-	 */
-	public function setFavorites(array $favorites): DataResponse {
-		return new DataResponse($this->service->setFavorites($favorites));
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * Set favorites list
+     *
+     * @param array $favorites
+     * @return DataResponse success state
+     */
+    public function setFavorites(array $favorites): DataResponse {
+        return new DataResponse($this->service->setFavorites($favorites));
+    }
 }

apps/files_sharing/lib/Listener/ShareInteractionListener.php

Indentation +51 added lines, -51 removed lines

@@ -37,62 +37,62 @@
 use function in_array;
 
 class ShareInteractionListener implements IEventListener {
-	private const SUPPORTED_SHARE_TYPES = [
-		IShare::TYPE_USER,
-		IShare::TYPE_EMAIL,
-		IShare::TYPE_REMOTE,
-	];
+    private const SUPPORTED_SHARE_TYPES = [
+        IShare::TYPE_USER,
+        IShare::TYPE_EMAIL,
+        IShare::TYPE_REMOTE,
+    ];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(IEventDispatcher $dispatcher,
-								IUserManager $userManager,
-								ILogger $logger) {
-		$this->dispatcher = $dispatcher;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-	}
+    public function __construct(IEventDispatcher $dispatcher,
+                                IUserManager $userManager,
+                                ILogger $logger) {
+        $this->dispatcher = $dispatcher;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof ShareCreatedEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof ShareCreatedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$share = $event->getShare();
-		if (!in_array($share->getShareType(), self::SUPPORTED_SHARE_TYPES, true)) {
-			$this->logger->debug('Share type does not allow to emit interaction event');
-			return;
-		}
-		$actor = $this->userManager->get($share->getSharedBy());
-		$sharedWith = $this->userManager->get($share->getSharedWith());
-		if ($actor === null) {
-			$this->logger->warning('Share was not created by a user, can\'t emit interaction event');
-			return;
-		}
-		$interactionEvent = new ContactInteractedWithEvent($actor);
-		switch ($share->getShareType()) {
-			case IShare::TYPE_USER:
-				$interactionEvent->setUid($share->getSharedWith());
-				if ($sharedWith !== null) {
-					$interactionEvent->setFederatedCloudId($sharedWith->getCloudId());
-				}
-				break;
-			case IShare::TYPE_EMAIL:
-				$interactionEvent->setEmail($share->getSharedWith());
-				break;
-			case IShare::TYPE_REMOTE:
-				$interactionEvent->setFederatedCloudId($share->getSharedWith());
-				break;
-		}
+        $share = $event->getShare();
+        if (!in_array($share->getShareType(), self::SUPPORTED_SHARE_TYPES, true)) {
+            $this->logger->debug('Share type does not allow to emit interaction event');
+            return;
+        }
+        $actor = $this->userManager->get($share->getSharedBy());
+        $sharedWith = $this->userManager->get($share->getSharedWith());
+        if ($actor === null) {
+            $this->logger->warning('Share was not created by a user, can\'t emit interaction event');
+            return;
+        }
+        $interactionEvent = new ContactInteractedWithEvent($actor);
+        switch ($share->getShareType()) {
+            case IShare::TYPE_USER:
+                $interactionEvent->setUid($share->getSharedWith());
+                if ($sharedWith !== null) {
+                    $interactionEvent->setFederatedCloudId($sharedWith->getCloudId());
+                }
+                break;
+            case IShare::TYPE_EMAIL:
+                $interactionEvent->setEmail($share->getSharedWith());
+                break;
+            case IShare::TYPE_REMOTE:
+                $interactionEvent->setFederatedCloudId($share->getSharedWith());
+                break;
+        }
 
-		$this->dispatcher->dispatchTyped($interactionEvent);
-	}
+        $this->dispatcher->dispatchTyped($interactionEvent);
+    }
 }