mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-26 23:18:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Used league/uri to validate URLs including deeplinks, and fixed tests

Browse source
This commit is contained in:
Alejandro Celaya 2020-06-27 11:09:56 +02:00
parent 08950f6433
commit 78b838f6b6
7 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -34,6 +34,7 @@
"laminas/laminas-servicemanager": "^3.4", "laminas/laminas-servicemanager": "^3.4",
"laminas/laminas-stdlib": "^3.2", "laminas/laminas-stdlib": "^3.2",
"lcobucci/jwt": "^4.0@alpha", "lcobucci/jwt": "^4.0@alpha",
"league/uri": "^6.2",
"lstrojny/functional-php": "^1.9", "lstrojny/functional-php": "^1.9",
"mezzio/mezzio": "^3.2", "mezzio/mezzio": "^3.2",
"mezzio/mezzio-fastroute": "^3.0", "mezzio/mezzio-fastroute": "^3.0",

3
module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
View file

@ -8,7 +8,6 @@ use PHPUnit\Framework\Assert;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Psr\Http\Message\UriInterface;
use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand; use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand;
use Shlinkio\Shlink\CLI\Util\ExitCodes; use Shlinkio\Shlink\CLI\Util\ExitCodes;
use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\ShortUrl;
@ -88,7 +87,7 @@ class GenerateShortUrlCommandTest extends TestCase
{ {
$shortUrl = new ShortUrl(''); $shortUrl = new ShortUrl('');
$urlToShortCode = $this->urlShortener->urlToShortCode( $urlToShortCode = $this->urlShortener->urlToShortCode(
Argument::type(UriInterface::class), Argument::type('string'),
Argument::that(function (array $tags) { Argument::that(function (array $tags) {
Assert::assertEquals(['foo', 'bar', 'baz', 'boo', 'zar'], $tags); Assert::assertEquals(['foo', 'bar', 'baz', 'boo', 'zar'], $tags);
return $tags; return $tags;

4
module/Core/src/Action/AbstractTrackingAction.php
View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Action; namespace Shlinkio\Shlink\Core\Action;
use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\RequestMethodInterface;
use Laminas\Diactoros\Uri; use League\Uri\Uri;
use Mezzio\Router\Middleware\ImplicitHeadMiddleware; use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
@ -67,7 +67,7 @@ abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMet
private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string
{ {
$uri = new Uri($shortUrl->getLongUrl()); $uri = Uri::createFromString($shortUrl->getLongUrl());
$hardcodedQuery = parse_query($uri->getQuery()); $hardcodedQuery = parse_query($uri->getQuery());
if ($disableTrackParam !== null) { if ($disableTrackParam !== null) {
unset($currentQuery[$disableTrackParam]); unset($currentQuery[$disableTrackParam]);

13
module/Core/test/Service/UrlShortenerTest.php
View file

@ -9,7 +9,6 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Laminas\Diactoros\Uri;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
@ -65,7 +64,7 @@ class UrlShortenerTest extends TestCase
public function urlIsProperlyShortened(): void public function urlIsProperlyShortened(): void
{ {
$shortUrl = $this->urlShortener->urlToShortCode( $shortUrl = $this->urlShortener->urlToShortCode(
new Uri('http://foobar.com/12345/hello?foo=bar'), 'http://foobar.com/12345/hello?foo=bar',
[], [],
ShortUrlMeta::createEmpty(), ShortUrlMeta::createEmpty(),
); );
@ -89,7 +88,7 @@ class UrlShortenerTest extends TestCase
$getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal()); $getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal());
$shortUrl = $this->urlShortener->urlToShortCode( $shortUrl = $this->urlShortener->urlToShortCode(
new Uri('http://foobar.com/12345/hello?foo=bar'), 'http://foobar.com/12345/hello?foo=bar',
[], [],
ShortUrlMeta::createEmpty(), ShortUrlMeta::createEmpty(),
); );
@ -112,7 +111,7 @@ class UrlShortenerTest extends TestCase
$this->expectException(ORMException::class); $this->expectException(ORMException::class);
$this->urlShortener->urlToShortCode( $this->urlShortener->urlToShortCode(
new Uri('http://foobar.com/12345/hello?foo=bar'), 'http://foobar.com/12345/hello?foo=bar',
[], [],
ShortUrlMeta::createEmpty(), ShortUrlMeta::createEmpty(),
); );
@ -131,7 +130,7 @@ class UrlShortenerTest extends TestCase
$this->expectException(NonUniqueSlugException::class); $this->expectException(NonUniqueSlugException::class);
$this->urlShortener->urlToShortCode( $this->urlShortener->urlToShortCode(
new Uri('http://foobar.com/12345/hello?foo=bar'), 'http://foobar.com/12345/hello?foo=bar',
[], [],
ShortUrlMeta::fromRawData(['customSlug' => 'custom-slug']), ShortUrlMeta::fromRawData(['customSlug' => 'custom-slug']),
); );
@ -151,7 +150,7 @@ class UrlShortenerTest extends TestCase
$findExisting = $repo->findBy(Argument::any())->willReturn([$expected]); $findExisting = $repo->findBy(Argument::any())->willReturn([$expected]);
$getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal()); $getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal());
$result = $this->urlShortener->urlToShortCode(new Uri($url), $tags, $meta); $result = $this->urlShortener->urlToShortCode($url, $tags, $meta);
$findExisting->shouldHaveBeenCalledOnce(); $findExisting->shouldHaveBeenCalledOnce();
$getRepo->shouldHaveBeenCalledOnce(); $getRepo->shouldHaveBeenCalledOnce();
@ -235,7 +234,7 @@ class UrlShortenerTest extends TestCase
]); ]);
$getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal()); $getRepo = $this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal());
$result = $this->urlShortener->urlToShortCode(new Uri($url), $tags, $meta); $result = $this->urlShortener->urlToShortCode($url, $tags, $meta);
$this->assertSame($expected, $result); $this->assertSame($expected, $result);
$findExisting->shouldHaveBeenCalledOnce(); $findExisting->shouldHaveBeenCalledOnce();

1
module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
View file

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Rest\Action\ShortUrl; namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
use Laminas\Diactoros\Uri;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Shlinkio\Shlink\Core\Exception\ValidationException; use Shlinkio\Shlink\Core\Exception\ValidationException;
use Shlinkio\Shlink\Core\Model\CreateShortUrlData; use Shlinkio\Shlink\Core\Model\CreateShortUrlData;

3
module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
View file

@ -7,7 +7,6 @@ namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
use Cake\Chronos\Chronos; use Cake\Chronos\Chronos;
use Laminas\Diactoros\ServerRequest; use Laminas\Diactoros\ServerRequest;
use Laminas\Diactoros\ServerRequestFactory; use Laminas\Diactoros\ServerRequestFactory;
use Laminas\Diactoros\Uri;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
@ -50,7 +49,7 @@ class CreateShortUrlActionTest extends TestCase
{ {
$shortUrl = new ShortUrl(''); $shortUrl = new ShortUrl('');
$shorten = $this->urlShortener->urlToShortCode( $shorten = $this->urlShortener->urlToShortCode(
Argument::type(Uri::class), Argument::type('string'),
Argument::type('array'), Argument::type('array'),
$expectedMeta, $expectedMeta,
)->willReturn($shortUrl); )->willReturn($shortUrl);

5
module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php
View file

@ -9,7 +9,6 @@ use PHPUnit\Framework\Assert;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Prophecy\Argument; use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy; use Prophecy\Prophecy\ObjectProphecy;
use Psr\Http\Message\UriInterface;
use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Exception\ValidationException; use Shlinkio\Shlink\Core\Exception\ValidationException;
use Shlinkio\Shlink\Core\Model\ShortUrlMeta; use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
@ -71,8 +70,8 @@ class SingleStepCreateShortUrlActionTest extends TestCase
]); ]);
$findApiKey = $this->apiKeyService->check('abc123')->willReturn(true); $findApiKey = $this->apiKeyService->check('abc123')->willReturn(true);
$generateShortCode = $this->urlShortener->urlToShortCode( $generateShortCode = $this->urlShortener->urlToShortCode(
Argument::that(function (UriInterface $argument) { Argument::that(function (string $argument): string {
Assert::assertEquals('http://foobar.com', (string) $argument); Assert::assertEquals('http://foobar.com', $argument);
return $argument; return $argument;
}), }),
[], [],