nextcloud / server

lib/public/AppFramework/Http.php

Indentation +59 added lines, -59 removed lines

@@ -35,63 +35,63 @@
  */
 class Http {
 
-	const STATUS_CONTINUE = 100;
-	const STATUS_SWITCHING_PROTOCOLS = 101;
-	const STATUS_PROCESSING = 102;
-	const STATUS_OK = 200;
-	const STATUS_CREATED = 201;
-	const STATUS_ACCEPTED = 202;
-	const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
-	const STATUS_NO_CONTENT = 204;
-	const STATUS_RESET_CONTENT = 205;
-	const STATUS_PARTIAL_CONTENT = 206;
-	const STATUS_MULTI_STATUS = 207;
-	const STATUS_ALREADY_REPORTED = 208;
-	const STATUS_IM_USED = 226;
-	const STATUS_MULTIPLE_CHOICES = 300;
-	const STATUS_MOVED_PERMANENTLY = 301;
-	const STATUS_FOUND = 302;
-	const STATUS_SEE_OTHER = 303;
-	const STATUS_NOT_MODIFIED = 304;
-	const STATUS_USE_PROXY = 305;
-	const STATUS_RESERVED = 306;
-	const STATUS_TEMPORARY_REDIRECT = 307;
-	const STATUS_BAD_REQUEST = 400;
-	const STATUS_UNAUTHORIZED = 401;
-	const STATUS_PAYMENT_REQUIRED = 402;
-	const STATUS_FORBIDDEN = 403;
-	const STATUS_NOT_FOUND = 404;
-	const STATUS_METHOD_NOT_ALLOWED = 405;
-	const STATUS_NOT_ACCEPTABLE = 406;
-	const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
-	const STATUS_REQUEST_TIMEOUT = 408;
-	const STATUS_CONFLICT = 409;
-	const STATUS_GONE = 410;
-	const STATUS_LENGTH_REQUIRED = 411;
-	const STATUS_PRECONDITION_FAILED = 412;
-	const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
-	const STATUS_REQUEST_URI_TOO_LONG = 414;
-	const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
-	const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-	const STATUS_EXPECTATION_FAILED = 417;
-	const STATUS_IM_A_TEAPOT = 418;
-	const STATUS_UNPROCESSABLE_ENTITY = 422;
-	const STATUS_LOCKED = 423;
-	const STATUS_FAILED_DEPENDENCY = 424;
-	const STATUS_UPGRADE_REQUIRED = 426;
-	const STATUS_PRECONDITION_REQUIRED = 428;
-	const STATUS_TOO_MANY_REQUESTS = 429;
-	const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	const STATUS_INTERNAL_SERVER_ERROR = 500;
-	const STATUS_NOT_IMPLEMENTED = 501;
-	const STATUS_BAD_GATEWAY = 502;
-	const STATUS_SERVICE_UNAVAILABLE = 503;
-	const STATUS_GATEWAY_TIMEOUT = 504;
-	const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
-	const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
-	const STATUS_INSUFFICIENT_STORAGE = 507;
-	const STATUS_LOOP_DETECTED = 508;
-	const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
-	const STATUS_NOT_EXTENDED = 510;
-	const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+    const STATUS_CONTINUE = 100;
+    const STATUS_SWITCHING_PROTOCOLS = 101;
+    const STATUS_PROCESSING = 102;
+    const STATUS_OK = 200;
+    const STATUS_CREATED = 201;
+    const STATUS_ACCEPTED = 202;
+    const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+    const STATUS_NO_CONTENT = 204;
+    const STATUS_RESET_CONTENT = 205;
+    const STATUS_PARTIAL_CONTENT = 206;
+    const STATUS_MULTI_STATUS = 207;
+    const STATUS_ALREADY_REPORTED = 208;
+    const STATUS_IM_USED = 226;
+    const STATUS_MULTIPLE_CHOICES = 300;
+    const STATUS_MOVED_PERMANENTLY = 301;
+    const STATUS_FOUND = 302;
+    const STATUS_SEE_OTHER = 303;
+    const STATUS_NOT_MODIFIED = 304;
+    const STATUS_USE_PROXY = 305;
+    const STATUS_RESERVED = 306;
+    const STATUS_TEMPORARY_REDIRECT = 307;
+    const STATUS_BAD_REQUEST = 400;
+    const STATUS_UNAUTHORIZED = 401;
+    const STATUS_PAYMENT_REQUIRED = 402;
+    const STATUS_FORBIDDEN = 403;
+    const STATUS_NOT_FOUND = 404;
+    const STATUS_METHOD_NOT_ALLOWED = 405;
+    const STATUS_NOT_ACCEPTABLE = 406;
+    const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+    const STATUS_REQUEST_TIMEOUT = 408;
+    const STATUS_CONFLICT = 409;
+    const STATUS_GONE = 410;
+    const STATUS_LENGTH_REQUIRED = 411;
+    const STATUS_PRECONDITION_FAILED = 412;
+    const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+    const STATUS_REQUEST_URI_TOO_LONG = 414;
+    const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+    const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+    const STATUS_EXPECTATION_FAILED = 417;
+    const STATUS_IM_A_TEAPOT = 418;
+    const STATUS_UNPROCESSABLE_ENTITY = 422;
+    const STATUS_LOCKED = 423;
+    const STATUS_FAILED_DEPENDENCY = 424;
+    const STATUS_UPGRADE_REQUIRED = 426;
+    const STATUS_PRECONDITION_REQUIRED = 428;
+    const STATUS_TOO_MANY_REQUESTS = 429;
+    const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    const STATUS_INTERNAL_SERVER_ERROR = 500;
+    const STATUS_NOT_IMPLEMENTED = 501;
+    const STATUS_BAD_GATEWAY = 502;
+    const STATUS_SERVICE_UNAVAILABLE = 503;
+    const STATUS_GATEWAY_TIMEOUT = 504;
+    const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+    const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+    const STATUS_INSUFFICIENT_STORAGE = 507;
+    const STATUS_LOOP_DETECTED = 508;
+    const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+    const STATUS_NOT_EXTENDED = 510;
+    const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
 }

lib/public/AppFramework/IAppContainer.php

Indentation +50 added lines, -50 removed lines

@@ -38,61 +38,61 @@
  */
 interface IAppContainer extends IContainer {
 
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 * @since 6.0.0
-	 */
-	function getAppName();
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     * @since 6.0.0
+     */
+    function getAppName();
 
-	/**
-	 * @deprecated 8.0.0 implements only deprecated methods
-	 * @return IApi
-	 * @since 6.0.0
-	 */
-	function getCoreApi();
+    /**
+     * @deprecated 8.0.0 implements only deprecated methods
+     * @return IApi
+     * @since 6.0.0
+     */
+    function getCoreApi();
 
-	/**
-	 * @return \OCP\IServerContainer
-	 * @since 6.0.0
-	 */
-	function getServer();
+    /**
+     * @return \OCP\IServerContainer
+     * @since 6.0.0
+     */
+    function getServer();
 
-	/**
-	 * @param string $middleWare
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	function registerMiddleWare($middleWare);
+    /**
+     * @param string $middleWare
+     * @return boolean
+     * @since 6.0.0
+     */
+    function registerMiddleWare($middleWare);
 
-	/**
-	 * @deprecated 8.0.0 use IUserSession->isLoggedIn()
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	function isLoggedIn();
+    /**
+     * @deprecated 8.0.0 use IUserSession->isLoggedIn()
+     * @return boolean
+     * @since 6.0.0
+     */
+    function isLoggedIn();
 
-	/**
-	 * @deprecated 8.0.0 use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	function isAdminUser();
+    /**
+     * @deprecated 8.0.0 use IGroupManager->isAdmin($userId)
+     * @return boolean
+     * @since 6.0.0
+     */
+    function isAdminUser();
 
-	/**
-	 * @deprecated 8.0.0 use the ILogger instead
-	 * @param string $message
-	 * @param string $level
-	 * @return mixed
-	 * @since 6.0.0
-	 */
-	function log($message, $level);
+    /**
+     * @deprecated 8.0.0 use the ILogger instead
+     * @param string $message
+     * @param string $level
+     * @return mixed
+     * @since 6.0.0
+     */
+    function log($message, $level);
 
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 * @since 8.2.0
-	 */
-	 public function registerCapability($serviceName);
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     * @since 8.2.0
+     */
+        public function registerCapability($serviceName);
 }

lib/public/AppFramework/OCS/OCSForbiddenException.php

Indentation +10 added lines, -11 removed lines

@@ -1,6 +1,5 @@ 
 <?php
 /**
-
  *
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
@@ -32,14 +31,14 @@ 
  * @since 9.1.0
  */
 class OCSForbiddenException extends OCSException {
-	/**
-	 * OCSForbiddenException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
-	}
+    /**
+     * OCSForbiddenException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
+    }
 }

lib/public/AppFramework/OCS/OCSBadRequestException.php

Indentation +10 added lines, -11 removed lines

@@ -1,6 +1,5 @@ 
 <?php
 /**
-
  *
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
@@ -32,15 +31,15 @@ 
  * @since 9.1.0
  */
 class OCSBadRequestException extends OCSException {
-	/**
-	 * OCSBadRequestException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
-	}
+    /**
+     * OCSBadRequestException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
+    }
 
 }

lib/public/AppFramework/OCS/OCSNotFoundException.php

Indentation +10 added lines, -11 removed lines

@@ -1,6 +1,5 @@ 
 <?php
 /**
-
  *
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
@@ -32,14 +31,14 @@ 
  * @since 9.1.0
  */
 class OCSNotFoundException extends OCSException {
-	/**
-	 * OCSNotFoundException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
-	}
+    /**
+     * OCSNotFoundException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
+    }
 }

lib/public/AppFramework/OCS/OCSException.php

Indentation -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 /**
-
  *
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *

lib/public/AppFramework/Controller.php

Indentation +213 added lines, -213 removed lines

@@ -45,219 +45,219 @@
  */
 abstract class Controller {
 
-	/**
-	 * app name
-	 * @var string
-	 * @since 7.0.0
-	 */
-	protected $appName;
-
-	/**
-	 * current request
-	 * @var \OCP\IRequest
-	 * @since 6.0.0
-	 */
-	protected $request;
-
-	/**
-	 * @var array
-	 * @since 7.0.0
-	 */
-	private $responders;
-
-	/**
-	 * constructor of the controller
-	 * @param string $appName the name of the app
-	 * @param IRequest $request an instance of the request
-	 * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
-	 */
-	public function __construct($appName,
-	                            IRequest $request) {
-		$this->appName = $appName;
-		$this->request = $request;
-
-		// default responders
-		$this->responders = array(
-			'json' => function ($data) {
-				if ($data instanceof DataResponse) {
-					$response = new JSONResponse(
-						$data->getData(),
-						$data->getStatus()
-					);
-					$dataHeaders = $data->getHeaders();
-					$headers = $response->getHeaders();
-					// do not overwrite Content-Type if it already exists
-					if (isset($dataHeaders['Content-Type'])) {
-						unset($headers['Content-Type']);
-					}
-					$response->setHeaders(array_merge($dataHeaders, $headers));
-					return $response;
-				}
-				return new JSONResponse($data);
-			}
-		);
-	}
-
-
-	/**
-	 * Parses an HTTP accept header and returns the supported responder type
-	 * @param string $acceptHeader
-	 * @return string the responder type
-	 * @since 7.0.0
-	 * @since 9.1.0 Added default parameter
-	 */
-	public function getResponderByHTTPHeader($acceptHeader, $default='json') {
-		$headers = explode(',', $acceptHeader);
-
-		// return the first matching responder
-		foreach ($headers as $header) {
-			$header = strtolower(trim($header));
-
-			$responder = str_replace('application/', '', $header);
-
-			if (array_key_exists($responder, $this->responders)) {
-				return $responder;
-			}
-		}
-
-		// no matching header return default
-		return $default;
-	}
-
-
-	/**
-	 * Registers a formatter for a type
-	 * @param string $format
-	 * @param \Closure $responder
-	 * @since 7.0.0
-	 */
-	protected function registerResponder($format, \Closure $responder) {
-		$this->responders[$format] = $responder;
-	}
-
-
-	/**
-	 * Serializes and formats a response
-	 * @param mixed $response the value that was returned from a controller and
-	 * is not a Response instance
-	 * @param string $format the format for which a formatter has been registered
-	 * @throws \DomainException if format does not match a registered formatter
-	 * @return Response
-	 * @since 7.0.0
-	 */
-	public function buildResponse($response, $format='json') {
-		if(array_key_exists($format, $this->responders)) {
-
-			$responder = $this->responders[$format];
-
-			return $responder($response);
-
-		}
-		throw new \DomainException('No responder registered for format '.
-			$format . '!');
-	}
-
-
-	/**
-	 * Lets you access post and get parameters by the index
-	 * @deprecated 7.0.0 write your parameters as method arguments instead
-	 * @param string $key the key which you want to access in the URL Parameter
-	 *                     placeholder, $_POST or $_GET array.
-	 *                     The priority how they're returned is the following:
-	 *                     1. URL parameters
-	 *                     2. POST parameters
-	 *                     3. GET parameters
-	 * @param string $default If the key is not found, this value will be returned
-	 * @return mixed the content of the array
-	 * @since 6.0.0
-	 */
-	public function params($key, $default=null){
-		return $this->request->getParam($key, $default);
-	}
-
-
-	/**
-	 * Returns all params that were received, be it from the request
-	 * (as GET or POST) or through the URL by the route
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @return array the array with all parameters
-	 * @since 6.0.0
-	 */
-	public function getParams() {
-		return $this->request->getParams();
-	}
-
-
-	/**
-	 * Returns the method of the request
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @return string the method of the request (POST, GET, etc)
-	 * @since 6.0.0
-	 */
-	public function method() {
-		return $this->request->getMethod();
-	}
-
-
-	/**
-	 * Shortcut for accessing an uploaded file through the $_FILES array
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_FILES array
-	 * @return array the file in the $_FILES element
-	 * @since 6.0.0
-	 */
-	public function getUploadedFile($key) {
-		return $this->request->getUploadedFile($key);
-	}
-
-
-	/**
-	 * Shortcut for getting env variables
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_ENV array
-	 * @return array the value in the $_ENV element
-	 * @since 6.0.0
-	 */
-	public function env($key) {
-		return $this->request->getEnv($key);
-	}
-
-
-	/**
-	 * Shortcut for getting cookie variables
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_COOKIE array
-	 * @return array the value in the $_COOKIE element
-	 * @since 6.0.0
-	 */
-	public function cookie($key) {
-		return $this->request->getCookie($key);
-	}
-
-
-	/**
-	 * Shortcut for rendering a template
-	 * @deprecated 7.0.0 return a template response instead
-	 * @param string $templateName the name of the template
-	 * @param array $params the template parameters in key => value structure
-	 * @param string $renderAs user renders a full page, blank only your template
-	 *                          admin an entry in the admin settings
-	 * @param string[] $headers set additional headers in name/value pairs
-	 * @return \OCP\AppFramework\Http\TemplateResponse containing the page
-	 * @since 6.0.0
-	 */
-	public function render($templateName, array $params=array(),
-							$renderAs='user', array $headers=array()){
-		$response = new TemplateResponse($this->appName, $templateName);
-		$response->setParams($params);
-		$response->renderAs($renderAs);
-
-		foreach($headers as $name => $value){
-			$response->addHeader($name, $value);
-		}
-
-		return $response;
-	}
+    /**
+     * app name
+     * @var string
+     * @since 7.0.0
+     */
+    protected $appName;
+
+    /**
+     * current request
+     * @var \OCP\IRequest
+     * @since 6.0.0
+     */
+    protected $request;
+
+    /**
+     * @var array
+     * @since 7.0.0
+     */
+    private $responders;
+
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
+     */
+    public function __construct($appName,
+                                IRequest $request) {
+        $this->appName = $appName;
+        $this->request = $request;
+
+        // default responders
+        $this->responders = array(
+            'json' => function ($data) {
+                if ($data instanceof DataResponse) {
+                    $response = new JSONResponse(
+                        $data->getData(),
+                        $data->getStatus()
+                    );
+                    $dataHeaders = $data->getHeaders();
+                    $headers = $response->getHeaders();
+                    // do not overwrite Content-Type if it already exists
+                    if (isset($dataHeaders['Content-Type'])) {
+                        unset($headers['Content-Type']);
+                    }
+                    $response->setHeaders(array_merge($dataHeaders, $headers));
+                    return $response;
+                }
+                return new JSONResponse($data);
+            }
+        );
+    }
+
+
+    /**
+     * Parses an HTTP accept header and returns the supported responder type
+     * @param string $acceptHeader
+     * @return string the responder type
+     * @since 7.0.0
+     * @since 9.1.0 Added default parameter
+     */
+    public function getResponderByHTTPHeader($acceptHeader, $default='json') {
+        $headers = explode(',', $acceptHeader);
+
+        // return the first matching responder
+        foreach ($headers as $header) {
+            $header = strtolower(trim($header));
+
+            $responder = str_replace('application/', '', $header);
+
+            if (array_key_exists($responder, $this->responders)) {
+                return $responder;
+            }
+        }
+
+        // no matching header return default
+        return $default;
+    }
+
+
+    /**
+     * Registers a formatter for a type
+     * @param string $format
+     * @param \Closure $responder
+     * @since 7.0.0
+     */
+    protected function registerResponder($format, \Closure $responder) {
+        $this->responders[$format] = $responder;
+    }
+
+
+    /**
+     * Serializes and formats a response
+     * @param mixed $response the value that was returned from a controller and
+     * is not a Response instance
+     * @param string $format the format for which a formatter has been registered
+     * @throws \DomainException if format does not match a registered formatter
+     * @return Response
+     * @since 7.0.0
+     */
+    public function buildResponse($response, $format='json') {
+        if(array_key_exists($format, $this->responders)) {
+
+            $responder = $this->responders[$format];
+
+            return $responder($response);
+
+        }
+        throw new \DomainException('No responder registered for format '.
+            $format . '!');
+    }
+
+
+    /**
+     * Lets you access post and get parameters by the index
+     * @deprecated 7.0.0 write your parameters as method arguments instead
+     * @param string $key the key which you want to access in the URL Parameter
+     *                     placeholder, $_POST or $_GET array.
+     *                     The priority how they're returned is the following:
+     *                     1. URL parameters
+     *                     2. POST parameters
+     *                     3. GET parameters
+     * @param string $default If the key is not found, this value will be returned
+     * @return mixed the content of the array
+     * @since 6.0.0
+     */
+    public function params($key, $default=null){
+        return $this->request->getParam($key, $default);
+    }
+
+
+    /**
+     * Returns all params that were received, be it from the request
+     * (as GET or POST) or through the URL by the route
+     * @deprecated 7.0.0 use $this->request instead
+     * @return array the array with all parameters
+     * @since 6.0.0
+     */
+    public function getParams() {
+        return $this->request->getParams();
+    }
+
+
+    /**
+     * Returns the method of the request
+     * @deprecated 7.0.0 use $this->request instead
+     * @return string the method of the request (POST, GET, etc)
+     * @since 6.0.0
+     */
+    public function method() {
+        return $this->request->getMethod();
+    }
+
+
+    /**
+     * Shortcut for accessing an uploaded file through the $_FILES array
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_FILES array
+     * @return array the file in the $_FILES element
+     * @since 6.0.0
+     */
+    public function getUploadedFile($key) {
+        return $this->request->getUploadedFile($key);
+    }
+
+
+    /**
+     * Shortcut for getting env variables
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_ENV array
+     * @return array the value in the $_ENV element
+     * @since 6.0.0
+     */
+    public function env($key) {
+        return $this->request->getEnv($key);
+    }
+
+
+    /**
+     * Shortcut for getting cookie variables
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_COOKIE array
+     * @return array the value in the $_COOKIE element
+     * @since 6.0.0
+     */
+    public function cookie($key) {
+        return $this->request->getCookie($key);
+    }
+
+
+    /**
+     * Shortcut for rendering a template
+     * @deprecated 7.0.0 return a template response instead
+     * @param string $templateName the name of the template
+     * @param array $params the template parameters in key => value structure
+     * @param string $renderAs user renders a full page, blank only your template
+     *                          admin an entry in the admin settings
+     * @param string[] $headers set additional headers in name/value pairs
+     * @return \OCP\AppFramework\Http\TemplateResponse containing the page
+     * @since 6.0.0
+     */
+    public function render($templateName, array $params=array(),
+                            $renderAs='user', array $headers=array()){
+        $response = new TemplateResponse($this->appName, $templateName);
+        $response->setParams($params);
+        $response->renderAs($renderAs);
+
+        foreach($headers as $name => $value){
+            $response->addHeader($name, $value);
+        }
+
+        return $response;
+    }
 
 
 }

lib/public/AppFramework/ApiController.php

Indentation +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      * defaults to 'Authorization, Content-Type, Accept'
      * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
      * request should be cached, defaults to 1728000 seconds
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function __construct($appName,
                                 IRequest $request,
@@ -76,7 +76,7 @@ 
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function preflightedCors() {
         if(isset($this->request->server['HTTP_ORIGIN'])) {

lib/public/AppFramework/Db/MultipleObjectsReturnedException.php

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  */
 class MultipleObjectsReturnedException extends \Exception {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg){
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg){
+        parent::__construct($msg);
+    }
 
 }