nextcloud / server

lib/private/OCM/OCMDiscoveryService.php

Spacing +10 added lines, -10 removed lines

@@ -65,9 +65,9 @@ 
 		if (!str_starts_with($remote, 'http://') && !str_starts_with($remote, 'https://')) {
 			// if scheme not specified, we test both;
 			try {
-				return $this->discover('https://' . $remote, $skipCache);
-			} catch (OCMProviderException|ConnectException) {
-				return $this->discover('http://' . $remote, $skipCache);
+				return $this->discover('https://'.$remote, $skipCache);
+			} catch (OCMProviderException | ConnectException) {
+				return $this->discover('http://'.$remote, $skipCache);
 			}
 		}
 
@@ -89,7 +89,7 @@ 
 					$this->remoteProviders[$remote] = $provider;
 					return $provider;
 				}
-			} catch (JsonException|OCMProviderException $e) {
+			} catch (JsonException | OCMProviderException $e) {
 				$this->logger->warning('cache issue on ocm discovery', ['exception' => $e]);
 			}
 		}
@@ -104,8 +104,8 @@ 
 				$options['verify'] = false;
 			}
 			$urls = [
-				$remote . '/.well-known/ocm',
-				$remote . '/ocm-provider',
+				$remote.'/.well-known/ocm',
+				$remote.'/ocm-provider',
 			];
 
 
@@ -140,9 +140,9 @@ 
 
 
 			throw new OCMProviderException('invalid remote ocm endpoint');
-		} catch (JsonException|OCMProviderException) {
+		} catch (JsonException | OCMProviderException) {
 			$this->cache->set($remote, false, 5 * 60);
-			throw new OCMProviderException('data returned by remote seems invalid - status: ' . ($status ?? '') . ' - body: ' . ($body ?? ''));
+			throw new OCMProviderException('data returned by remote seems invalid - status: '.($status ?? '').' - body: '.($body ?? ''));
 		} catch (\Exception $e) {
 			$this->cache->set($remote, false, 5 * 60);
 			$this->logger->warning('error while discovering ocm provider', [
@@ -161,7 +161,7 @@ 
 			return $this->localProvider;
 		}
 
-		$provider = new OCMProvider('Nextcloud ' . $this->config->getSystemValue('version'));
+		$provider = new OCMProvider('Nextcloud '.$this->config->getSystemValue('version'));
 		if (!$this->appConfig->getValueBool('core', ConfigLexicon::OCM_DISCOVERY_ENABLED)) {
 			return $provider;
 		}
@@ -202,7 +202,7 @@ 
 				} else {
 					$this->logger->debug('ocm public key feature disabled');
 				}
-			} catch (SignatoryException|IdentityNotFoundException $e) {
+			} catch (SignatoryException | IdentityNotFoundException $e) {
 				$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
 			}
 		}