OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced UriInterface by string when creating a short URL

Browse Source
This commit is contained in:
Alejandro Celaya
2020-06-24 20:21:05 +02:00
parent a74e1df55c
commit 08950f6433
6 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\CLI\Command\ShortUrl; namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
use Laminas\Diactoros\Uri;
use Shlinkio\Shlink\CLI\Util\ExitCodes; use Shlinkio\Shlink\CLI\Util\ExitCodes;
use Shlinkio\Shlink\Core\Exception\InvalidUrlException; use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException; use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
@@ -128,19 +127,15 @@ class GenerateShortUrlCommand extends Command
$shortCodeLength = $input->getOption('shortCodeLength') ?? $this->defaultShortCodeLength; $shortCodeLength = $input->getOption('shortCodeLength') ?? $this->defaultShortCodeLength;
try { try {
$shortUrl = $this->urlShortener->urlToShortCode( $shortUrl = $this->urlShortener->urlToShortCode($longUrl, $tags, ShortUrlMeta::fromRawData([
new Uri($longUrl), ShortUrlMetaInputFilter::VALID_SINCE => $input->getOption('validSince'),
$tags, ShortUrlMetaInputFilter::VALID_UNTIL => $input->getOption('validUntil'),
ShortUrlMeta::fromRawData([ ShortUrlMetaInputFilter::CUSTOM_SLUG => $customSlug,
ShortUrlMetaInputFilter::VALID_SINCE => $input->getOption('validSince'), ShortUrlMetaInputFilter::MAX_VISITS => $maxVisits !== null ? (int) $maxVisits : null,
ShortUrlMetaInputFilter::VALID_UNTIL => $input->getOption('validUntil'), ShortUrlMetaInputFilter::FIND_IF_EXISTS => $input->getOption('findIfExists'),
ShortUrlMetaInputFilter::CUSTOM_SLUG => $customSlug, ShortUrlMetaInputFilter::DOMAIN => $input->getOption('domain'),
ShortUrlMetaInputFilter::MAX_VISITS => $maxVisits !== null ? (int) $maxVisits : null, ShortUrlMetaInputFilter::SHORT_CODE_LENGTH => $shortCodeLength,
ShortUrlMetaInputFilter::FIND_IF_EXISTS => $input->getOption('findIfExists'), ]));
ShortUrlMetaInputFilter::DOMAIN => $input->getOption('domain'),
ShortUrlMetaInputFilter::SHORT_CODE_LENGTH => $shortCodeLength,
]),
);
$io->writeln([ $io->writeln([
sprintf('Processed long URL: <info>%s</info>', $longUrl), sprintf('Processed long URL: <info>%s</info>', $longUrl),

19
module/Core/src/Model/CreateShortUrlData.php
View File

@@ -4,41 +4,32 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Model; namespace Shlinkio\Shlink\Core\Model;
use Psr\Http\Message\UriInterface;
final class CreateShortUrlData final class CreateShortUrlData
{ {
private UriInterface $longUrl; private string $longUrl;
private array $tags; private array $tags;
private ShortUrlMeta $meta; private ShortUrlMeta $meta;
public function __construct( public function __construct(string $longUrl, array $tags = [], ?ShortUrlMeta $meta = null)
UriInterface $longUrl, {
array $tags = [],
?ShortUrlMeta $meta = null
) {
$this->longUrl = $longUrl; $this->longUrl = $longUrl;
$this->tags = $tags; $this->tags = $tags;
$this->meta = $meta ?? ShortUrlMeta::createEmpty(); $this->meta = $meta ?? ShortUrlMeta::createEmpty();
} }
/** public function getLongUrl(): string
*/
public function getLongUrl(): UriInterface
{ {
return $this->longUrl; return $this->longUrl;
} }
/** /**
* @return array * @return string[]
*/ */
public function getTags(): array public function getTags(): array
{ {
return $this->tags; return $this->tags;
} }
/**
*/
public function getMeta(): ShortUrlMeta public function getMeta(): ShortUrlMeta
{ {
return $this->meta; return $this->meta;

5
module/Core/src/Service/UrlShortener.php
View File

@@ -5,7 +5,6 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Service; namespace Shlinkio\Shlink\Core\Service;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Psr\Http\Message\UriInterface;
use Shlinkio\Shlink\Core\Domain\Resolver\DomainResolverInterface; use Shlinkio\Shlink\Core\Domain\Resolver\DomainResolverInterface;
use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Exception\InvalidUrlException; use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
@@ -42,10 +41,8 @@ class UrlShortener implements UrlShortenerInterface
* @throws InvalidUrlException * @throws InvalidUrlException
* @throws Throwable * @throws Throwable
*/ */
public function urlToShortCode(UriInterface $url, array $tags, ShortUrlMeta $meta): ShortUrl public function urlToShortCode(string $url, array $tags, ShortUrlMeta $meta): ShortUrl
{ {
$url = (string) $url;
// First, check if a short URL exists for all provided params // First, check if a short URL exists for all provided params
$existingShortUrl = $this->findExistingShortUrlIfExists($url, $tags, $meta); $existingShortUrl = $this->findExistingShortUrlIfExists($url, $tags, $meta);
if ($existingShortUrl !== null) { if ($existingShortUrl !== null) {

3
module/Core/src/Service/UrlShortenerInterface.php
View File

@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Service; namespace Shlinkio\Shlink\Core\Service;
use Psr\Http\Message\UriInterface;
use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Exception\InvalidUrlException; use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException; use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
@@ -17,5 +16,5 @@ interface UrlShortenerInterface
* @throws NonUniqueSlugException * @throws NonUniqueSlugException
* @throws InvalidUrlException * @throws InvalidUrlException
*/ */
public function urlToShortCode(UriInterface $url, array $tags, ShortUrlMeta $meta): ShortUrl; public function urlToShortCode(string $url, array $tags, ShortUrlMeta $meta): ShortUrl;
} }

3
module/Rest/src/Action/ShortUrl/CreateShortUrlAction.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;
@@ -28,6 +27,6 @@ class CreateShortUrlAction extends AbstractCreateShortUrlAction
} }
$meta = ShortUrlMeta::fromRawData($postData); $meta = ShortUrlMeta::fromRawData($postData);
return new CreateShortUrlData(new Uri($postData['longUrl']), (array) ($postData['tags'] ?? []), $meta); return new CreateShortUrlData($postData['longUrl'], (array) ($postData['tags'] ?? []), $meta);
} }
} }

2
module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
View File

@@ -46,6 +46,6 @@ class SingleStepCreateShortUrlAction extends AbstractCreateShortUrlAction
]); ]);
} }
return new CreateShortUrlData(new Uri($query['longUrl'])); return new CreateShortUrlData($query['longUrl']);
} }
} }