Completed
Pull Request — master (#8630)
by Blizzz
25:22 queued 01:35
created
lib/private/DB/ConnectionFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 				if ($host === '') {
134 134
 					$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
135 135
 				} else {
136
-					$additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
136
+					$additionalConnectionParams['dbname'] = '//'.$host.(!empty($port) ? ":{$port}" : "").'/'.$dbName;
137 137
 				}
138 138
 				unset($additionalConnectionParams['host']);
139 139
 				break;
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
 		$name = $this->config->getValue('dbname', 'owncloud');
188 188
 
189 189
 		if ($this->normalizeType($type) === 'sqlite3') {
190
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
191
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
190
+			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data');
191
+			$connectionParams['path'] = $dataDir.'/'.$name.'.db';
192 192
 		} else {
193 193
 			$host = $this->config->getValue('dbhost', '');
194 194
 			if (strpos($host, ':')) {
Please login to merge, or discard this patch.
lib/private/Share20/ShareHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 		}
115 115
 
116 116
 		$item = $node;
117
-		$appendix = '/' . $node->getName();
117
+		$appendix = '/'.$node->getName();
118 118
 		while (!empty($byId)) {
119 119
 			try {
120 120
 				/** @var Node $item */
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
 
123 123
 				if (!empty($byId[$item->getId()])) {
124 124
 					foreach ($byId[$item->getId()] as $uid => $path) {
125
-						$results[$uid] = $path . $appendix;
125
+						$results[$uid] = $path.$appendix;
126 126
 					}
127 127
 					unset($byId[$item->getId()]);
128 128
 				}
129 129
 
130
-				$appendix = '/' . $item->getName() . $appendix;
130
+				$appendix = '/'.$item->getName().$appendix;
131 131
 			} catch (NotFoundException $e) {
132 132
 				return $results;
133 133
 			} catch (InvalidPathException $e) {
@@ -212,6 +212,6 @@  discard block
 block discarded – undo
212 212
 	protected function getMountedPath(Node $node) {
213 213
 		$path = $node->getPath();
214 214
 		$sections = explode('/', $path, 4);
215
-		return '/' . $sections[3];
215
+		return '/'.$sections[3];
216 216
 	}
217 217
 }
Please login to merge, or discard this patch.
lib/private/legacy/response.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	*/
48 48
 	static public function enableCaching($cache_time = null) {
49 49
 		if (is_numeric($cache_time)) {
50
-			header('Pragma: public');// enable caching in IE
50
+			header('Pragma: public'); // enable caching in IE
51 51
 			if ($cache_time > 0) {
52 52
 				self::setExpiresHeader('PT'.$cache_time.'S');
53 53
 				header('Cache-Control: max-age='.$cache_time.', must-revalidate');
@@ -78,29 +78,29 @@  discard block
 block discarded – undo
78 78
 	*/
79 79
 	static public function setStatus($status) {
80 80
 		$protocol = \OC::$server->getRequest()->getHttpProtocol();
81
-		switch($status) {
81
+		switch ($status) {
82 82
 			case self::STATUS_NOT_MODIFIED:
83
-				$status = $status . ' Not Modified';
83
+				$status = $status.' Not Modified';
84 84
 				break;
85 85
 			case self::STATUS_TEMPORARY_REDIRECT:
86 86
 				if ($protocol == 'HTTP/1.1') {
87
-					$status = $status . ' Temporary Redirect';
87
+					$status = $status.' Temporary Redirect';
88 88
 					break;
89 89
 				} else {
90 90
 					$status = self::STATUS_FOUND;
91 91
 					// fallthrough
92 92
 				}
93 93
 			case self::STATUS_FOUND;
94
-				$status = $status . ' Found';
94
+				$status = $status.' Found';
95 95
 				break;
96 96
 			case self::STATUS_NOT_FOUND;
97
-				$status = $status . ' Not Found';
97
+				$status = $status.' Not Found';
98 98
 				break;
99 99
 			case self::STATUS_INTERNAL_SERVER_ERROR;
100
-				$status = $status . ' Internal Server Error';
100
+				$status = $status.' Internal Server Error';
101 101
 				break;
102 102
 			case self::STATUS_SERVICE_UNAVAILABLE;
103
-				$status = $status . ' Service Unavailable';
103
+				$status = $status.' Service Unavailable';
104 104
 				break;
105 105
 		}
106 106
 		header($protocol.' '.$status);
@@ -180,17 +180,17 @@  discard block
 block discarded – undo
180 180
 	 * @param string $filename file name
181 181
 	 * @param string $type disposition type, either 'attachment' or 'inline'
182 182
 	 */
183
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
183
+	static public function setContentDispositionHeader($filename, $type = 'attachment') {
184 184
 		if (\OC::$server->getRequest()->isUserAgent(
185 185
 			[
186 186
 				\OC\AppFramework\Http\Request::USER_AGENT_IE,
187 187
 				\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
188 188
 				\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
189 189
 			])) {
190
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' );
190
+			header('Content-Disposition: '.rawurlencode($type).'; filename="'.rawurlencode($filename).'"');
191 191
 		} else {
192
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename )
193
-												 . '; filename="' . rawurlencode( $filename ) . '"' );
192
+			header('Content-Disposition: '.rawurlencode($type).'; filename*=UTF-8\'\''.rawurlencode($filename)
193
+												 . '; filename="'.rawurlencode($filename).'"');
194 194
 		}
195 195
 	}
196 196
 
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
 			. 'connect-src *; '
257 257
 			. 'object-src \'none\'; '
258 258
 			. 'base-uri \'self\'; ';
259
-		header('Content-Security-Policy:' . $policy);
259
+		header('Content-Security-Policy:'.$policy);
260 260
 		header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
261 261
 
262 262
 		// Send fallback headers for installations that don't have the possibility to send
263 263
 		// custom headers on the webserver side
264
-		if(getenv('modHeadersAvailable') !== 'true') {
264
+		if (getenv('modHeadersAvailable') !== 'true') {
265 265
 			header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
266 266
 			header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
267 267
 			header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
Please login to merge, or discard this patch.
apps/files_sharing/lib/SharedStorage.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * @return string
174 174
 	 */
175 175
 	public function getId() {
176
-		return 'shared::' . $this->getMountPoint();
176
+		return 'shared::'.$this->getMountPoint();
177 177
 	}
178 178
 
179 179
 	/**
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 					}
270 270
 			}
271 271
 			$info = array(
272
-				'target' => $this->getMountPoint() . $path,
272
+				'target' => $this->getMountPoint().$path,
273 273
 				'source' => $source,
274 274
 				'mode' => $mode,
275 275
 			);
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 
479 479
 	public function file_get_contents($path) {
480 480
 		$info = [
481
-			'target' => $this->getMountPoint() . '/' . $path,
481
+			'target' => $this->getMountPoint().'/'.$path,
482 482
 			'source' => $this->getUnjailedPath($path),
483 483
 		];
484 484
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 
488 488
 	public function file_put_contents($path, $data) {
489 489
 		$info = [
490
-			'target' => $this->getMountPoint() . '/' . $path,
490
+			'target' => $this->getMountPoint().'/'.$path,
491 491
 			'source' => $this->getUnjailedPath($path),
492 492
 		];
493 493
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);
Please login to merge, or discard this patch.
settings/Activity/Provider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
50 50
 		$placeholders = $replacements = [];
51 51
 		foreach ($parameters as $placeholder => $parameter) {
52
-			$placeholders[] = '{' . $placeholder . '}';
52
+			$placeholders[] = '{'.$placeholder.'}';
53 53
 			$replacements[] = $parameter['name'];
54 54
 		}
55 55
 
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,22 +39,22 @@
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	public function md5($input) {
42
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
42
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
43 43
 	}
44 44
 
45 45
 	public function concat($x, $y) {
46
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
46
+		return new QueryFunction('CONCAT('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
47 47
 	}
48 48
 
49 49
 	public function substring($input, $start, $length = null) {
50 50
 		if ($length) {
51
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
51
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
52 52
 		} else {
53
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
53
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
54 54
 		}
55 55
 	}
56 56
 
57 57
 	public function sum($field) {
58
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
58
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
59 59
 	}
60 60
 }
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
85 85
 		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
86 86
 		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
87
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
88
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
87
+		$rateLimitIdentifier = get_class($controller).'::'.$methodName;
88
+		if ($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
89 89
 			$this->limiter->registerUserRequest(
90 90
 				$rateLimitIdentifier,
91 91
 				$userLimit,
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 	 * {@inheritDoc}
107 107
 	 */
108 108
 	public function afterException($controller, $methodName, \Exception $exception) {
109
-		if($exception instanceof RateLimitExceededException) {
110
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
109
+		if ($exception instanceof RateLimitExceededException) {
110
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
111 111
 				$response = new JSONResponse(
112 112
 					[
113 113
 						'message' => $exception->getMessage(),
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	public function beforeController($controller, $methodName) {
62 62
 		parent::beforeController($controller, $methodName);
63 63
 
64
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
64
+		if ($this->reflector->hasAnnotation('BruteForceProtection')) {
65 65
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
66 66
 			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
67 67
 		}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * {@inheritDoc}
72 72
 	 */
73 73
 	public function afterController($controller, $methodName, Response $response) {
74
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
74
+		if ($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
75 75
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
76 76
 			$ip = $this->request->getRemoteAddress();
77 77
 			$this->throttler->sleepDelay($ip, $action);
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/UserStoragesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@
 block discarded – undo
198 198
 		} catch (NotFoundException $e) {
199 199
 			return new DataResponse(
200 200
 				[
201
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
201
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
202 202
 				],
203 203
 				Http::STATUS_NOT_FOUND
204 204
 			);
Please login to merge, or discard this patch.