fix(settings): Adjust order of parameters for runRequest

Fixing invalid request to host `HEAD`. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Mar 8, 2024 · 58f57fd · 58f57fd
1 parent b6691b3
commit 58f57fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/settings/lib/SetupChecks/CheckServerResponseTrait.php b/apps/settings/lib/SetupChecks/CheckServerResponseTrait.php
@@ -74,8 +74,8 @@ protected function getTestUrls(string $url): array {
 
 	/**
 	 * Run a HTTP request to check header
-	 * @param string $url The relative URL to check
 	 * @param string $method The HTTP method to use
+	 * @param string $url The relative URL to check
 	 * @param array{ignoreSSL?: bool, httpErrors?: bool, options?: array} $options Additional options, like
 	 *                                                 [
 	 *                                                  // Ignore invalid SSL certificates (e.g. self signed)
@@ -86,7 +86,7 @@ protected function getTestUrls(string $url): array {
 	 *
 	 * @return Generator<int, IResponse>
 	 */
-	protected function runRequest(string $url, string $method, array $options = []): Generator {
+	protected function runRequest(string $method, string $url, array $options = []): Generator {
 		$options = array_merge(['ignoreSSL' => true, 'httpErrors' => true], $options);
 
 		$client = $this->clientService->newClient();
@@ -95,7 +95,7 @@ protected function runRequest(string $url, string $method, array $options = []):
 
 		foreach ($this->getTestUrls($url) as $testURL) {
 			try {
-				yield $client->request($testURL, $method, $requestOptions);
+				yield $client->request($method, $testURL, $requestOptions);
 			} catch (\Throwable $e) {
 				$this->logger->debug('Can not connect to local server for running setup checks', ['exception' => $e, 'url' => $testURL]);
 			}
@@ -110,7 +110,7 @@ protected function runRequest(string $url, string $method, array $options = []):
 	 * @return Generator<int, IResponse>
 	 */
 	protected function runHEAD(string $url, bool $ignoreSSL = true, bool $httpErrors = true): Generator {
-		return $this->runRequest($url, 'HEAD', ['ignoreSSL' => $ignoreSSL, 'httpErrors' => $httpErrors]);
+		return $this->runRequest('HEAD', $url, ['ignoreSSL' => $ignoreSSL, 'httpErrors' => $httpErrors]);
 	}
 
 	protected function getRequestOptions(bool $ignoreSSL, bool $httpErrors): array {

diff --git a/apps/settings/lib/SetupChecks/WellKnownUrls.php b/apps/settings/lib/SetupChecks/WellKnownUrls.php
@@ -70,7 +70,7 @@ public function run(): SetupResult {
 
 		foreach ($urls as [$verb,$url,$validStatuses,$checkCustomHeader]) {
 			$works = null;
-			foreach ($this->runRequest($url, $verb, ['httpErrors' => false, 'options' => ['allow_redirects' => ['track_redirects' => true]]]) as $response) {
+			foreach ($this->runRequest($verb, $url, ['httpErrors' => false, 'options' => ['allow_redirects' => ['track_redirects' => true]]]) as $response) {
 				// Check that the response status matches
 				$works = in_array($response->getStatusCode(), $validStatuses);
 				// and (if needed) the custom Nextcloud header is set