nextcloud / server

lib/public/appframework/http/contentsecuritypolicy.php

Indentation +46 added lines, -46 removed lines

@@ -38,50 +38,50 @@
  * @since 8.1.0
  */
 class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
-	/** @var bool Whether inline JS snippets are allowed */
-	protected $inlineScriptAllowed = false;
-	/**
-	 * @var bool Whether eval in JS scripts is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/11925
-	 */
-	protected $evalScriptAllowed = true;
-	/** @var array Domains from which scripts can get loaded */
-	protected $allowedScriptDomains = [
-		'\'self\'',
-	];
-	/**
-	 * @var bool Whether inline CSS is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/13458
-	 */
-	protected $inlineStyleAllowed = true;
-	/** @var array Domains from which CSS can get loaded */
-	protected $allowedStyleDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which images can get loaded */
-	protected $allowedImageDomains = [
-		'\'self\'',
-		'data:',
-		'blob:',
-	];
-	/** @var array Domains to which connections can be done */
-	protected $allowedConnectDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which media elements can be loaded */
-	protected $allowedMediaDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which object elements can be loaded */
-	protected $allowedObjectDomains = [];
-	/** @var array Domains from which iframes can be loaded */
-	protected $allowedFrameDomains = [];
-	/** @var array Domains from which fonts can be loaded */
-	protected $allowedFontDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which web-workers and nested browsing content can load elements */
-	protected $allowedChildSrcDomains = [];
+    /** @var bool Whether inline JS snippets are allowed */
+    protected $inlineScriptAllowed = false;
+    /**
+     * @var bool Whether eval in JS scripts is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/11925
+     */
+    protected $evalScriptAllowed = true;
+    /** @var array Domains from which scripts can get loaded */
+    protected $allowedScriptDomains = [
+        '\'self\'',
+    ];
+    /**
+     * @var bool Whether inline CSS is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/13458
+     */
+    protected $inlineStyleAllowed = true;
+    /** @var array Domains from which CSS can get loaded */
+    protected $allowedStyleDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which images can get loaded */
+    protected $allowedImageDomains = [
+        '\'self\'',
+        'data:',
+        'blob:',
+    ];
+    /** @var array Domains to which connections can be done */
+    protected $allowedConnectDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which media elements can be loaded */
+    protected $allowedMediaDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which object elements can be loaded */
+    protected $allowedObjectDomains = [];
+    /** @var array Domains from which iframes can be loaded */
+    protected $allowedFrameDomains = [];
+    /** @var array Domains from which fonts can be loaded */
+    protected $allowedFontDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which web-workers and nested browsing content can load elements */
+    protected $allowedChildSrcDomains = [];
 }

lib/public/appframework/http/redirectresponse.php

Indentation +21 added lines, -21 removed lines

@@ -36,27 +36,27 @@
  */
 class RedirectResponse extends Response {
 
-	private $redirectURL;
-
-	/**
-	 * Creates a response that redirects to a url
-	 * @param string $redirectURL the url to redirect to
-	 * @since 7.0.0
-	 */
-	public function __construct($redirectURL) {
-		$this->redirectURL = $redirectURL;
-		$this->setStatus(Http::STATUS_SEE_OTHER);
-		$this->addHeader('Location', $redirectURL);
-	}
-
-
-	/**
-	 * @return string the url to redirect
-	 * @since 7.0.0
-	 */
-	public function getRedirectURL() {
-		return $this->redirectURL;
-	}
+    private $redirectURL;
+
+    /**
+     * Creates a response that redirects to a url
+     * @param string $redirectURL the url to redirect to
+     * @since 7.0.0
+     */
+    public function __construct($redirectURL) {
+        $this->redirectURL = $redirectURL;
+        $this->setStatus(Http::STATUS_SEE_OTHER);
+        $this->addHeader('Location', $redirectURL);
+    }
+
+
+    /**
+     * @return string the url to redirect
+     * @since 7.0.0
+     */
+    public function getRedirectURL() {
+        return $this->redirectURL;
+    }
 
 
 }

lib/public/appframework/http/notfoundresponse.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
  */
 class NotFoundResponse extends Response {
 
-	/**
-	 * @since 8.1.0
-	 */
-	public function __construct() {
-		$this->setStatus(404);
-	}
+    /**
+     * @since 8.1.0
+     */
+    public function __construct() {
+        $this->setStatus(404);
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function render() {
-		$template = new Template('core', '404', 'guest');
-		return $template->fetchPage();
-	}
+    /**
+     * @return string
+     * @since 8.1.0
+     */
+    public function render() {
+        $template = new Template('core', '404', 'guest');
+        return $template->fetchPage();
+    }
 }

lib/public/appframework/http/dataresponse.php

Indentation +35 added lines, -35 removed lines

@@ -37,48 +37,48 @@
  */
 class DataResponse extends Response {
 
-	/**
-	 * response data
-	 * @var array|object
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var array|object
+     */
+    protected $data;
 
 
-	/**
-	 * @param array|object $data the object or array that should be transformed
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @param array $headers additional key value based headers
-	 * @since 8.0.0
-	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
-	                            array $headers=array()) {
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-	}
+    /**
+     * @param array|object $data the object or array that should be transformed
+     * @param int $statusCode the Http status code, defaults to 200
+     * @param array $headers additional key value based headers
+     * @since 8.0.0
+     */
+    public function __construct($data=array(), $statusCode=Http::STATUS_OK,
+                                array $headers=array()) {
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+    }
 
 
-	/**
-	 * Sets values in the data json array
-	 * @param array|object $data an array or object which will be transformed
-	 * @return DataResponse Reference to this object
-	 * @since 8.0.0
-	 */
-	public function setData($data){
-		$this->data = $data;
+    /**
+     * Sets values in the data json array
+     * @param array|object $data an array or object which will be transformed
+     * @return DataResponse Reference to this object
+     * @since 8.0.0
+     */
+    public function setData($data){
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return array the data
-	 * @since 8.0.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return array the data
+     * @since 8.0.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 
 }

Spacing +4 added lines, -4 removed lines

@@ -50,8 +50,8 @@ 
 	 * @param array $headers additional key value based headers
 	 * @since 8.0.0
 	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
-	                            array $headers=array()) {
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK,
+	                            array $headers = array()) {
 		$this->data = $data;
 		$this->setStatus($statusCode);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
@@ -64,7 +64,7 @@ 
 	 * @return DataResponse Reference to this object
 	 * @since 8.0.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -76,7 +76,7 @@ 
 	 * @return array the data
 	 * @since 8.0.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 

lib/public/appframework/http/templateresponse.php

Indentation +119 added lines, -119 removed lines

@@ -37,124 +37,124 @@
  */
 class TemplateResponse extends Response {
 
-	/**
-	 * name of the template
-	 * @var string
-	 */
-	protected $templateName;
-
-	/**
-	 * parameters
-	 * @var array
-	 */
-	protected $params;
-
-	/**
-	 * rendering type (admin, user, blank)
-	 * @var string
-	 */
-	protected $renderAs;
-
-	/**
-	 * app name
-	 * @var string
-	 */
-	protected $appName;
-
-	/**
-	 * constructor of TemplateResponse
-	 * @param string $appName the name of the app to load the template from
-	 * @param string $templateName the name of the template
-	 * @param array $params an array of parameters which should be passed to the
-	 * template
-	 * @param string $renderAs how the page should be rendered, defaults to user
-	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
-	 */
-	public function __construct($appName, $templateName, array $params=array(),
-	                            $renderAs='user') {
-		$this->templateName = $templateName;
-		$this->appName = $appName;
-		$this->params = $params;
-		$this->renderAs = $renderAs;
-	}
-
-
-	/**
-	 * Sets template parameters
-	 * @param array $params an array with key => value structure which sets template
-	 *                      variables
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setParams(array $params){
-		$this->params = $params;
-
-		return $this;
-	}
-
-
-	/**
-	 * Used for accessing the set parameters
-	 * @return array the params
-	 * @since 6.0.0
-	 */
-	public function getParams(){
-		return $this->params;
-	}
-
-
-	/**
-	 * Used for accessing the name of the set template
-	 * @return string the name of the used template
-	 * @since 6.0.0
-	 */
-	public function getTemplateName(){
-		return $this->templateName;
-	}
-
-
-	/**
-	 * Sets the template page
-	 * @param string $renderAs admin, user or blank. Admin also prints the admin
-	 *                         settings header and footer, user renders the normal
-	 *                         normal page including footer and header and blank
-	 *                         just renders the plain template
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function renderAs($renderAs){
-		$this->renderAs = $renderAs;
-
-		return $this;
-	}
-
-
-	/**
-	 * Returns the set renderAs
-	 * @return string the renderAs value
-	 * @since 6.0.0
-	 */
-	public function getRenderAs(){
-		return $this->renderAs;
-	}
-
-
-	/**
-	 * Returns the rendered html
-	 * @return string the rendered html
-	 * @since 6.0.0
-	 */
-	public function render(){
-		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
-		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
-
-		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
-
-		foreach($this->params as $key => $value){
-			$template->assign($key, $value);
-		}
-
-		return $template->fetchPage();
-	}
+    /**
+     * name of the template
+     * @var string
+     */
+    protected $templateName;
+
+    /**
+     * parameters
+     * @var array
+     */
+    protected $params;
+
+    /**
+     * rendering type (admin, user, blank)
+     * @var string
+     */
+    protected $renderAs;
+
+    /**
+     * app name
+     * @var string
+     */
+    protected $appName;
+
+    /**
+     * constructor of TemplateResponse
+     * @param string $appName the name of the app to load the template from
+     * @param string $templateName the name of the template
+     * @param array $params an array of parameters which should be passed to the
+     * template
+     * @param string $renderAs how the page should be rendered, defaults to user
+     * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
+     */
+    public function __construct($appName, $templateName, array $params=array(),
+                                $renderAs='user') {
+        $this->templateName = $templateName;
+        $this->appName = $appName;
+        $this->params = $params;
+        $this->renderAs = $renderAs;
+    }
+
+
+    /**
+     * Sets template parameters
+     * @param array $params an array with key => value structure which sets template
+     *                      variables
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setParams(array $params){
+        $this->params = $params;
+
+        return $this;
+    }
+
+
+    /**
+     * Used for accessing the set parameters
+     * @return array the params
+     * @since 6.0.0
+     */
+    public function getParams(){
+        return $this->params;
+    }
+
+
+    /**
+     * Used for accessing the name of the set template
+     * @return string the name of the used template
+     * @since 6.0.0
+     */
+    public function getTemplateName(){
+        return $this->templateName;
+    }
+
+
+    /**
+     * Sets the template page
+     * @param string $renderAs admin, user or blank. Admin also prints the admin
+     *                         settings header and footer, user renders the normal
+     *                         normal page including footer and header and blank
+     *                         just renders the plain template
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function renderAs($renderAs){
+        $this->renderAs = $renderAs;
+
+        return $this;
+    }
+
+
+    /**
+     * Returns the set renderAs
+     * @return string the renderAs value
+     * @since 6.0.0
+     */
+    public function getRenderAs(){
+        return $this->renderAs;
+    }
+
+
+    /**
+     * Returns the rendered html
+     * @return string the rendered html
+     * @since 6.0.0
+     */
+    public function render(){
+        // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
+        $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
+
+        $template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
+
+        foreach($this->params as $key => $value){
+            $template->assign($key, $value);
+        }
+
+        return $template->fetchPage();
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -70,8 +70,8 @@ 
 	 * @param string $renderAs how the page should be rendered, defaults to user
 	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
 	 */
-	public function __construct($appName, $templateName, array $params=array(),
-	                            $renderAs='user') {
+	public function __construct($appName, $templateName, array $params = array(),
+	                            $renderAs = 'user') {
 		$this->templateName = $templateName;
 		$this->appName = $appName;
 		$this->params = $params;
@@ -86,7 +86,7 @@ 
 	 * @return TemplateResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function setParams(array $params){
+	public function setParams(array $params) {
 		$this->params = $params;
 
 		return $this;
@@ -98,7 +98,7 @@ 
 	 * @return array the params
 	 * @since 6.0.0
 	 */
-	public function getParams(){
+	public function getParams() {
 		return $this->params;
 	}
 
@@ -108,7 +108,7 @@ 
 	 * @return string the name of the used template
 	 * @since 6.0.0
 	 */
-	public function getTemplateName(){
+	public function getTemplateName() {
 		return $this->templateName;
 	}
 
@@ -122,7 +122,7 @@ 
 	 * @return TemplateResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function renderAs($renderAs){
+	public function renderAs($renderAs) {
 		$this->renderAs = $renderAs;
 
 		return $this;
@@ -134,7 +134,7 @@ 
 	 * @return string the renderAs value
 	 * @since 6.0.0
 	 */
-	public function getRenderAs(){
+	public function getRenderAs() {
 		return $this->renderAs;
 	}
 
@@ -144,13 +144,13 @@ 
 	 * @return string the rendered html
 	 * @since 6.0.0
 	 */
-	public function render(){
+	public function render() {
 		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
 		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
 
 		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
 
-		foreach($this->params as $key => $value){
+		foreach ($this->params as $key => $value) {
 			$template->assign($key, $value);
 		}
 

lib/public/appframework/http/streamresponse.php

Indentation +25 added lines, -25 removed lines

@@ -33,33 +33,33 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string $filePath the path to the file which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct ($filePath) {
-		$this->filePath = $filePath;
-	}
+    /**
+     * @param string $filePath the path to the file which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct ($filePath) {
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback (IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!file_exists($this->filePath)) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback (IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!file_exists($this->filePath)) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param string $filePath the path to the file which should be streamed
 	 * @since 8.1.0
 	 */
-	public function __construct ($filePath) {
+	public function __construct($filePath) {
 		$this->filePath = $filePath;
 	}
 
@@ -51,7 +51,7 @@ 
 	 * @param IOutput $output a small wrapper that handles output
 	 * @since 8.1.0
 	 */
-	public function callback (IOutput $output) {
+	public function callback(IOutput $output) {
 		// handle caching
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
 			if (!file_exists($this->filePath)) {

lib/public/appframework/http/datadisplayresponse.php

Indentation +44 added lines, -44 removed lines

@@ -33,57 +33,57 @@
  */
 class DataDisplayResponse extends Response {
 
-	/**
-	 * response data
-	 * @var string;
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var string;
+     */
+    protected $data;
 
 
-	/**
-	 * @param string $data the data to display
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @param array $headers additional key value based headers
-	 * @since 8.1.0
-	 */
-	public function __construct($data="", $statusCode=Http::STATUS_OK,
-	                            $headers=[]) {
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename=""');
-	}
+    /**
+     * @param string $data the data to display
+     * @param int $statusCode the Http status code, defaults to 200
+     * @param array $headers additional key value based headers
+     * @since 8.1.0
+     */
+    public function __construct($data="", $statusCode=Http::STATUS_OK,
+                                $headers=[]) {
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+        $this->addHeader('Content-Disposition', 'inline; filename=""');
+    }
 
-	/**
-	 * Outputs data. No processing is done.
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function render() {
-		return $this->data;
-	}
+    /**
+     * Outputs data. No processing is done.
+     * @return string
+     * @since 8.1.0
+     */
+    public function render() {
+        return $this->data;
+    }
 
 
-	/**
-	 * Sets values in the data
-	 * @param string $data the data to display
-	 * @return DataDisplayResponse Reference to this object
-	 * @since 8.1.0
-	 */
-	public function setData($data){
-		$this->data = $data;
+    /**
+     * Sets values in the data
+     * @param string $data the data to display
+     * @return DataDisplayResponse Reference to this object
+     * @since 8.1.0
+     */
+    public function setData($data){
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return string the data
-	 * @since 8.1.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return string the data
+     * @since 8.1.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -46,8 +46,8 @@ 
 	 * @param array $headers additional key value based headers
 	 * @since 8.1.0
 	 */
-	public function __construct($data="", $statusCode=Http::STATUS_OK,
-	                            $headers=[]) {
+	public function __construct($data = "", $statusCode = Http::STATUS_OK,
+	                            $headers = []) {
 		$this->data = $data;
 		$this->setStatus($statusCode);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
@@ -70,7 +70,7 @@ 
 	 * @return DataDisplayResponse Reference to this object
 	 * @since 8.1.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -82,7 +82,7 @@ 
 	 * @return string the data
 	 * @since 8.1.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 

lib/public/appframework/http/emptycontentsecuritypolicy.php

Indentation +347 added lines, -347 removed lines

@@ -36,351 +36,351 @@
  * @since 9.0.0
  */
 class EmptyContentSecurityPolicy {
-	/** @var bool Whether inline JS snippets are allowed */
-	protected $inlineScriptAllowed = null;
-	/**
-	 * @var bool Whether eval in JS scripts is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/11925
-	 */
-	protected $evalScriptAllowed = null;
-	/** @var array Domains from which scripts can get loaded */
-	protected $allowedScriptDomains = null;
-	/**
-	 * @var bool Whether inline CSS is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/13458
-	 */
-	protected $inlineStyleAllowed = null;
-	/** @var array Domains from which CSS can get loaded */
-	protected $allowedStyleDomains = null;
-	/** @var array Domains from which images can get loaded */
-	protected $allowedImageDomains = null;
-	/** @var array Domains to which connections can be done */
-	protected $allowedConnectDomains = null;
-	/** @var array Domains from which media elements can be loaded */
-	protected $allowedMediaDomains = null;
-	/** @var array Domains from which object elements can be loaded */
-	protected $allowedObjectDomains = null;
-	/** @var array Domains from which iframes can be loaded */
-	protected $allowedFrameDomains = null;
-	/** @var array Domains from which fonts can be loaded */
-	protected $allowedFontDomains = null;
-	/** @var array Domains from which web-workers and nested browsing content can load elements */
-	protected $allowedChildSrcDomains = null;
-
-	/**
-	 * Whether inline JavaScript snippets are allowed or forbidden
-	 * @param bool $state
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function allowInlineScript($state = false) {
-		$this->inlineScriptAllowed = $state;
-		return $this;
-	}
-
-	/**
-	 * Whether eval in JavaScript is allowed or forbidden
-	 * @param bool $state
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function allowEvalScript($state = true) {
-		$this->evalScriptAllowed = $state;
-		return $this;
-	}
-
-	/**
-	 * Allows to execute JavaScript files from a specific domain. Use * to
-	 * allow JavaScript from all domains.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedScriptDomain($domain) {
-		$this->allowedScriptDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed script domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowScriptDomain($domain) {
-		$this->allowedScriptDomains = array_diff($this->allowedScriptDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Whether inline CSS snippets are allowed or forbidden
-	 * @param bool $state
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function allowInlineStyle($state = true) {
-		$this->inlineStyleAllowed = $state;
-		return $this;
-	}
-
-	/**
-	 * Allows to execute CSS files from a specific domain. Use * to allow
-	 * CSS from all domains.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedStyleDomain($domain) {
-		$this->allowedStyleDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed style domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowStyleDomain($domain) {
-		$this->allowedStyleDomains = array_diff($this->allowedStyleDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Allows using fonts from a specific domain. Use * to allow
-	 * fonts from all domains.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedFontDomain($domain) {
-		$this->allowedFontDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed font domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowFontDomain($domain) {
-		$this->allowedFontDomains = array_diff($this->allowedFontDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Allows embedding images from a specific domain. Use * to allow
-	 * images from all domains.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedImageDomain($domain) {
-		$this->allowedImageDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed image domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowImageDomain($domain) {
-		$this->allowedImageDomains = array_diff($this->allowedImageDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * To which remote domains the JS connect to.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedConnectDomain($domain) {
-		$this->allowedConnectDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed connect domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowConnectDomain($domain) {
-		$this->allowedConnectDomains = array_diff($this->allowedConnectDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * From which domains media elements can be embedded.
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedMediaDomain($domain) {
-		$this->allowedMediaDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed media domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowMediaDomain($domain) {
-		$this->allowedMediaDomains = array_diff($this->allowedMediaDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * From which domains objects such as <object>, <embed> or <applet> are executed
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedObjectDomain($domain) {
-		$this->allowedObjectDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed object domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowObjectDomain($domain) {
-		$this->allowedObjectDomains = array_diff($this->allowedObjectDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Which domains can be embedded in an iframe
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedFrameDomain($domain) {
-		$this->allowedFrameDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed frame domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowFrameDomain($domain) {
-		$this->allowedFrameDomains = array_diff($this->allowedFrameDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Domains from which web-workers and nested browsing content can load elements
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function addAllowedChildSrcDomain($domain) {
-		$this->allowedChildSrcDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Remove the specified allowed child src domain from the allowed domains.
-	 *
-	 * @param string $domain
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function disallowChildSrcDomain($domain) {
-		$this->allowedChildSrcDomains = array_diff($this->allowedChildSrcDomains, [$domain]);
-		return $this;
-	}
-
-	/**
-	 * Get the generated Content-Security-Policy as a string
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function buildPolicy() {
-		$policy = "default-src 'none';";
-
-		if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
-			$policy .= 'script-src ';
-			if(is_array($this->allowedScriptDomains)) {
-				$policy .= implode(' ', $this->allowedScriptDomains);
-			}
-			if($this->inlineScriptAllowed) {
-				$policy .= ' \'unsafe-inline\'';
-			}
-			if($this->evalScriptAllowed) {
-				$policy .= ' \'unsafe-eval\'';
-			}
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
-			$policy .= 'style-src ';
-			if(is_array($this->allowedStyleDomains)) {
-				$policy .= implode(' ', $this->allowedStyleDomains);
-			}
-			if($this->inlineStyleAllowed) {
-				$policy .= ' \'unsafe-inline\'';
-			}
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedImageDomains)) {
-			$policy .= 'img-src ' . implode(' ', $this->allowedImageDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedFontDomains)) {
-			$policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedConnectDomains)) {
-			$policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedMediaDomains)) {
-			$policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedObjectDomains)) {
-			$policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedFrameDomains)) {
-			$policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains);
-			$policy .= ';';
-		}
-
-		if(!empty($this->allowedChildSrcDomains)) {
-			$policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains);
-			$policy .= ';';
-		}
-
-		return rtrim($policy, ';');
-	}
+    /** @var bool Whether inline JS snippets are allowed */
+    protected $inlineScriptAllowed = null;
+    /**
+     * @var bool Whether eval in JS scripts is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/11925
+     */
+    protected $evalScriptAllowed = null;
+    /** @var array Domains from which scripts can get loaded */
+    protected $allowedScriptDomains = null;
+    /**
+     * @var bool Whether inline CSS is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/13458
+     */
+    protected $inlineStyleAllowed = null;
+    /** @var array Domains from which CSS can get loaded */
+    protected $allowedStyleDomains = null;
+    /** @var array Domains from which images can get loaded */
+    protected $allowedImageDomains = null;
+    /** @var array Domains to which connections can be done */
+    protected $allowedConnectDomains = null;
+    /** @var array Domains from which media elements can be loaded */
+    protected $allowedMediaDomains = null;
+    /** @var array Domains from which object elements can be loaded */
+    protected $allowedObjectDomains = null;
+    /** @var array Domains from which iframes can be loaded */
+    protected $allowedFrameDomains = null;
+    /** @var array Domains from which fonts can be loaded */
+    protected $allowedFontDomains = null;
+    /** @var array Domains from which web-workers and nested browsing content can load elements */
+    protected $allowedChildSrcDomains = null;
+
+    /**
+     * Whether inline JavaScript snippets are allowed or forbidden
+     * @param bool $state
+     * @return $this
+     * @since 8.1.0
+     */
+    public function allowInlineScript($state = false) {
+        $this->inlineScriptAllowed = $state;
+        return $this;
+    }
+
+    /**
+     * Whether eval in JavaScript is allowed or forbidden
+     * @param bool $state
+     * @return $this
+     * @since 8.1.0
+     */
+    public function allowEvalScript($state = true) {
+        $this->evalScriptAllowed = $state;
+        return $this;
+    }
+
+    /**
+     * Allows to execute JavaScript files from a specific domain. Use * to
+     * allow JavaScript from all domains.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedScriptDomain($domain) {
+        $this->allowedScriptDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed script domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowScriptDomain($domain) {
+        $this->allowedScriptDomains = array_diff($this->allowedScriptDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Whether inline CSS snippets are allowed or forbidden
+     * @param bool $state
+     * @return $this
+     * @since 8.1.0
+     */
+    public function allowInlineStyle($state = true) {
+        $this->inlineStyleAllowed = $state;
+        return $this;
+    }
+
+    /**
+     * Allows to execute CSS files from a specific domain. Use * to allow
+     * CSS from all domains.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedStyleDomain($domain) {
+        $this->allowedStyleDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed style domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowStyleDomain($domain) {
+        $this->allowedStyleDomains = array_diff($this->allowedStyleDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Allows using fonts from a specific domain. Use * to allow
+     * fonts from all domains.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedFontDomain($domain) {
+        $this->allowedFontDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed font domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowFontDomain($domain) {
+        $this->allowedFontDomains = array_diff($this->allowedFontDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Allows embedding images from a specific domain. Use * to allow
+     * images from all domains.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedImageDomain($domain) {
+        $this->allowedImageDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed image domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowImageDomain($domain) {
+        $this->allowedImageDomains = array_diff($this->allowedImageDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * To which remote domains the JS connect to.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedConnectDomain($domain) {
+        $this->allowedConnectDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed connect domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowConnectDomain($domain) {
+        $this->allowedConnectDomains = array_diff($this->allowedConnectDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * From which domains media elements can be embedded.
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedMediaDomain($domain) {
+        $this->allowedMediaDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed media domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowMediaDomain($domain) {
+        $this->allowedMediaDomains = array_diff($this->allowedMediaDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * From which domains objects such as <object>, <embed> or <applet> are executed
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedObjectDomain($domain) {
+        $this->allowedObjectDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed object domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowObjectDomain($domain) {
+        $this->allowedObjectDomains = array_diff($this->allowedObjectDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Which domains can be embedded in an iframe
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedFrameDomain($domain) {
+        $this->allowedFrameDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed frame domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowFrameDomain($domain) {
+        $this->allowedFrameDomains = array_diff($this->allowedFrameDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Domains from which web-workers and nested browsing content can load elements
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 8.1.0
+     */
+    public function addAllowedChildSrcDomain($domain) {
+        $this->allowedChildSrcDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Remove the specified allowed child src domain from the allowed domains.
+     *
+     * @param string $domain
+     * @return $this
+     * @since 8.1.0
+     */
+    public function disallowChildSrcDomain($domain) {
+        $this->allowedChildSrcDomains = array_diff($this->allowedChildSrcDomains, [$domain]);
+        return $this;
+    }
+
+    /**
+     * Get the generated Content-Security-Policy as a string
+     * @return string
+     * @since 8.1.0
+     */
+    public function buildPolicy() {
+        $policy = "default-src 'none';";
+
+        if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
+            $policy .= 'script-src ';
+            if(is_array($this->allowedScriptDomains)) {
+                $policy .= implode(' ', $this->allowedScriptDomains);
+            }
+            if($this->inlineScriptAllowed) {
+                $policy .= ' \'unsafe-inline\'';
+            }
+            if($this->evalScriptAllowed) {
+                $policy .= ' \'unsafe-eval\'';
+            }
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
+            $policy .= 'style-src ';
+            if(is_array($this->allowedStyleDomains)) {
+                $policy .= implode(' ', $this->allowedStyleDomains);
+            }
+            if($this->inlineStyleAllowed) {
+                $policy .= ' \'unsafe-inline\'';
+            }
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedImageDomains)) {
+            $policy .= 'img-src ' . implode(' ', $this->allowedImageDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedFontDomains)) {
+            $policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedConnectDomains)) {
+            $policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedMediaDomains)) {
+            $policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedObjectDomains)) {
+            $policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedFrameDomains)) {
+            $policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains);
+            $policy .= ';';
+        }
+
+        if(!empty($this->allowedChildSrcDomains)) {
+            $policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains);
+            $policy .= ';';
+        }
+
+        return rtrim($policy, ';');
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -321,63 +321,63 @@
 	public function buildPolicy() {
 		$policy = "default-src 'none';";
 
-		if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
+		if (!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
 			$policy .= 'script-src ';
-			if(is_array($this->allowedScriptDomains)) {
+			if (is_array($this->allowedScriptDomains)) {
 				$policy .= implode(' ', $this->allowedScriptDomains);
 			}
-			if($this->inlineScriptAllowed) {
+			if ($this->inlineScriptAllowed) {
 				$policy .= ' \'unsafe-inline\'';
 			}
-			if($this->evalScriptAllowed) {
+			if ($this->evalScriptAllowed) {
 				$policy .= ' \'unsafe-eval\'';
 			}
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
+		if (!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
 			$policy .= 'style-src ';
-			if(is_array($this->allowedStyleDomains)) {
+			if (is_array($this->allowedStyleDomains)) {
 				$policy .= implode(' ', $this->allowedStyleDomains);
 			}
-			if($this->inlineStyleAllowed) {
+			if ($this->inlineStyleAllowed) {
 				$policy .= ' \'unsafe-inline\'';
 			}
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedImageDomains)) {
-			$policy .= 'img-src ' . implode(' ', $this->allowedImageDomains);
+		if (!empty($this->allowedImageDomains)) {
+			$policy .= 'img-src '.implode(' ', $this->allowedImageDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedFontDomains)) {
-			$policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);
+		if (!empty($this->allowedFontDomains)) {
+			$policy .= 'font-src '.implode(' ', $this->allowedFontDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedConnectDomains)) {
-			$policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains);
+		if (!empty($this->allowedConnectDomains)) {
+			$policy .= 'connect-src '.implode(' ', $this->allowedConnectDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedMediaDomains)) {
-			$policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains);
+		if (!empty($this->allowedMediaDomains)) {
+			$policy .= 'media-src '.implode(' ', $this->allowedMediaDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedObjectDomains)) {
-			$policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains);
+		if (!empty($this->allowedObjectDomains)) {
+			$policy .= 'object-src '.implode(' ', $this->allowedObjectDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedFrameDomains)) {
-			$policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains);
+		if (!empty($this->allowedFrameDomains)) {
+			$policy .= 'frame-src '.implode(' ', $this->allowedFrameDomains);
 			$policy .= ';';
 		}
 
-		if(!empty($this->allowedChildSrcDomains)) {
-			$policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains);
+		if (!empty($this->allowedChildSrcDomains)) {
+			$policy .= 'child-src '.implode(' ', $this->allowedChildSrcDomains);
 			$policy .= ';';
 		}
 

lib/public/appframework/http/jsonresponse.php

Indentation +49 added lines, -49 removed lines

@@ -39,63 +39,63 @@
  */
 class JSONResponse extends Response {
 
-	/**
-	 * response data
-	 * @var array|object
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var array|object
+     */
+    protected $data;
 
 
-	/**
-	 * constructor of JSONResponse
-	 * @param array|object $data the object or array that should be transformed
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @since 6.0.0
-	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
-	}
+    /**
+     * constructor of JSONResponse
+     * @param array|object $data the object or array that should be transformed
+     * @param int $statusCode the Http status code, defaults to 200
+     * @since 6.0.0
+     */
+    public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->addHeader('Content-Type', 'application/json; charset=utf-8');
+    }
 
 
-	/**
-	 * Returns the rendered json
-	 * @return string the rendered json
-	 * @since 6.0.0
-	 * @throws \Exception If data could not get encoded
-	 */
-	public function render() {
-		$response = json_encode($this->data, JSON_HEX_TAG);
-		if($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
-				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
-		}
+    /**
+     * Returns the rendered json
+     * @return string the rendered json
+     * @since 6.0.0
+     * @throws \Exception If data could not get encoded
+     */
+    public function render() {
+        $response = json_encode($this->data, JSON_HEX_TAG);
+        if($response === false) {
+            throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+                'non UTF-8 characters in the array: %s', var_export($this->data, true)));
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 
-	/**
-	 * Sets values in the data json array
-	 * @param array|object $data an array or object which will be transformed
-	 *                             to JSON
-	 * @return JSONResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setData($data){
-		$this->data = $data;
+    /**
+     * Sets values in the data json array
+     * @param array|object $data an array or object which will be transformed
+     *                             to JSON
+     * @return JSONResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setData($data){
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return array the data
-	 * @since 6.0.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return array the data
+     * @since 6.0.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param int $statusCode the Http status code, defaults to 200
 	 * @since 6.0.0
 	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK) {
 		$this->data = $data;
 		$this->setStatus($statusCode);
 		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
@@ -67,8 +67,8 @@ 
 	 */
 	public function render() {
 		$response = json_encode($this->data, JSON_HEX_TAG);
-		if($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+		if ($response === false) {
+			throw new \Exception(sprintf('Could not json_encode due to invalid '.
 				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
 		}
 
@@ -82,7 +82,7 @@ 
 	 * @return JSONResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -94,7 +94,7 @@ 
 	 * @return array the data
 	 * @since 6.0.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}