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

Fixed merge conflicts

Browse Source
This commit is contained in:
Alejandro Celaya
2017-10-23 13:28:09 +02:00
parent 91f08c9ead ccb9d5e83a
commit 781ca39938
8 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/Core/config/dependencies.config.php
View File

@@ -42,7 +42,13 @@ return [
NotFoundDelegate::class => [TemplateRendererInterface::class],
// Services
Service\UrlShortener::class => ['httpClient', 'em', Cache::class, 'config.url_shortener.shortcode_chars'],
Service\UrlShortener::class => [
'httpClient',
'em',
Cache::class,
'config.url_shortener.validate_url',
'config.url_shortener.shortcode_chars',
],
Service\VisitsTracker::class => ['em'],
Service\ShortUrlService::class => ['em'],
Service\VisitService::class => ['em'],

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

@@ -46,18 +46,24 @@ class UrlShortener implements UrlShortenerInterface
* @var SlugifyInterface
*/
private $slugger;
/**
* @var bool
*/
private $urlValidationEnabled;
public function __construct(
ClientInterface $httpClient,
EntityManagerInterface $em,
Cache $cache,
$urlValidationEnabled,
$chars = self::DEFAULT_CHARS,
SlugifyInterface $slugger = null
) {
$this->httpClient = $httpClient;
$this->em = $em;
$this->chars = empty($chars) ? self::DEFAULT_CHARS : $chars;
$this->cache = $cache;
$this->urlValidationEnabled = $urlValidationEnabled;
$this->chars = empty($chars) ? self::DEFAULT_CHARS : $chars;
$this->slugger = $slugger ?: new Slugify();
}
@@ -91,8 +97,11 @@ class UrlShortener implements UrlShortenerInterface
return $shortUrl->getShortCode();
}
// Check that the URL exists
$this->checkUrlExists($url);
// Check if the validation of url is enabled in the config
if (true === $this->urlValidationEnabled) {
// Check that the URL exists
$this->checkUrlExists($url);
}
$customSlug = $this->processCustomSlug($customSlug);
// Transactionally insert the short url, then generate the short code and finally update the short code

11
module/Core/test/Service/UrlShortenerTest.php
View File

@@ -69,10 +69,19 @@ class UrlShortenerTest extends TestCase
$this->cache = new ArrayCache();
$this->slugger = $this->prophesize(SlugifyInterface::class);
$this->setUrlShortener(false);
}
/**
* @param bool $urlValidationEnabled
*/
public function setUrlShortener($urlValidationEnabled)
{
$this->urlShortener = new UrlShortener(
$this->httpClient->reveal(),
$this->em->reveal(),
$this->cache,
$urlValidationEnabled,
UrlShortener::DEFAULT_CHARS,
$this->slugger->reveal()
);
@@ -110,6 +119,8 @@ class UrlShortenerTest extends TestCase
*/
public function exceptionIsThrownWhenUrlDoesNotExist()
{
$this->setUrlShortener(true);
$this->httpClient->request(Argument::cetera())->willThrow(
new ClientException('', $this->prophesize(Request::class)->reveal())
);