Format URI directly, fixes codeigniter4#4707

MGatner · May 21, 2021 · bac8391 · bac8391
1 parent 7eef1f7
commit bac8391
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -347,7 +347,8 @@ protected function prepareURL(string $url): string
 
 		$uri = $this->baseURI->resolveRelativeURI($url);
 
-		return (string) $uri;
+		// Create the string instead of casting to prevent baseURL muddling
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -33,6 +33,24 @@ protected function getRequest(array $options = [])
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707
+	 */
+	public function testPrepareURLIgnoresAppConfig()
+	{
+		config('App')->baseURL = 'http://example.com/fruit/';
+
+		$request = $this->getRequest([
+			'base_uri' => 'http://example.com/v1/',
+		]);
+
+		$method = $this->getPrivateMethodInvoker($request, 'prepareURL');
+
+		$this->assertEquals('http://example.com/v1/bananas', $method('bananas'));
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
 	 */