From 6bffe9d13af6f1150ae72305730d347443dcdc9f Mon Sep 17 00:00:00 2001
From: Thomas Flori <thflori@gmail.com>
Date: Wed, 8 Aug 2018 07:34:09 +0200
Subject: [PATCH] fix get relative path
---
src/ServerRequest.php | 2 +-
tests/ServerRequestTest.php | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/ServerRequest.php b/src/ServerRequest.php
index 7115682..486dbc8 100644
--- a/src/ServerRequest.php
+++ b/src/ServerRequest.php
@@ -400,7 +400,7 @@ class ServerRequest extends Request implements ServerRequestInterface
$base = $this->getBase();
}
- return substr($this->getUri()->getPath(), strlen(rtrim($base)));
+ return substr($this->getUri()->getPath(), strlen(rtrim($base, '/')));
}
/**
diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php
index 3a8b322..3e45950 100644
--- a/tests/ServerRequestTest.php
+++ b/tests/ServerRequestTest.php
@@ -548,4 +548,11 @@ class ServerRequestTest extends TestCase
self::assertSame('/product/42', $request->getRelativePath());
}
+
+ public function testGetRelativePathFromRoot()
+ {
+ $request = new ServerRequest('GET', '/product/42');
+
+ self::assertSame('/product/42', $request->getRelativePath('/'));
+ }
}
--
GitLab