Passed
Push — master ( 11b71a...ce642f )
by Roeland
10:28
created
lib/private/Files/Stream/Encryption.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -196,9 +196,9 @@  discard block
 block discarded – undo
196 196
 		try {
197 197
 			stream_wrapper_register($protocol, $class);
198 198
 			if (self::isDirectoryHandle($source)) {
199
-				$wrapped = opendir($protocol . '://', $context);
199
+				$wrapped = opendir($protocol.'://', $context);
200 200
 			} else {
201
-				$wrapped = fopen($protocol . '://', $mode, false, $context);
201
+				$wrapped = fopen($protocol.'://', $mode, false, $context);
202 202
 			}
203 203
 		} catch (\BadMethodCallException $e) {
204 204
 			stream_wrapper_unregister($protocol);
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 			if (array_key_exists($property, $context)) {
223 223
 				$this->{$property} = $context[$property];
224 224
 			} else {
225
-				throw new \BadMethodCallException('Invalid context, "' . $property . '" options not set');
225
+				throw new \BadMethodCallException('Invalid context, "'.$property.'" options not set');
226 226
 			}
227 227
 		}
228 228
 		return $context;
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 
325 325
 			// for seekable streams the pointer is moved back to the beginning of the encrypted block
326 326
 			// flush will start writing there when the position moves to another block
327
-			$positionInFile = (int)floor($this->position / $this->unencryptedBlockSize) *
327
+			$positionInFile = (int) floor($this->position / $this->unencryptedBlockSize) *
328 328
 				$this->util->getBlockSize() + $this->headerSize;
329 329
 			$resultFseek = $this->parentStreamSeek($positionInFile);
330 330
 
@@ -341,14 +341,14 @@  discard block
 block discarded – undo
341 341
 				// update position and liberate $data
342 342
 				if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
343 343
 					$this->cache = substr($this->cache, 0, $blockPosition)
344
-						. $data . substr($this->cache, $blockPosition + $remainingLength);
344
+						. $data.substr($this->cache, $blockPosition + $remainingLength);
345 345
 					$this->position += $remainingLength;
346 346
 					$length += $remainingLength;
347 347
 					$data = '';
348 348
 					// if $data doesn't fit the current block, the fill the current block and reiterate
349 349
 					// after the block is filled, it is flushed and $data is updatedxxx
350 350
 				} else {
351
-					$this->cache = substr($this->cache, 0, $blockPosition) .
351
+					$this->cache = substr($this->cache, 0, $blockPosition).
352 352
 						substr($data, 0, $this->unencryptedBlockSize - $blockPosition);
353 353
 					$this->flush();
354 354
 					$this->position += ($this->unencryptedBlockSize - $blockPosition);
@@ -406,10 +406,10 @@  discard block
 block discarded – undo
406 406
 
407 407
 	public function stream_close() {
408 408
 		$this->flush('end');
409
-		$position = (int)floor($this->position/$this->unencryptedBlockSize);
410
-		$remainingData = $this->encryptionModule->end($this->fullPath, $position . 'end');
409
+		$position = (int) floor($this->position / $this->unencryptedBlockSize);
410
+		$remainingData = $this->encryptionModule->end($this->fullPath, $position.'end');
411 411
 		if ($this->readOnly === false) {
412
-			if(!empty($remainingData)) {
412
+			if (!empty($remainingData)) {
413 413
 				parent::stream_write($remainingData);
414 414
 			}
415 415
 			$this->encryptionStorage->updateUnencryptedSize($this->fullPath, $this->unencryptedSize);
@@ -428,16 +428,16 @@  discard block
 block discarded – undo
428 428
 			// automatically attempted when the file is written to disk -
429 429
 			// we are handling that separately here and we don't want to
430 430
 			// get into an infinite loop
431
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
432
-			$encrypted = $this->encryptionModule->encrypt($this->cache, $position . $positionPrefix);
431
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
432
+			$encrypted = $this->encryptionModule->encrypt($this->cache, $position.$positionPrefix);
433 433
 			$bytesWritten = parent::stream_write($encrypted);
434 434
 			$this->writeFlag = false;
435 435
 			// Check whether the write concerns the last block
436 436
 			// If so then update the encrypted filesize
437 437
 			// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
438 438
 			// We recalculate the encrypted filesize as we do not know the context of calling flush()
439
-			$completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
440
-			if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
439
+			$completeBlocksInFile = (int) floor($this->unencryptedSize / $this->unencryptedBlockSize);
440
+			if ($completeBlocksInFile === (int) floor($this->position / $this->unencryptedBlockSize)) {
441 441
 				$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
442 442
 				$this->size += $bytesWritten;
443 443
 				$this->size += $this->headerSize;
@@ -456,9 +456,9 @@  discard block
 block discarded – undo
456 456
 		if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
457 457
 			// Get the data from the file handle
458 458
 			$data = parent::stream_read($this->util->getBlockSize());
459
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
460
-			$numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
461
-			if($numberOfChunks === $position) {
459
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
460
+			$numberOfChunks = (int) ($this->unencryptedSize / $this->unencryptedBlockSize);
461
+			if ($numberOfChunks === $position) {
462 462
 				$position .= 'end';
463 463
 			}
464 464
 			$this->cache = $this->encryptionModule->decrypt($data, $position);
Please login to merge, or discard this patch.
core/Controller/PreviewController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 	 * @param string $mode
89 89
 	 * @return DataResponse|FileDisplayResponse
90 90
 	 */
91
-	public function getPreview (
91
+	public function getPreview(
92 92
 		string $file = '',
93 93
 		int $x = 32,
94 94
 		int $y = 32,
Please login to merge, or discard this patch.
lib/private/Mail/Message.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,8 +72,8 @@
 block discarded – undo
72 72
 
73 73
 		$convertedAddresses = [];
74 74
 
75
-		foreach($addresses as $email => $readableName) {
76
-			if(!is_numeric($email)) {
75
+		foreach ($addresses as $email => $readableName) {
76
+			if (!is_numeric($email)) {
77 77
 				list($name, $domain) = explode('@', $email, 2);
78 78
 				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
79 79
 				$convertedAddresses[$name.'@'.$domain] = $readableName;
Please login to merge, or discard this patch.
lib/private/Mail/EMailTemplate.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 
403 403
 		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
404 404
 		if ($plainTitle !== false) {
405
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
405
+			$this->plainBody .= $plainTitle.PHP_EOL.PHP_EOL;
406 406
 		}
407 407
 	}
408 408
 
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 
439 439
 		$this->htmlBody .= vsprintf($this->bodyText, [$text]);
440 440
 		if ($plainText !== false) {
441
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
441
+			$this->plainBody .= $plainText.PHP_EOL.PHP_EOL;
442 442
 		}
443 443
 	}
444 444
 
@@ -468,18 +468,18 @@  discard block
 block discarded – undo
468 468
 
469 469
 		$htmlText = $text;
470 470
 		if ($metaInfo) {
471
-			$htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText;
471
+			$htmlText = '<em style="color:#777;">'.$metaInfo.'</em><br>'.$htmlText;
472 472
 		}
473 473
 		if ($icon !== '') {
474
-			$icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';
474
+			$icon = '<img src="'.htmlspecialchars($icon).'" alt="&bull;">';
475 475
 		} else {
476 476
 			$icon = '&bull;';
477 477
 		}
478 478
 		$this->htmlBody .= vsprintf($this->listItem, [$icon, $htmlText]);
479 479
 		if ($plainText !== false) {
480
-			$this->plainBody .= '  * ' . $plainText;
480
+			$this->plainBody .= '  * '.$plainText;
481 481
 			if ($plainMetaInfo !== false) {
482
-				$this->plainBody .= ' (' . $plainMetaInfo . ')';
482
+				$this->plainBody .= ' ('.$plainMetaInfo.')';
483 483
 			}
484 484
 			$this->plainBody .= PHP_EOL;
485 485
 		}
@@ -540,8 +540,8 @@  discard block
 block discarded – undo
540 540
 		$textColor = $this->themingDefaults->getTextColorPrimary();
541 541
 
542 542
 		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]);
543
-		$this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
544
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
543
+		$this->plainBody .= $plainTextLeft.': '.$urlLeft.PHP_EOL;
544
+		$this->plainBody .= $plainTextRight.': '.$urlRight.PHP_EOL.PHP_EOL;
545 545
 
546 546
 	}
547 547
 
@@ -573,10 +573,10 @@  discard block
 block discarded – undo
573 573
 		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]);
574 574
 
575 575
 		if ($plainText !== false) {
576
-			$this->plainBody .= $plainText . ': ';
576
+			$this->plainBody .= $plainText.': ';
577 577
 		}
578 578
 
579
-		$this->plainBody .=  $url . PHP_EOL;
579
+		$this->plainBody .= $url.PHP_EOL;
580 580
 
581 581
 	}
582 582
 
@@ -600,8 +600,8 @@  discard block
 block discarded – undo
600 600
 	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
601 601
 	 */
602 602
 	public function addFooter(string $text = '') {
603
-		if($text === '') {
604
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically sent email, please do not reply.');
603
+		if ($text === '') {
604
+			$text = $this->themingDefaults->getName().' - '.$this->themingDefaults->getSlogan().'<br>'.$this->l10n->t('This is an automatically sent email, please do not reply.');
605 605
 		}
606 606
 
607 607
 		if ($this->footerAdded) {
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 
614 614
 		$this->htmlBody .= vsprintf($this->footer, [$text]);
615 615
 		$this->htmlBody .= $this->tail;
616
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
616
+		$this->plainBody .= PHP_EOL.'-- '.PHP_EOL;
617 617
 		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
618 618
 	}
619 619
 
Please login to merge, or discard this patch.
lib/private/Federation/CloudIdManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 	 */
81 81
 	public function getCloudId(string $user, string $remote): ICloudId {
82 82
 		// TODO check what the correct url is for remote (asking the remote)
83
-		return new CloudId($user. '@' . $remote, $user, $remote);
83
+		return new CloudId($user.'@'.$remote, $user, $remote);
84 84
 	}
85 85
 
86 86
 	/**
Please login to merge, or discard this patch.
lib/private/AppFramework/Http/Dispatcher.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 			// exception and creates a response. If no response is created, it is
103 103
 			// assumed that theres no middleware who can handle it and the error is
104 104
 			// thrown again
105
-		} catch(\Exception $exception){
105
+		} catch (\Exception $exception) {
106 106
 			$response = $this->middlewareDispatcher->afterException(
107 107
 				$controller, $methodName, $exception);
108 108
 		}
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		// valid types that will be casted
138 138
 		$types = ['int', 'integer', 'bool', 'boolean', 'float'];
139 139
 
140
-		foreach($this->reflector->getParameters() as $param => $default) {
140
+		foreach ($this->reflector->getParameters() as $param => $default) {
141 141
 
142 142
 			// try to get the parameter from the request object and cast
143 143
 			// it to the type annotated in the @param annotation
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 			// if this is submitted using GET or a POST form, 'false' should be
148 148
 			// converted to false
149
-			if(($type === 'bool' || $type === 'boolean') &&
149
+			if (($type === 'bool' || $type === 'boolean') &&
150 150
 				$value === 'false' &&
151 151
 				(
152 152
 					$this->request->method === 'GET' ||
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			) {
157 157
 				$value = false;
158 158
 
159
-			} elseif($value !== null && \in_array($type, $types, true)) {
159
+			} elseif ($value !== null && \in_array($type, $types, true)) {
160 160
 				settype($value, $type);
161 161
 			}
162 162
 
@@ -166,13 +166,13 @@  discard block
 block discarded – undo
166 166
 		$response = \call_user_func_array([$controller, $methodName], $arguments);
167 167
 
168 168
 		// format response
169
-		if($response instanceof DataResponse || !($response instanceof Response)) {
169
+		if ($response instanceof DataResponse || !($response instanceof Response)) {
170 170
 
171 171
 			// get format from the url format or request format parameter
172 172
 			$format = $this->request->getParam('format');
173 173
 
174 174
 			// if none is given try the first Accept header
175
-			if($format === null) {
175
+			if ($format === null) {
176 176
 				$headers = $this->request->getHeader('Accept');
177 177
 				$format = $controller->getResponderByHTTPHeader($headers, null);
178 178
 			}
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/MiddlewareDispatcher.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	/**
54 54
 	 * Constructor
55 55
 	 */
56
-	public function __construct(){
56
+	public function __construct() {
57 57
 		$this->middlewares = [];
58 58
 		$this->middlewareCounter = 0;
59 59
 	}
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 * Adds a new middleware
64 64
 	 * @param Middleware $middleWare the middleware which will be added
65 65
 	 */
66
-	public function registerMiddleware(Middleware $middleWare){
66
+	public function registerMiddleware(Middleware $middleWare) {
67 67
 		$this->middlewares[] = $middleWare;
68 68
 	}
69 69
 
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 	 * @param string $methodName the name of the method that will be called on
86 86
 	 *                           the controller
87 87
 	 */
88
-	public function beforeController(Controller $controller, string $methodName){
88
+	public function beforeController(Controller $controller, string $methodName) {
89 89
 		// we need to count so that we know which middlewares we have to ask in
90 90
 		// case there is an exception
91 91
 		$middlewareCount = \count($this->middlewares);
92
-		for($i = 0; $i < $middlewareCount; $i++){
92
+		for ($i = 0; $i < $middlewareCount; $i++) {
93 93
 			$this->middlewareCounter++;
94 94
 			$middleware = $this->middlewares[$i];
95 95
 			$middleware->beforeController($controller, $methodName);
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 	 * @throws \Exception the passed in exception if it can't handle it
114 114
 	 */
115 115
 	public function afterException(Controller $controller, string $methodName, \Exception $exception): Response {
116
-		for($i=$this->middlewareCounter-1; $i>=0; $i--){
116
+		for ($i = $this->middlewareCounter - 1; $i >= 0; $i--) {
117 117
 			$middleware = $this->middlewares[$i];
118 118
 			try {
119 119
 				return $middleware->afterException($controller, $methodName, $exception);
120
-			} catch(\Exception $exception){
120
+			} catch (\Exception $exception) {
121 121
 				continue;
122 122
 			}
123 123
 		}
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @return Response a Response object
137 137
 	 */
138 138
 	public function afterController(Controller $controller, string $methodName, Response $response): Response {
139
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
139
+		for ($i = \count($this->middlewares) - 1; $i >= 0; $i--) {
140 140
 			$middleware = $this->middlewares[$i];
141 141
 			$response = $middleware->afterController($controller, $methodName, $response);
142 142
 		}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 * @return string the output that should be printed
156 156
 	 */
157 157
 	public function beforeOutput(Controller $controller, string $methodName, string $output): string {
158
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
158
+		for ($i = \count($this->middlewares) - 1; $i >= 0; $i--) {
159 159
 			$middleware = $this->middlewares[$i];
160 160
 			$output = $middleware->beforeOutput($controller, $methodName, $output);
161 161
 		}
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/ControllerMethodReflector.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @param object $object an object or classname
44 44
 	 * @param string $method the method which we want to inspect
45 45
 	 */
46
-	public function reflect($object, string $method){
46
+	public function reflect($object, string $method) {
47 47
 		$reflection = new \ReflectionMethod($object, $method);
48 48
 		$docs = $reflection->getDocComment();
49 49
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 			}
83 83
 
84 84
 			$default = null;
85
-			if($param->isOptional()) {
85
+			if ($param->isOptional()) {
86 86
 				$default = $param->getDefaultValue();
87 87
 			}
88 88
 			$this->parameters[$param->name] = $default;
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 * would return int or null if not existing
98 98
 	 */
99 99
 	public function getType(string $parameter) {
100
-		if(array_key_exists($parameter, $this->types)) {
100
+		if (array_key_exists($parameter, $this->types)) {
101 101
 			return $this->types[$parameter];
102 102
 		}
103 103
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return string
129 129
 	 */
130 130
 	public function getAnnotationParameter(string $name, string $key): string {
131
-		if(isset($this->annotations[$name][$key])) {
131
+		if (isset($this->annotations[$name][$key])) {
132 132
 			return $this->annotations[$name][$key];
133 133
 		}
134 134
 
Please login to merge, or discard this patch.
lib/private/OCS/DiscoveryService.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	public function discover(string $remote, string $service, bool $skipCache = false): array {
66 66
 		// Check the cache first
67 67
 		if ($skipCache === false) {
68
-			$cacheData = $this->cache->get($remote . '#' . $service);
68
+			$cacheData = $this->cache->get($remote.'#'.$service);
69 69
 			if ($cacheData) {
70 70
 				$data = json_decode($cacheData, true);
71 71
 				if (\is_array($data)) {
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 
79 79
 		// query the remote server for available services
80 80
 		try {
81
-			$response = $this->client->get($remote . '/ocs-provider/', [
81
+			$response = $this->client->get($remote.'/ocs-provider/', [
82 82
 				'timeout' => 10,
83 83
 				'connect_timeout' => 10,
84 84
 			]);
85
-			if($response->getStatusCode() === Http::STATUS_OK) {
85
+			if ($response->getStatusCode() === Http::STATUS_OK) {
86 86
 				$decodedServices = json_decode($response->getBody(), true);
87 87
 				if (\is_array($decodedServices)) {
88 88
 					$discoveredServices = $this->getEndpoints($decodedServices, $service);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		}
94 94
 
95 95
 		// Write into cache
96
-		$this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60*60*24);
96
+		$this->cache->set($remote.'#'.$service, json_encode($discoveredServices), 60 * 60 * 24);
97 97
 		return $discoveredServices;
98 98
 	}
99 99
 
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 
109 109
 		$discoveredServices = [];
110 110
 
111
-		if(isset($decodedServices['services'][$service]['endpoints'])) {
111
+		if (isset($decodedServices['services'][$service]['endpoints'])) {
112 112
 			foreach ($decodedServices['services'][$service]['endpoints'] as $endpoint => $url) {
113
-				if($this->isSafeUrl($url)) {
113
+				if ($this->isSafeUrl($url)) {
114 114
 					$discoveredServices[$endpoint] = $url;
115 115
 				}
116 116
 			}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @return bool
128 128
 	 */
129 129
 	protected function isSafeUrl(string $url): bool {
130
-		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
130
+		return (bool) preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
131 131
 	}
132 132
 
133 133
 }
Please login to merge, or discard this patch.