Completed
Pull Request — master (#9345)
by Björn
22:56
created
lib/public/API.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 * @deprecated 9.1.0 Use the AppFramework
73 73
 	 */
74 74
 	public static function register($method, $url, $action, $app, $authLevel = self::USER_AUTH,
75
-		$defaults = array(), $requirements = array()){
75
+		$defaults = array(), $requirements = array()) {
76 76
 		\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
77 77
 	}
78 78
 
Please login to merge, or discard this patch.
lib/public/ITags.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@
 block discarded – undo
159 159
 	 * @return bool Returns false on error.
160 160
 	 * @since 6.0.0
161 161
 	 */
162
-	public function addMultiple($names, $sync=false, $id = null);
162
+	public function addMultiple($names, $sync = false, $id = null);
163 163
 
164 164
 	/**
165 165
 	 * Delete tag/object relations from the db
Please login to merge, or discard this patch.
lib/public/Files/LockNotAcquiredException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,6 +57,6 @@
 block discarded – undo
57 57
 	 * @since 7.0.0
58 58
 	 */
59 59
 	public function __toString() {
60
-		return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
60
+		return __CLASS__.": [{$this->code}]: {$this->message}\n";
61 61
 	}
62 62
 }
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.
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
 	 * @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.
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/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/Response.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function cacheFor($cacheSeconds) {
93 93
 
94
-		if($cacheSeconds > 0) {
95
-			$this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate');
94
+		if ($cacheSeconds > 0) {
95
+			$this->addHeader('Cache-Control', 'max-age='.$cacheSeconds.', must-revalidate');
96 96
 		} else {
97 97
 			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
98 98
 		}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 * @since 8.0.0
147 147
 	 */
148 148
 	public function invalidateCookies(array $cookieNames) {
149
-		foreach($cookieNames as $cookieName) {
149
+		foreach ($cookieNames as $cookieName) {
150 150
 			$this->invalidateCookie($cookieName);
151 151
 		}
152 152
 		return $this;
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 	 * @since 6.0.0 - return value was added in 7.0.0
171 171
 	 */
172 172
 	public function addHeader($name, $value) {
173
-		$name = trim($name);  // always remove leading and trailing whitespace
173
+		$name = trim($name); // always remove leading and trailing whitespace
174 174
 		                      // to be able to reliably check for security
175 175
 		                      // headers
176 176
 
177
-		if(is_null($value)) {
177
+		if (is_null($value)) {
178 178
 			unset($this->headers[$name]);
179 179
 		} else {
180 180
 			$this->headers[$name] = $value;
@@ -205,19 +205,19 @@  discard block
 block discarded – undo
205 205
 	public function getHeaders() {
206 206
 		$mergeWith = [];
207 207
 
208
-		if($this->lastModified) {
208
+		if ($this->lastModified) {
209 209
 			$mergeWith['Last-Modified'] =
210 210
 				$this->lastModified->format(\DateTime::RFC2822);
211 211
 		}
212 212
 
213 213
 		// Build Content-Security-Policy and use default if none has been specified
214
-		if(is_null($this->contentSecurityPolicy)) {
214
+		if (is_null($this->contentSecurityPolicy)) {
215 215
 			$this->setContentSecurityPolicy(new ContentSecurityPolicy());
216 216
 		}
217 217
 		$this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
218 218
 
219
-		if($this->ETag) {
220
-			$mergeWith['ETag'] = '"' . $this->ETag . '"';
219
+		if ($this->ETag) {
220
+			$mergeWith['ETag'] = '"'.$this->ETag.'"';
221 221
 		}
222 222
 
223 223
 		return array_merge($mergeWith, $this->headers);
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/FileDisplayResponse.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 	 * @param array $headers
44 44
 	 * @since 11.0.0
45 45
 	 */
46
-	public function __construct($file, $statusCode=Http::STATUS_OK,
47
-								$headers=[]) {
46
+	public function __construct($file, $statusCode = Http::STATUS_OK,
47
+								$headers = []) {
48 48
 		$this->file = $file;
49 49
 		$this->setStatus($statusCode);
50 50
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
51
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
51
+		$this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"');
52 52
 
53 53
 		$this->setETag($file->getEtag());
54 54
 		$lastModified = new \DateTime();
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function callback(IOutput $output) {
64 64
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
65
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
65
+			$output->setHeader('Content-Length: '.$this->file->getSize());
66 66
 			$output->setOutput($this->file->getContent());
67 67
 		}
68 68
 	}
Please login to merge, or discard this patch.