diff --git a/src/ServerRequest.php b/src/ServerRequest.php index 404655c8dfdaa1947851c126843069ebe6a8f00e..7115682c6c257f4c3b6a43a488ae177b1da207f9 100644 --- a/src/ServerRequest.php +++ b/src/ServerRequest.php @@ -413,6 +413,6 @@ class ServerRequest extends Request implements ServerRequestInterface */ public function getBase(): string { - return dirname($this->getServerParams()['SCRIPT_NAME']); + return dirname($this->getServerParams()['SCRIPT_NAME'] ?? '/index.php'); } } diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php index 9e301865848bfd71851e4884df424d728c16b91e..3a8b322eb070e3b04227823628f7e2d9cc94da2b 100644 --- a/tests/ServerRequestTest.php +++ b/tests/ServerRequestTest.php @@ -453,6 +453,14 @@ class ServerRequestTest extends TestCase $this->assertSame($params, $request2->getCookieParams()); } + public function testGetCookie() + { + $request = (new ServerRequest('GET', '/'))->withCookieParams(['name' => 'value']); + + $this->assertTrue($request->hasCookie('name')); + $this->assertSame('value', $request->getCookie('name')); + } + public function testQueryParams() { $request1 = new ServerRequest('GET', '/'); @@ -519,4 +527,25 @@ class ServerRequestTest extends TestCase $this->assertSame([], $requestWithoutAttribute->getAttributes()); $this->assertSame('different-default', $requestWithoutAttribute->getAttribute('name', 'different-default')); } + + public function testGetBaseWithoutScriptName() + { + $request = new ServerRequest('GET', '/'); + + $this->assertSame('/', $request->getBase()); + } + + public function testGetBaseWithScriptName() + { + $request = new ServerRequest('GET', '/shop/product/42', [], null, '1.1', ['SCRIPT_NAME' => '/shop/index.php']); + + self::assertSame('/shop', $request->getBase()); + } + + public function testGetRelativePath() + { + $request = new ServerRequest('GET', '/shop/product/42', [], null, '1.1', ['SCRIPT_NAME' => '/shop/index.php']); + + self::assertSame('/product/42', $request->getRelativePath()); + } }