Completed
Pull Request — master (#9895)
by Björn
43:43 queued 13:05
created
lib/public/AutoloadNotAllowedException.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
  * @since 8.2.0
28 28
  */
29 29
 class AutoloadNotAllowedException extends \DomainException {
30
-	/**
31
-	 * @param string $path
32
-	 * @since 8.2.0
33
-	 */
34
-	public function __construct($path) {
35
-		parent::__construct('Autoload path not allowed: '.$path);
36
-	}
30
+    /**
31
+     * @param string $path
32
+     * @since 8.2.0
33
+     */
34
+    public function __construct($path) {
35
+        parent::__construct('Autoload path not allowed: '.$path);
36
+    }
37 37
 }
38 38
 
Please login to merge, or discard this patch.
lib/public/Lockdown/ILockdownManager.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -25,26 +25,26 @@
 block discarded – undo
25 25
  * @since 9.2
26 26
  */
27 27
 interface ILockdownManager {
28
-	/**
29
-	 * Enable the lockdown restrictions
30
-	 *
31
-	 * @since 9.2
32
-	 */
33
-	public function enable();
28
+    /**
29
+     * Enable the lockdown restrictions
30
+     *
31
+     * @since 9.2
32
+     */
33
+    public function enable();
34 34
 
35
-	/**
36
-	 * Set the active token to get the restrictions from and enable the lockdown
37
-	 *
38
-	 * @param IToken $token
39
-	 * @since 9.2
40
-	 */
41
-	public function setToken(IToken $token);
35
+    /**
36
+     * Set the active token to get the restrictions from and enable the lockdown
37
+     *
38
+     * @param IToken $token
39
+     * @since 9.2
40
+     */
41
+    public function setToken(IToken $token);
42 42
 
43
-	/**
44
-	 * Check whether or not filesystem access is allowed
45
-	 *
46
-	 * @return bool
47
-	 * @since 9.2
48
-	 */
49
-	public function canAccessFilesystem();
43
+    /**
44
+     * Check whether or not filesystem access is allowed
45
+     *
46
+     * @return bool
47
+     * @since 9.2
48
+     */
49
+    public function canAccessFilesystem();
50 50
 }
Please login to merge, or discard this patch.
lib/public/Search/Provider.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -32,60 +32,60 @@
 block discarded – undo
32 32
  */
33 33
 abstract class Provider {
34 34
 
35
-	/**
36
-	 * @since 8.0.0
37
-	 */
38
-	const OPTION_APPS = 'apps';
35
+    /**
36
+     * @since 8.0.0
37
+     */
38
+    const OPTION_APPS = 'apps';
39 39
 
40
-	/**
41
-	 * List of options
42
-	 * @var array
43
-	 * @since 7.0.0
44
-	 */
45
-	protected $options;
40
+    /**
41
+     * List of options
42
+     * @var array
43
+     * @since 7.0.0
44
+     */
45
+    protected $options;
46 46
 
47
-	/**
48
-	 * Constructor
49
-	 * @param array $options as key => value
50
-	 * @since 7.0.0 - default value for $options was added in 8.0.0
51
-	 */
52
-	public function __construct($options = array()) {
53
-		$this->options = $options;
54
-	}
47
+    /**
48
+     * Constructor
49
+     * @param array $options as key => value
50
+     * @since 7.0.0 - default value for $options was added in 8.0.0
51
+     */
52
+    public function __construct($options = array()) {
53
+        $this->options = $options;
54
+    }
55 55
 
56
-	/**
57
-	 * get a value from the options array or null
58
-	 * @param string $key
59
-	 * @return mixed
60
-	 * @since 8.0.0
61
-	 */
62
-	public function getOption($key) {
63
-		if (is_array($this->options) && isset($this->options[$key])) {
64
-			return $this->options[$key];
65
-		} else {
66
-			return null;
67
-		}
68
-	}
56
+    /**
57
+     * get a value from the options array or null
58
+     * @param string $key
59
+     * @return mixed
60
+     * @since 8.0.0
61
+     */
62
+    public function getOption($key) {
63
+        if (is_array($this->options) && isset($this->options[$key])) {
64
+            return $this->options[$key];
65
+        } else {
66
+            return null;
67
+        }
68
+    }
69 69
 
70
-	/**
71
-	 * checks if the given apps and the apps this provider has results for intersect
72
-	 * returns true if the given array is empty (all apps)
73
-	 * or if this provider does not have a list of apps it provides results for (legacy search providers)
74
-	 * or if the two above arrays have elements in common (intersect)
75
-	 * @param string[] $apps
76
-	 * @return bool
77
-	 * @since 8.0.0
78
-	 */
79
-	public function providesResultsFor(array $apps = array()) {
80
-		$forApps = $this->getOption(self::OPTION_APPS);
81
-		return empty($apps) || empty($forApps) || array_intersect($forApps, $apps);
82
-	}
70
+    /**
71
+     * checks if the given apps and the apps this provider has results for intersect
72
+     * returns true if the given array is empty (all apps)
73
+     * or if this provider does not have a list of apps it provides results for (legacy search providers)
74
+     * or if the two above arrays have elements in common (intersect)
75
+     * @param string[] $apps
76
+     * @return bool
77
+     * @since 8.0.0
78
+     */
79
+    public function providesResultsFor(array $apps = array()) {
80
+        $forApps = $this->getOption(self::OPTION_APPS);
81
+        return empty($apps) || empty($forApps) || array_intersect($forApps, $apps);
82
+    }
83 83
 
84
-	/**
85
-	 * Search for $query
86
-	 * @param string $query
87
-	 * @return array An array of OCP\Search\Result's
88
-	 * @since 7.0.0
89
-	 */
90
-	abstract public function search($query);
84
+    /**
85
+     * Search for $query
86
+     * @param string $query
87
+     * @return array An array of OCP\Search\Result's
88
+     * @since 7.0.0
89
+     */
90
+    abstract public function search($query);
91 91
 }
Please login to merge, or discard this patch.
lib/public/Search/Result.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -31,47 +31,47 @@
 block discarded – undo
31 31
  */
32 32
 class Result {
33 33
 
34
-	/**
35
-	 * A unique identifier for the result, usually given as the item ID in its
36
-	 * corresponding application.
37
-	 * @var string
38
-	 * @since 7.0.0
39
-	 */
40
-	public $id;
34
+    /**
35
+     * A unique identifier for the result, usually given as the item ID in its
36
+     * corresponding application.
37
+     * @var string
38
+     * @since 7.0.0
39
+     */
40
+    public $id;
41 41
 
42
-	/**
43
-	 * The name of the item returned; this will be displayed in the search
44
-	 * results.
45
-	 * @var string
46
-	 * @since 7.0.0
47
-	 */
48
-	public $name;
42
+    /**
43
+     * The name of the item returned; this will be displayed in the search
44
+     * results.
45
+     * @var string
46
+     * @since 7.0.0
47
+     */
48
+    public $name;
49 49
 
50
-	/**
51
-	 * URL to the application item.
52
-	 * @var string
53
-	 * @since 7.0.0
54
-	 */
55
-	public $link;
50
+    /**
51
+     * URL to the application item.
52
+     * @var string
53
+     * @since 7.0.0
54
+     */
55
+    public $link;
56 56
 
57
-	/**
58
-	 * The type of search result returned; for consistency, name this the same
59
-	 * as the class name (e.g. \OC\Search\File -> 'file') in lowercase. 
60
-	 * @var string
61
-	 * @since 7.0.0
62
-	 */
63
-	public $type = 'generic';
57
+    /**
58
+     * The type of search result returned; for consistency, name this the same
59
+     * as the class name (e.g. \OC\Search\File -> 'file') in lowercase. 
60
+     * @var string
61
+     * @since 7.0.0
62
+     */
63
+    public $type = 'generic';
64 64
 
65
-	/**
66
-	 * Create a new search result
67
-	 * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
68
-	 * @param string $name displayed text of result
69
-	 * @param string $link URL to the result within its app
70
-	 * @since 7.0.0
71
-	 */
72
-	public function __construct($id = null, $name = null, $link = null) {
73
-		$this->id = $id;
74
-		$this->name = $name;
75
-		$this->link = $link;
76
-	}
65
+    /**
66
+     * Create a new search result
67
+     * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
68
+     * @param string $name displayed text of result
69
+     * @param string $link URL to the result within its app
70
+     * @since 7.0.0
71
+     */
72
+    public function __construct($id = null, $name = null, $link = null) {
73
+        $this->id = $id;
74
+        $this->name = $name;
75
+        $this->link = $link;
76
+    }
77 77
 }
Please login to merge, or discard this patch.
lib/public/Share_Backend_Collection.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@
 block discarded – undo
31 31
  * @since 5.0.0
32 32
  */
33 33
 interface Share_Backend_Collection extends Share_Backend {
34
-	/**
35
-	 * Get the sources of the children of the item
36
-	 * @param string $itemSource
37
-	 * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
38
-	 * @since 5.0.0
39
-	 */
40
-	public function getChildren($itemSource);
34
+    /**
35
+     * Get the sources of the children of the item
36
+     * @param string $itemSource
37
+     * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
38
+     * @since 5.0.0
39
+     */
40
+    public function getChildren($itemSource);
41 41
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCSController.php 2 patches
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -42,73 +42,73 @@
 block discarded – undo
42 42
  */
43 43
 abstract class OCSController extends ApiController {
44 44
 
45
-	/** @var int */
46
-	private $ocsVersion;
45
+    /** @var int */
46
+    private $ocsVersion;
47 47
 
48
-	/**
49
-	 * constructor of the controller
50
-	 * @param string $appName the name of the app
51
-	 * @param IRequest $request an instance of the request
52
-	 * @param string $corsMethods comma separated string of HTTP verbs which
53
-	 * should be allowed for websites or webapps when calling your API, defaults to
54
-	 * 'PUT, POST, GET, DELETE, PATCH'
55
-	 * @param string $corsAllowedHeaders comma separated string of HTTP headers
56
-	 * which should be allowed for websites or webapps when calling your API,
57
-	 * defaults to 'Authorization, Content-Type, Accept'
58
-	 * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
59
-	 * request should be cached, defaults to 1728000 seconds
60
-	 * @since 8.1.0
61
-	 */
62
-	public function __construct($appName,
63
-								IRequest $request,
64
-								$corsMethods='PUT, POST, GET, DELETE, PATCH',
65
-								$corsAllowedHeaders='Authorization, Content-Type, Accept',
66
-								$corsMaxAge=1728000){
67
-		parent::__construct($appName, $request, $corsMethods,
68
-							$corsAllowedHeaders, $corsMaxAge);
69
-		$this->registerResponder('json', function ($data) {
70
-			return $this->buildOCSResponse('json', $data);
71
-		});
72
-		$this->registerResponder('xml', function ($data) {
73
-			return $this->buildOCSResponse('xml', $data);
74
-		});
75
-	}
48
+    /**
49
+     * constructor of the controller
50
+     * @param string $appName the name of the app
51
+     * @param IRequest $request an instance of the request
52
+     * @param string $corsMethods comma separated string of HTTP verbs which
53
+     * should be allowed for websites or webapps when calling your API, defaults to
54
+     * 'PUT, POST, GET, DELETE, PATCH'
55
+     * @param string $corsAllowedHeaders comma separated string of HTTP headers
56
+     * which should be allowed for websites or webapps when calling your API,
57
+     * defaults to 'Authorization, Content-Type, Accept'
58
+     * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
59
+     * request should be cached, defaults to 1728000 seconds
60
+     * @since 8.1.0
61
+     */
62
+    public function __construct($appName,
63
+                                IRequest $request,
64
+                                $corsMethods='PUT, POST, GET, DELETE, PATCH',
65
+                                $corsAllowedHeaders='Authorization, Content-Type, Accept',
66
+                                $corsMaxAge=1728000){
67
+        parent::__construct($appName, $request, $corsMethods,
68
+                            $corsAllowedHeaders, $corsMaxAge);
69
+        $this->registerResponder('json', function ($data) {
70
+            return $this->buildOCSResponse('json', $data);
71
+        });
72
+        $this->registerResponder('xml', function ($data) {
73
+            return $this->buildOCSResponse('xml', $data);
74
+        });
75
+    }
76 76
 
77
-	/**
78
-	 * @param int $version
79
-	 * @since 11.0.0
80
-	 * @internal
81
-	 */
82
-	public function setOCSVersion($version) {
83
-		$this->ocsVersion = $version;
84
-	}
77
+    /**
78
+     * @param int $version
79
+     * @since 11.0.0
80
+     * @internal
81
+     */
82
+    public function setOCSVersion($version) {
83
+        $this->ocsVersion = $version;
84
+    }
85 85
 
86
-	/**
87
-	 * Since the OCS endpoints default to XML we need to find out the format
88
-	 * again
89
-	 * @param mixed $response the value that was returned from a controller and
90
-	 * is not a Response instance
91
-	 * @param string $format the format for which a formatter has been registered
92
-	 * @throws \DomainException if format does not match a registered formatter
93
-	 * @return Response
94
-	 * @since 9.1.0
95
-	 */
96
-	public function buildResponse($response, $format = 'xml') {
97
-		return parent::buildResponse($response, $format);
98
-	}
86
+    /**
87
+     * Since the OCS endpoints default to XML we need to find out the format
88
+     * again
89
+     * @param mixed $response the value that was returned from a controller and
90
+     * is not a Response instance
91
+     * @param string $format the format for which a formatter has been registered
92
+     * @throws \DomainException if format does not match a registered formatter
93
+     * @return Response
94
+     * @since 9.1.0
95
+     */
96
+    public function buildResponse($response, $format = 'xml') {
97
+        return parent::buildResponse($response, $format);
98
+    }
99 99
 
100
-	/**
101
-	 * Unwrap data and build ocs response
102
-	 * @param string $format json or xml
103
-	 * @param DataResponse $data the data which should be transformed
104
-	 * @since 8.1.0
105
-	 * @return \OC\AppFramework\OCS\BaseResponse
106
-	 */
107
-	private function buildOCSResponse($format, DataResponse $data) {
108
-		if ($this->ocsVersion === 1) {
109
-			return new \OC\AppFramework\OCS\V1Response($data, $format);
110
-		}
111
-		return new \OC\AppFramework\OCS\V2Response($data, $format);
112
-	}
100
+    /**
101
+     * Unwrap data and build ocs response
102
+     * @param string $format json or xml
103
+     * @param DataResponse $data the data which should be transformed
104
+     * @since 8.1.0
105
+     * @return \OC\AppFramework\OCS\BaseResponse
106
+     */
107
+    private function buildOCSResponse($format, DataResponse $data) {
108
+        if ($this->ocsVersion === 1) {
109
+            return new \OC\AppFramework\OCS\V1Response($data, $format);
110
+        }
111
+        return new \OC\AppFramework\OCS\V2Response($data, $format);
112
+    }
113 113
 
114 114
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -61,15 +61,15 @@
 block discarded – undo
61 61
 	 */
62 62
 	public function __construct($appName,
63 63
 								IRequest $request,
64
-								$corsMethods='PUT, POST, GET, DELETE, PATCH',
65
-								$corsAllowedHeaders='Authorization, Content-Type, Accept',
66
-								$corsMaxAge=1728000){
64
+								$corsMethods = 'PUT, POST, GET, DELETE, PATCH',
65
+								$corsAllowedHeaders = 'Authorization, Content-Type, Accept',
66
+								$corsMaxAge = 1728000) {
67 67
 		parent::__construct($appName, $request, $corsMethods,
68 68
 							$corsAllowedHeaders, $corsMaxAge);
69
-		$this->registerResponder('json', function ($data) {
69
+		$this->registerResponder('json', function($data) {
70 70
 			return $this->buildOCSResponse('json', $data);
71 71
 		});
72
-		$this->registerResponder('xml', function ($data) {
72
+		$this->registerResponder('xml', function($data) {
73 73
 			return $this->buildOCSResponse('xml', $data);
74 74
 		});
75 75
 	}
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/OCSResponse.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
 	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
56 56
 	 */
57 57
 	public function __construct($format, $statuscode, $message,
58
-								$data=[], $itemscount='',
59
-								$itemsperpage='') {
58
+								$data = [], $itemscount = '',
59
+								$itemsperpage = '') {
60 60
 		$this->format = $format;
61 61
 		$this->statuscode = $statuscode;
62 62
 		$this->message = $message;
Please login to merge, or discard this patch.
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -36,59 +36,59 @@
 block discarded – undo
36 36
  */
37 37
 class OCSResponse extends Response {
38 38
 
39
-	private $data;
40
-	private $format;
41
-	private $statuscode;
42
-	private $message;
43
-	private $itemscount;
44
-	private $itemsperpage;
39
+    private $data;
40
+    private $format;
41
+    private $statuscode;
42
+    private $message;
43
+    private $itemscount;
44
+    private $itemsperpage;
45 45
 
46
-	/**
47
-	 * generates the xml or json response for the API call from an multidimenional data array.
48
-	 * @param string $format
49
-	 * @param int $statuscode
50
-	 * @param string $message
51
-	 * @param array $data
52
-	 * @param int|string $itemscount
53
-	 * @param int|string $itemsperpage
54
-	 * @since 8.1.0
55
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
56
-	 */
57
-	public function __construct($format, $statuscode, $message,
58
-								$data=[], $itemscount='',
59
-								$itemsperpage='') {
60
-		$this->format = $format;
61
-		$this->statuscode = $statuscode;
62
-		$this->message = $message;
63
-		$this->data = $data;
64
-		$this->itemscount = $itemscount;
65
-		$this->itemsperpage = $itemsperpage;
46
+    /**
47
+     * generates the xml or json response for the API call from an multidimenional data array.
48
+     * @param string $format
49
+     * @param int $statuscode
50
+     * @param string $message
51
+     * @param array $data
52
+     * @param int|string $itemscount
53
+     * @param int|string $itemsperpage
54
+     * @since 8.1.0
55
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
56
+     */
57
+    public function __construct($format, $statuscode, $message,
58
+                                $data=[], $itemscount='',
59
+                                $itemsperpage='') {
60
+        $this->format = $format;
61
+        $this->statuscode = $statuscode;
62
+        $this->message = $message;
63
+        $this->data = $data;
64
+        $this->itemscount = $itemscount;
65
+        $this->itemsperpage = $itemsperpage;
66 66
 
67
-		// set the correct header based on the format parameter
68
-		if ($format === 'json') {
69
-			$this->addHeader(
70
-				'Content-Type', 'application/json; charset=utf-8'
71
-			);
72
-		} else {
73
-			$this->addHeader(
74
-				'Content-Type', 'application/xml; charset=utf-8'
75
-			);
76
-		}
77
-	}
67
+        // set the correct header based on the format parameter
68
+        if ($format === 'json') {
69
+            $this->addHeader(
70
+                'Content-Type', 'application/json; charset=utf-8'
71
+            );
72
+        } else {
73
+            $this->addHeader(
74
+                'Content-Type', 'application/xml; charset=utf-8'
75
+            );
76
+        }
77
+    }
78 78
 
79
-	/**
80
-	 * @return string
81
-	 * @since 8.1.0
82
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
83
-	 * @suppress PhanDeprecatedClass
84
-	 */
85
-	public function render() {
86
-		$r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
87
-		$r->setTotalItems($this->itemscount);
88
-		$r->setItemsPerPage($this->itemsperpage);
79
+    /**
80
+     * @return string
81
+     * @since 8.1.0
82
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
83
+     * @suppress PhanDeprecatedClass
84
+     */
85
+    public function render() {
86
+        $r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
87
+        $r->setTotalItems($this->itemscount);
88
+        $r->setItemsPerPage($this->itemsperpage);
89 89
 
90
-		return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
91
-	}
90
+        return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
91
+    }
92 92
 
93 93
 
94 94
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/RedirectResponse.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@
 block discarded – undo
36 36
  */
37 37
 class RedirectResponse extends Response {
38 38
 
39
-	private $redirectURL;
40
-
41
-	/**
42
-	 * Creates a response that redirects to a url
43
-	 * @param string $redirectURL the url to redirect to
44
-	 * @since 7.0.0
45
-	 */
46
-	public function __construct($redirectURL) {
47
-		$this->redirectURL = $redirectURL;
48
-		$this->setStatus(Http::STATUS_SEE_OTHER);
49
-		$this->addHeader('Location', $redirectURL);
50
-	}
51
-
52
-
53
-	/**
54
-	 * @return string the url to redirect
55
-	 * @since 7.0.0
56
-	 */
57
-	public function getRedirectURL() {
58
-		return $this->redirectURL;
59
-	}
39
+    private $redirectURL;
40
+
41
+    /**
42
+     * Creates a response that redirects to a url
43
+     * @param string $redirectURL the url to redirect to
44
+     * @since 7.0.0
45
+     */
46
+    public function __construct($redirectURL) {
47
+        $this->redirectURL = $redirectURL;
48
+        $this->setStatus(Http::STATUS_SEE_OTHER);
49
+        $this->addHeader('Location', $redirectURL);
50
+    }
51
+
52
+
53
+    /**
54
+     * @return string the url to redirect
55
+     * @since 7.0.0
56
+     */
57
+    public function getRedirectURL() {
58
+        return $this->redirectURL;
59
+    }
60 60
 
61 61
 
62 62
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/JSONResponse.php 2 patches
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -39,63 +39,63 @@
 block discarded – undo
39 39
  */
40 40
 class JSONResponse extends Response {
41 41
 
42
-	/**
43
-	 * response data
44
-	 * @var array|object
45
-	 */
46
-	protected $data;
42
+    /**
43
+     * response data
44
+     * @var array|object
45
+     */
46
+    protected $data;
47 47
 
48 48
 
49
-	/**
50
-	 * constructor of JSONResponse
51
-	 * @param array|object $data the object or array that should be transformed
52
-	 * @param int $statusCode the Http status code, defaults to 200
53
-	 * @since 6.0.0
54
-	 */
55
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
56
-		$this->data = $data;
57
-		$this->setStatus($statusCode);
58
-		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
59
-	}
49
+    /**
50
+     * constructor of JSONResponse
51
+     * @param array|object $data the object or array that should be transformed
52
+     * @param int $statusCode the Http status code, defaults to 200
53
+     * @since 6.0.0
54
+     */
55
+    public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
56
+        $this->data = $data;
57
+        $this->setStatus($statusCode);
58
+        $this->addHeader('Content-Type', 'application/json; charset=utf-8');
59
+    }
60 60
 
61 61
 
62
-	/**
63
-	 * Returns the rendered json
64
-	 * @return string the rendered json
65
-	 * @since 6.0.0
66
-	 * @throws \Exception If data could not get encoded
67
-	 */
68
-	public function render() {
69
-		$response = json_encode($this->data, JSON_HEX_TAG);
70
-		if($response === false) {
71
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
72
-				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
73
-		}
62
+    /**
63
+     * Returns the rendered json
64
+     * @return string the rendered json
65
+     * @since 6.0.0
66
+     * @throws \Exception If data could not get encoded
67
+     */
68
+    public function render() {
69
+        $response = json_encode($this->data, JSON_HEX_TAG);
70
+        if($response === false) {
71
+            throw new \Exception(sprintf('Could not json_encode due to invalid ' .
72
+                'non UTF-8 characters in the array: %s', var_export($this->data, true)));
73
+        }
74 74
 
75
-		return $response;
76
-	}
75
+        return $response;
76
+    }
77 77
 
78
-	/**
79
-	 * Sets values in the data json array
80
-	 * @param array|object $data an array or object which will be transformed
81
-	 *                             to JSON
82
-	 * @return JSONResponse Reference to this object
83
-	 * @since 6.0.0 - return value was added in 7.0.0
84
-	 */
85
-	public function setData($data){
86
-		$this->data = $data;
78
+    /**
79
+     * Sets values in the data json array
80
+     * @param array|object $data an array or object which will be transformed
81
+     *                             to JSON
82
+     * @return JSONResponse Reference to this object
83
+     * @since 6.0.0 - return value was added in 7.0.0
84
+     */
85
+    public function setData($data){
86
+        $this->data = $data;
87 87
 
88
-		return $this;
89
-	}
88
+        return $this;
89
+    }
90 90
 
91 91
 
92
-	/**
93
-	 * Used to get the set parameters
94
-	 * @return array the data
95
-	 * @since 6.0.0
96
-	 */
97
-	public function getData(){
98
-		return $this->data;
99
-	}
92
+    /**
93
+     * Used to get the set parameters
94
+     * @return array the data
95
+     * @since 6.0.0
96
+     */
97
+    public function getData(){
98
+        return $this->data;
99
+    }
100 100
 
101 101
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 * @param int $statusCode the Http status code, defaults to 200
53 53
 	 * @since 6.0.0
54 54
 	 */
55
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
55
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK) {
56 56
 		$this->data = $data;
57 57
 		$this->setStatus($statusCode);
58 58
 		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function render() {
69 69
 		$response = json_encode($this->data, JSON_HEX_TAG);
70
-		if($response === false) {
71
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
70
+		if ($response === false) {
71
+			throw new \Exception(sprintf('Could not json_encode due to invalid '.
72 72
 				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
73 73
 		}
74 74
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @return JSONResponse Reference to this object
83 83
 	 * @since 6.0.0 - return value was added in 7.0.0
84 84
 	 */
85
-	public function setData($data){
85
+	public function setData($data) {
86 86
 		$this->data = $data;
87 87
 
88 88
 		return $this;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * @return array the data
95 95
 	 * @since 6.0.0
96 96
 	 */
97
-	public function getData(){
97
+	public function getData() {
98 98
 		return $this->data;
99 99
 	}
100 100
 
Please login to merge, or discard this patch.