Ensure base_url has trailing slash to work for those who are hosting in subfolders.

Author: lonnieezell

app/Config/App.php

@@ -21,7 +21,7 @@ class App extends BaseConfig
 	| environments.
 	|
 	*/
-	public $baseURL = 'http://localhost:8080';
+	public $baseURL = 'http://localhost:8080/';
 
 	/*
 	|--------------------------------------------------------------------------

system/Helpers/url_helper.php

@@ -111,7 +111,14 @@ function base_url($uri = '', string $protocol = null): string
 		// otherwise get rid of the path, because we have
 		// no way of knowing the intent...
 		$config = \CodeIgniter\Config\Services::request()->config;
-		$url    = new \CodeIgniter\HTTP\URI($config->baseURL);
+
+		// If baseUrl does not have a trailing slash it won't resolve
+		// correctly for users hosting in a subfolder.
+		$baseUrl = ! empty($config->baseURL) && $config->baseURL !== '/'
+			? rtrim($config->baseURL, '/ ') . '/'
+			: $config->baseURL;
+
+		$url = new \CodeIgniter\HTTP\URI($baseUrl);
 		unset($config);
 
 		// Merge in the path set by the user, if any

tests/system/Helpers/URLHelperTest.php

@@ -316,6 +316,23 @@ public function testBaseURLWithSegmentsAgain()
 		$this->assertEquals('http://example.com/profile', base_url('profile'));
 	}
 
+	public function testBaseURLHasSubfolder()
+	{
+		$_SERVER['HTTP_HOST']   = 'example.com';
+		$_SERVER['REQUEST_URI'] = '/test';
+
+		// Since we're on a CLI, we must provide our own URI
+		$config          = new App();
+		$config->baseURL = 'http://example.com/subfolder';
+		$request         = Services::request($config, false);
+		$request->uri    = new URI('http://example.com/subfolder/test');
+
+		Services::injectMock('request', $request);
+
+		$this->assertEquals('http://example.com/subfolder/foo', base_url('foo'));
+		$this->assertEquals('http://example.com/subfolder/', base_url());
+	}
+
 	//--------------------------------------------------------------------
 	// Test current_url