Completed
Pull Request — stable9 (#4232)
by Lukas
25:41 queued 15:25
created
lib/public/appframework/http/ocsresponse.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
 	 * @since 8.1.0
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.
lib/public/appframework/http/dataresponse.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 * @param array $headers additional key value based headers
51 51
 	 * @since 8.0.0
52 52
 	 */
53
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
54
-	                            array $headers=array()) {
53
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK,
54
+	                            array $headers = array()) {
55 55
 		$this->data = $data;
56 56
 		$this->setStatus($statusCode);
57 57
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return DataResponse Reference to this object
65 65
 	 * @since 8.0.0
66 66
 	 */
67
-	public function setData($data){
67
+	public function setData($data) {
68 68
 		$this->data = $data;
69 69
 
70 70
 		return $this;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return array the data
77 77
 	 * @since 8.0.0
78 78
 	 */
79
-	public function getData(){
79
+	public function getData() {
80 80
 		return $this->data;
81 81
 	}
82 82
 
Please login to merge, or discard this patch.
lib/public/appframework/http/templateresponse.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
 	 * @param string $renderAs how the page should be rendered, defaults to user
71 71
 	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
72 72
 	 */
73
-	public function __construct($appName, $templateName, array $params=array(),
74
-	                            $renderAs='user') {
73
+	public function __construct($appName, $templateName, array $params = array(),
74
+	                            $renderAs = 'user') {
75 75
 		$this->templateName = $templateName;
76 76
 		$this->appName = $appName;
77 77
 		$this->params = $params;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @return TemplateResponse Reference to this object
87 87
 	 * @since 6.0.0 - return value was added in 7.0.0
88 88
 	 */
89
-	public function setParams(array $params){
89
+	public function setParams(array $params) {
90 90
 		$this->params = $params;
91 91
 
92 92
 		return $this;
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @return array the params
99 99
 	 * @since 6.0.0
100 100
 	 */
101
-	public function getParams(){
101
+	public function getParams() {
102 102
 		return $this->params;
103 103
 	}
104 104
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @return string the name of the used template
109 109
 	 * @since 6.0.0
110 110
 	 */
111
-	public function getTemplateName(){
111
+	public function getTemplateName() {
112 112
 		return $this->templateName;
113 113
 	}
114 114
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 * @return TemplateResponse Reference to this object
123 123
 	 * @since 6.0.0 - return value was added in 7.0.0
124 124
 	 */
125
-	public function renderAs($renderAs){
125
+	public function renderAs($renderAs) {
126 126
 		$this->renderAs = $renderAs;
127 127
 
128 128
 		return $this;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @return string the renderAs value
135 135
 	 * @since 6.0.0
136 136
 	 */
137
-	public function getRenderAs(){
137
+	public function getRenderAs() {
138 138
 		return $this->renderAs;
139 139
 	}
140 140
 
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 	 * @return string the rendered html
145 145
 	 * @since 6.0.0
146 146
 	 */
147
-	public function render(){
147
+	public function render() {
148 148
 		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
149 149
 		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
150 150
 
151 151
 		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
152 152
 
153
-		foreach($this->params as $key => $value){
153
+		foreach ($this->params as $key => $value) {
154 154
 			$template->assign($key, $value);
155 155
 		}
156 156
 
Please login to merge, or discard this patch.
lib/public/appframework/http/streamresponse.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param string $filePath the path to the file which should be streamed
41 41
 	 * @since 8.1.0
42 42
 	 */
43
-	public function __construct ($filePath) {
43
+	public function __construct($filePath) {
44 44
 		$this->filePath = $filePath;
45 45
 	}
46 46
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	 * @param IOutput $output a small wrapper that handles output
52 52
 	 * @since 8.1.0
53 53
 	 */
54
-	public function callback (IOutput $output) {
54
+	public function callback(IOutput $output) {
55 55
 		// handle caching
56 56
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
57 57
 			if (!file_exists($this->filePath)) {
Please login to merge, or discard this patch.
lib/public/appframework/http/datadisplayresponse.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 	 * @param array $headers additional key value based headers
47 47
 	 * @since 8.1.0
48 48
 	 */
49
-	public function __construct($data="", $statusCode=Http::STATUS_OK,
50
-	                            $headers=[]) {
49
+	public function __construct($data = "", $statusCode = Http::STATUS_OK,
50
+	                            $headers = []) {
51 51
 		$this->data = $data;
52 52
 		$this->setStatus($statusCode);
53 53
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @return DataDisplayResponse Reference to this object
71 71
 	 * @since 8.1.0
72 72
 	 */
73
-	public function setData($data){
73
+	public function setData($data) {
74 74
 		$this->data = $data;
75 75
 
76 76
 		return $this;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @return string the data
83 83
 	 * @since 8.1.0
84 84
 	 */
85
-	public function getData(){
85
+	public function getData() {
86 86
 		return $this->data;
87 87
 	}
88 88
 
Please login to merge, or discard this patch.
lib/public/appframework/http/emptycontentsecuritypolicy.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -321,63 +321,63 @@
 block discarded – undo
321 321
 	public function buildPolicy() {
322 322
 		$policy = "default-src 'none';";
323 323
 
324
-		if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
324
+		if (!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
325 325
 			$policy .= 'script-src ';
326
-			if(is_array($this->allowedScriptDomains)) {
326
+			if (is_array($this->allowedScriptDomains)) {
327 327
 				$policy .= implode(' ', $this->allowedScriptDomains);
328 328
 			}
329
-			if($this->inlineScriptAllowed) {
329
+			if ($this->inlineScriptAllowed) {
330 330
 				$policy .= ' \'unsafe-inline\'';
331 331
 			}
332
-			if($this->evalScriptAllowed) {
332
+			if ($this->evalScriptAllowed) {
333 333
 				$policy .= ' \'unsafe-eval\'';
334 334
 			}
335 335
 			$policy .= ';';
336 336
 		}
337 337
 
338
-		if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
338
+		if (!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
339 339
 			$policy .= 'style-src ';
340
-			if(is_array($this->allowedStyleDomains)) {
340
+			if (is_array($this->allowedStyleDomains)) {
341 341
 				$policy .= implode(' ', $this->allowedStyleDomains);
342 342
 			}
343
-			if($this->inlineStyleAllowed) {
343
+			if ($this->inlineStyleAllowed) {
344 344
 				$policy .= ' \'unsafe-inline\'';
345 345
 			}
346 346
 			$policy .= ';';
347 347
 		}
348 348
 
349
-		if(!empty($this->allowedImageDomains)) {
350
-			$policy .= 'img-src ' . implode(' ', $this->allowedImageDomains);
349
+		if (!empty($this->allowedImageDomains)) {
350
+			$policy .= 'img-src '.implode(' ', $this->allowedImageDomains);
351 351
 			$policy .= ';';
352 352
 		}
353 353
 
354
-		if(!empty($this->allowedFontDomains)) {
355
-			$policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);
354
+		if (!empty($this->allowedFontDomains)) {
355
+			$policy .= 'font-src '.implode(' ', $this->allowedFontDomains);
356 356
 			$policy .= ';';
357 357
 		}
358 358
 
359
-		if(!empty($this->allowedConnectDomains)) {
360
-			$policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains);
359
+		if (!empty($this->allowedConnectDomains)) {
360
+			$policy .= 'connect-src '.implode(' ', $this->allowedConnectDomains);
361 361
 			$policy .= ';';
362 362
 		}
363 363
 
364
-		if(!empty($this->allowedMediaDomains)) {
365
-			$policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains);
364
+		if (!empty($this->allowedMediaDomains)) {
365
+			$policy .= 'media-src '.implode(' ', $this->allowedMediaDomains);
366 366
 			$policy .= ';';
367 367
 		}
368 368
 
369
-		if(!empty($this->allowedObjectDomains)) {
370
-			$policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains);
369
+		if (!empty($this->allowedObjectDomains)) {
370
+			$policy .= 'object-src '.implode(' ', $this->allowedObjectDomains);
371 371
 			$policy .= ';';
372 372
 		}
373 373
 
374
-		if(!empty($this->allowedFrameDomains)) {
375
-			$policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains);
374
+		if (!empty($this->allowedFrameDomains)) {
375
+			$policy .= 'frame-src '.implode(' ', $this->allowedFrameDomains);
376 376
 			$policy .= ';';
377 377
 		}
378 378
 
379
-		if(!empty($this->allowedChildSrcDomains)) {
380
-			$policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains);
379
+		if (!empty($this->allowedChildSrcDomains)) {
380
+			$policy .= 'child-src '.implode(' ', $this->allowedChildSrcDomains);
381 381
 			$policy .= ';';
382 382
 		}
383 383
 
Please login to merge, or discard this patch.
lib/public/appframework/http/jsonresponse.php 1 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.
lib/public/appframework/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 	 * @return string the starting namespace for the app
56 56
 	 * @since 8.0.0
57 57
 	 */
58
-	public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
58
+	public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') {
59 59
 		return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
lib/public/appframework/ocscontroller.php 1 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.