nextcloud / server

lib/private/Http/Client/Client.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 
 		$options['nextcloud']['allow_local_address'] = $this->isLocalAddressAllowed($options);
 		if ($options['nextcloud']['allow_local_address'] === false) {
-			$onRedirectFunction = function (
+			$onRedirectFunction = function(
 				\Psr\Http\Message\RequestInterface $request,
 				\Psr\Http\Message\ResponseInterface $response,
 				\Psr\Http\Message\UriInterface $uri,
@@ -83,7 +83,7 @@ 
 		$options = array_merge($defaults, $options);
 
 		if (!isset($options[RequestOptions::HEADERS]['User-Agent'])) {
-			$userAgent = 'Nextcloud-Server-Crawler/' . $this->serverVersion->getVersionString();
+			$userAgent = 'Nextcloud-Server-Crawler/'.$this->serverVersion->getVersionString();
 			$options[RequestOptions::HEADERS]['User-Agent'] = $userAgent;
 		}
 
@@ -135,7 +135,7 @@ 
 
 		$proxyUserPwd = $this->config->getSystemValueString('proxyuserpwd', '');
 		if ($proxyUserPwd !== '') {
-			$proxyHost = $proxyUserPwd . '@' . $proxyHost;
+			$proxyHost = $proxyUserPwd.'@'.$proxyHost;
 		}
 
 		$proxy = [
@@ -171,7 +171,7 @@ 
 		}
 
 		if (!$this->remoteHostValidator->isValid($host)) {
-			throw new LocalServerException('Host "' . $host . '" violates local access rules');
+			throw new LocalServerException('Host "'.$host.'" violates local access rules');
 		}
 	}
 

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
 			throw new \Exception('Bucket has to be configured.');
 		}
 
-		$this->id = 'amazon::' . $params['bucket'];
+		$this->id = 'amazon::'.$params['bucket'];
 
 		$this->test = isset($params['test']);
 		$this->bucket = $params['bucket'];
@@ -52,10 +52,10 @@ 
 		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
 		$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
 		$this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000;
-		$this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true);
+		$this->useMultipartCopy = (bool) ($params['useMultipartCopy'] ?? true);
 		$this->retriesMaxAttempts = $params['retriesMaxAttempts'] ?? 5;
 		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+		$params['hostname'] = empty($params['hostname']) ? 's3.'.$params['region'].'.amazonaws.com' : $params['hostname'];
 		$params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com';
 		if (!isset($params['port']) || $params['port'] === '') {
 			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
@@ -94,7 +94,7 @@ 
 		}
 
 		$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+		$base_url = $scheme.'://'.$this->params['hostname'].':'.$this->params['port'].'/';
 
 		// Adding explicit credential provider to the beginning chain.
 		// Including default credential provider (skipping AWS shared config files).
@@ -150,20 +150,20 @@ 
 		try {
 			$logger = Server::get(LoggerInterface::class);
 			if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-				$logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
+				$logger->debug('Bucket "'.$this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.',
 					['app' => 'objectstore']);
 			}
 
 			if ($this->params['verify_bucket_exists']) {
-				$cacheKey = $this->params['hostname'] . $this->bucket;
+				$cacheKey = $this->params['hostname'].$this->bucket;
 				$exist = $this->existingBucketsCache->get($cacheKey) === 1;
 
 				if (!$exist) {
 					if (!$this->connection->doesBucketExist($this->bucket)) {
 						try {
-							$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+							$logger->info('Bucket "'.$this->bucket.'" does not exist - creating it.', ['app' => 'objectstore']);
 							if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-								throw new StorageNotAvailableException('The bucket will not be created because the name is not dns compatible, please correct it: ' . $this->bucket);
+								throw new StorageNotAvailableException('The bucket will not be created because the name is not dns compatible, please correct it: '.$this->bucket);
 							}
 							$this->connection->createBucket(['Bucket' => $this->bucket]);
 							Server::get(IEventDispatcher::class)
@@ -180,7 +180,7 @@ 
 								'app' => 'objectstore',
 							]);
 							if ($e->getAwsErrorCode() !== 'BucketAlreadyOwnedByYou') {
-								throw new StorageNotAvailableException('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+								throw new StorageNotAvailableException('Creation of bucket "'.$this->bucket.'" failed. '.$e->getMessage());
 							}
 						}
 					}
@@ -193,7 +193,7 @@ 
 				$this->connection->getHandlerList()->remove('s3.auto_encode');
 			}
 		} catch (S3Exception $e) {
-			throw new StorageNotAvailableException('S3 service is unable to handle request: ' . $e->getMessage());
+			throw new StorageNotAvailableException('S3 service is unable to handle request: '.$e->getMessage());
 		}
 
 		return $this->connection;
@@ -222,7 +222,7 @@ 
 	 * This function creates a credential provider based on user parameter file
 	 */
 	protected function paramCredentialProvider(): callable {
-		return function () {
+		return function() {
 			$key = empty($this->params['key']) ? null : $this->params['key'];
 			$secret = empty($this->params['secret']) ? null : $this->params['secret'];
 			$sessionToken = empty($this->params['session_token']) ? null : $this->params['session_token'];
@@ -240,7 +240,7 @@ 
 	}
 
 	protected function getCertificateBundlePath(): ?string {
-		if ((int)($this->params['use_nextcloud_bundle'] ?? '0')) {
+		if ((int) ($this->params['use_nextcloud_bundle'] ?? '0')) {
 			/** @var ICertificateManager $certManager */
 			$certManager = Server::get(ICertificateManager::class);
 			// since we store the certificate bundles on the primary storage, we can't get the bundle while setting up the primary storage

lib/private/Security/CertificateManager.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
 			return [];
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return [];
 		}
@@ -51,7 +51,7 @@ 
 		while (false !== ($file = readdir($handle))) {
 			if ($file != '.' && $file != '..') {
 				try {
-					$content = $this->view->file_get_contents($path . $file);
+					$content = $this->view->file_get_contents($path.$file);
 					if ($content !== false) {
 						$result[] = new Certificate($content, $file);
 					} else {
@@ -71,7 +71,7 @@ 
 			return false;
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return false;
 		}
@@ -108,17 +108,17 @@ 
 			return;
 		}
 
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+		$certPath = $path.'rootcerts.crt';
+		$tmpPath = $certPath.'.tmp'.$this->random->generate(10, ISecureRandom::CHAR_DIGITS);
 		$fhCerts = $this->view->fopen($tmpPath, 'w');
 
 		if (!is_resource($fhCerts)) {
-			throw new \RuntimeException('Unable to open file handler to create certificate bundle "' . $tmpPath . '".');
+			throw new \RuntimeException('Unable to open file handler to create certificate bundle "'.$tmpPath.'".');
 		}
 
 		// Write user certificates
 		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
+			$file = $path.'/uploads/'.$cert->getName();
 			$data = $this->view->file_get_contents($file);
 			if (strpos($data, 'BEGIN CERTIFICATE')) {
 				fwrite($fhCerts, $data);
@@ -149,7 +149,7 @@ 
 	 * @throws \Exception If the certificate could not get added
 	 */
 	public function addCertificate(string $certificate, string $name): ICertificate {
-		$path = $this->getPathToCertificates() . 'uploads/' . $name;
+		$path = $this->getPathToCertificates().'uploads/'.$name;
 		$directory = dirname($path);
 
 		$this->view->verifyPath($directory, basename($path));
@@ -173,7 +173,7 @@ 
 	 * Remove the certificate and re-generate the certificate bundle
 	 */
 	public function removeCertificate(string $name): bool {
-		$path = $this->getPathToCertificates() . 'uploads/' . $name;
+		$path = $this->getPathToCertificates().'uploads/'.$name;
 
 		try {
 			$this->view->verifyPath(dirname($path), basename($path));
@@ -193,7 +193,7 @@ 
 	 * Get the path to the certificate bundle
 	 */
 	public function getCertificateBundle(): string {
-		return $this->getPathToCertificates() . 'rootcerts.crt';
+		return $this->getPathToCertificates().'rootcerts.crt';
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 					$this->bundlePath = $this->view->getLocalFile($certificateBundle) ?: null;
 
 					if ($this->bundlePath === null) {
-						throw new \RuntimeException('Unable to get certificate bundle "' . $certificateBundle . '".');
+						throw new \RuntimeException('Unable to get certificate bundle "'.$certificateBundle.'".');
 					}
 				}
 			}
@@ -250,6 +250,6 @@ 
 	}
 
 	public function getDefaultCertificatesBundlePath(): string {
-		return $this->config->getSystemValueString('default_certificates_bundle_path', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+		return $this->config->getSystemValueString('default_certificates_bundle_path', \OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 	}
 }

config/config.sample.php

Spacing +2 added lines, -2 removed lines

@@ -1797,7 +1797,7 @@ 
 	 * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
 	 */
 	'redis.cluster' => [
-		'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required
+		'seeds' => [// provide some or all of the cluster servers to bootstrap discovery, port required
 			'localhost:7000',
 			'localhost:7001',
 		],
@@ -2885,5 +2885,5 @@ 
 	 *
 	 * Defaults to `\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'`.
 	 */
-	'default_certificates_bundle_path' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt',
+	'default_certificates_bundle_path' => \OC::$SERVERROOT.'/resources/config/ca-bundle.crt',
 ];

tests/lib/Http/Client/ClientTest.php

Spacing +5 added lines, -5 removed lines

@@ -476,13 +476,13 @@ 
 		$this->certificateManager
 			->expects($this->once())
 			->method('getDefaultCertificatesBundlePath')
-			->willReturn(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+			->willReturn(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 
 		$this->serverVersion->method('getVersionString')
 			->willReturn('123.45.6');
 
 		$this->assertEquals([
-			'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt',
+			'verify' => \OC::$SERVERROOT.'/resources/config/ca-bundle.crt',
 			'headers' => [
 				'User-Agent' => 'Nextcloud-Server-Crawler/123.45.6',
 				'Accept-Encoding' => 'gzip',
@@ -492,7 +492,7 @@ 
 				'allow_local_address' => false,
 			],
 			'allow_redirects' => [
-				'on_redirect' => function (
+				'on_redirect' => function(
 					\Psr\Http\Message\RequestInterface $request,
 					\Psr\Http\Message\ResponseInterface $response,
 					\Psr\Http\Message\UriInterface $uri,
@@ -546,7 +546,7 @@ 
 				'allow_local_address' => false,
 			],
 			'allow_redirects' => [
-				'on_redirect' => function (
+				'on_redirect' => function(
 					\Psr\Http\Message\RequestInterface $request,
 					\Psr\Http\Message\ResponseInterface $response,
 					\Psr\Http\Message\UriInterface $uri,
@@ -601,7 +601,7 @@ 
 				'allow_local_address' => false,
 			],
 			'allow_redirects' => [
-				'on_redirect' => function (
+				'on_redirect' => function(
 					\Psr\Http\Message\RequestInterface $request,
 					\Psr\Http\Message\ResponseInterface $response,
 					\Psr\Http\Message\UriInterface $uri,

tests/lib/Security/CertificateManagerTest.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 		$this->createUser($this->username, '');
 
 		$storage = new Temporary();
-		$this->registerMount($this->username, $storage, '/' . $this->username . '/');
+		$this->registerMount($this->username, $storage, '/'.$this->username.'/');
 
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId($this->username);
@@ -55,8 +55,8 @@ 
 		$config
 			->expects($this->any())
 			->method('getSystemValueString')
-			->with('default_certificates_bundle_path', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt')
-			->willReturn(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+			->with('default_certificates_bundle_path', \OC::$SERVERROOT.'/resources/config/ca-bundle.crt')
+			->willReturn(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 
 		$this->random = $this->createMock(ISecureRandom::class);
 		$this->random->method('generate')
@@ -90,14 +90,14 @@ 
 		$this->assertSame([], $this->certificateManager->listCertificates());
 
 		// Add some certificates
-		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
+		$this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
 		$certificateStore = [];
-		$certificateStore[] = new Certificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
+		$certificateStore[] = new Certificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
 		$this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates());
 
 		// Add another certificates
-		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate');
-		$certificateStore[] = new Certificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate');
+		$this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate');
+		$certificateStore[] = new Certificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), 'ExpiredCertificate');
 		$this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates());
 	}
 
@@ -123,7 +123,7 @@ 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dangerousFileProvider')]
 	public function testAddDangerousFile($filename): void {
 		$this->expectException(InvalidPathException::class);
-		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename);
+		$this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'), $filename);
 	}
 
 	public function testRemoveDangerousFile(): void {
@@ -131,7 +131,7 @@ 
 	}
 
 	public function testRemoveExistingFile(): void {
-		$this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
+		$this->certificateManager->addCertificate(file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'), 'GoodCertificate');
 		$this->assertTrue($this->certificateManager->removeCertificate('GoodCertificate'));
 	}
 
@@ -174,7 +174,7 @@ 
 
 
 		$view->expects($this->any())->method('filemtime')
-			->willReturnCallback(function ($path) use ($targetBundleMtime) {
+			->willReturnCallback(function($path) use ($targetBundleMtime) {
 				if ($path === 'targetBundlePath') {
 					return $targetBundleMtime;
 				}