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

Merge branch 'develop' into feature/all-visits-endpoint

Browse Source
This commit is contained in:
Alejandro Celaya
2022-01-16 10:23:22 +01:00
parent cff9cd5fb8 d43c3ec865
commit 3436405c55
11 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/Core/src/Options/TrackingOptions.php
View File

@@ -8,7 +8,9 @@ use Laminas\Stdlib\AbstractOptions;
use function array_key_exists;
use function explode;
use function Functional\map;
use function is_array;
use function trim;
class TrackingOptions extends AbstractOptions
{
@@ -108,10 +110,10 @@ class TrackingOptions extends AbstractOptions
protected function setDisableTrackingFrom(string|array|null $disableTrackingFrom): void
{
if (is_array($disableTrackingFrom)) {
$this->disableTrackingFrom = $disableTrackingFrom;
} else {
$this->disableTrackingFrom = $disableTrackingFrom === null ? [] : explode(',', $disableTrackingFrom);
}
$this->disableTrackingFrom = match (true) {
is_array($disableTrackingFrom) => $disableTrackingFrom,
$disableTrackingFrom === null => [],
default => map(explode(',', $disableTrackingFrom), static fn (string $value) => trim($value)),
};
}
}

3
module/Core/src/Repository/ShortUrlRepository.php
View File

@@ -192,6 +192,9 @@ class ShortUrlRepository extends EntitySpecificationRepository implements ShortU
return $this->doShortCodeIsInUse($identifier, $spec, LockMode::PESSIMISTIC_WRITE);
}
/**
* @param LockMode::PESSIMISTIC_WRITE|null $lockMode
*/
private function doShortCodeIsInUse(ShortUrlIdentifier $identifier, ?Specification $spec, ?int $lockMode): bool
{
$qb = $this->createFindOneQueryBuilder($identifier, $spec)->select('s.id');