Fix tests

codeigniter4 · May 7, 2021 · a8c17cd · a8c17cd
1 parent f934428
commit a8c17cd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -400,7 +400,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 			$filters->enableFilter($routeFilter, 'after');
 		}
 
-		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->getUri()->getPath();
+		$uri = $this->determinePath();
 
 		// Never run filters when running through Spark cli
 		if (! defined('SPARKED'))
@@ -846,8 +846,7 @@ protected function determinePath()
 			return $this->path;
 		}
 
-		// @phpstan-ignore-next-line
-		return (is_cli() && ! (ENVIRONMENT === 'testing')) ? $this->request->getPath() : $this->request->uri->getPath();
+		return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
@@ -283,7 +283,7 @@ public function testRunForceSecure()
 		$codeigniter->useSafeOutput(true)->run();
 		$output = ob_get_clean();
 
-		$this->assertEquals('https://example.com/', $response->header('Location')->getValue());
+		$this->assertEquals('https://example.com/index.php', $response->header('Location')->getValue());
 	}
 
 	public function testRunRedirectionWithNamed()

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -426,7 +426,7 @@ public function testForceHttpsNullRequestAndResponse()
 
 		force_https();
 
-		$this->assertEquals('https://example.com/', Services::response()->header('Location')->getValue());
+		$this->assertEquals('https://example.com/index.php', Services::response()->header('Location')->getValue());
 	}
 
 	/**

diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
@@ -426,8 +426,8 @@ public function testCurrentURLInSubfolder()
 		$request = Services::request($this->config);
 		Services::injectMock('request', $request);
 
-		$this->assertEquals('http://example.com/foo/public/bar', current_url());
-		$this->assertEquals('http://example.com/foo/public/bar?baz=quip', (string) current_url(true));
+		$this->assertEquals('http://example.com/foo/public/index.php/bar', current_url());
+		$this->assertEquals('http://example.com/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
 		$uri = current_url(true);
 		$this->assertEquals(['bar'], $uri->getSegments());
@@ -450,8 +450,8 @@ public function testCurrentURLWithPortInSubfolder()
 		$request = Services::request($this->config);
 		Services::injectMock('request', $request);
 
-		$this->assertEquals('http://example.com:8080/foo/public/bar', current_url());
-		$this->assertEquals('http://example.com:8080/foo/public/bar?baz=quip', (string) current_url(true));
+		$this->assertEquals('http://example.com:8080/foo/public/index.php/bar', current_url());
+		$this->assertEquals('http://example.com:8080/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
 		$uri = current_url(true);
 		$this->assertEquals(['bar'], $uri->getSegments());