Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-11 09:43:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added logic to forward path and domain to not-found redirects when they contain placeholders

Browse Source
This commit is contained in:
Alejandro Celaya
2021-10-02 17:30:25 +02:00
parent a5874a3f80
commit 36e740f4cc
5 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/Core/test/ErrorHandler/NotFoundRedirectHandlerTest.php
View File

@@ -11,6 +11,7 @@ use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Prophecy\Prophecy\ObjectProphecy;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UriInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Shlinkio\Shlink\Core\Config\NotFoundRedirectResolverInterface;
use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
@@ -75,6 +76,7 @@ class NotFoundRedirectHandlerTest extends TestCase
$resolver->resolveRedirectResponse(
Argument::type(NotFoundType::class),
Argument::type(NotFoundRedirectOptions::class),
Argument::type(UriInterface::class),
)->willReturn(null)->shouldBeCalledOnce();
}];
yield 'non-redirecting domain' => [function (ObjectProphecy $domainService, ObjectProphecy $resolver): void {
@@ -84,10 +86,13 @@ class NotFoundRedirectHandlerTest extends TestCase
$resolver->resolveRedirectResponse(
Argument::type(NotFoundType::class),
Argument::type(NotFoundRedirectOptions::class),
Argument::type(UriInterface::class),
)->willReturn(null)->shouldBeCalledOnce();
$resolver->resolveRedirectResponse(
Argument::type(NotFoundType::class),
Argument::type(Domain::class),
Argument::type(UriInterface::class),
)->willReturn(null)->shouldBeCalledOnce();
$resolver->resolveRedirectResponse(Argument::type(NotFoundType::class), Argument::type(Domain::class))
->willReturn(null)
->shouldBeCalledOnce();
}];
}
@@ -100,6 +105,7 @@ class NotFoundRedirectHandlerTest extends TestCase
$resolveRedirect = $this->resolver->resolveRedirectResponse(
Argument::type(NotFoundType::class),
$this->redirectOptions,
Argument::type(UriInterface::class),
)->willReturn($expectedResp);
$result = $this->middleware->process($this->req, $this->next->reveal());
@@ -120,6 +126,7 @@ class NotFoundRedirectHandlerTest extends TestCase
$resolveRedirect = $this->resolver->resolveRedirectResponse(
Argument::type(NotFoundType::class),
$domain,
Argument::type(UriInterface::class),
)->willReturn($expectedResp);
$result = $this->middleware->process($this->req, $this->next->reveal());