Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-02-28 04:03:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code that is affecting code coverage

Browse Source
This commit is contained in:
Alejandro Celaya
2025-11-17 12:12:06 +01:00
parent c8537e4f71
commit 0604237b94
15 changed files with 46 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/CLI/test/Command/Domain/GetDomainVisitsCommandTest.php
View File

@@ -41,7 +41,7 @@ class GetDomainVisitsCommandTest extends TestCase
{
$shortUrl = ShortUrl::createFake();
$visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
VisitLocation::fromLocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
);
$domain = 's.test';
$this->visitsHelper->expects($this->once())->method('visitsForDomain')->with(

2
module/CLI/test/Command/ShortUrl/GetShortUrlVisitsCommandTest.php
View File

@@ -94,7 +94,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
public function outputIsProperlyGenerated(): void
{
$visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::fromParams('bar', 'foo', ''))->locate(
VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
VisitLocation::fromLocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
);
$shortCode = 'abc123';
$this->visitsHelper->expects($this->once())->method('visitsForShortUrl')->with(

2
module/CLI/test/Command/Tag/GetTagVisitsCommandTest.php
View File

@@ -41,7 +41,7 @@ class GetTagVisitsCommandTest extends TestCase
{
$shortUrl = ShortUrl::createFake();
$visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
VisitLocation::fromLocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
);
$tag = 'abc123';
$this->visitsHelper->expects($this->once())->method('visitsForTag')->with($tag, $this->anything())->willReturn(

2
module/CLI/test/Command/Visit/GetNonOrphanVisitsCommandTest.php
View File

@@ -41,7 +41,7 @@ class GetNonOrphanVisitsCommandTest extends TestCase
{
$shortUrl = ShortUrl::createFake();
$visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
VisitLocation::fromLocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
);
$this->visitsHelper->expects($this->once())->method('nonOrphanVisits')->withAnyParameters()->willReturn(
new Paginator(new ArrayAdapter([$visit])),

2
module/CLI/test/Command/Visit/GetOrphanVisitsCommandTest.php
View File

@@ -38,7 +38,7 @@ class GetOrphanVisitsCommandTest extends TestCase
public function outputIsProperlyGenerated(array $args, bool $includesType): void
{
$visit = Visit::forBasePath(Visitor::fromParams('bar', 'foo', ''))->locate(
VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
VisitLocation::fromLocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
);
$this->visitsHelper->expects($this->once())->method('orphanVisits')->with($this->callback(
fn (OrphanVisitsParams $param) => (

6
module/CLI/test/Command/Visit/LocateVisitsCommandTest.php
View File

@@ -63,7 +63,7 @@ class LocateVisitsCommandTest extends TestCase
array $args,
): void {
$visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::fromParams('', '', '1.2.3.4'));
$location = VisitLocation::fromGeolocation(Location::empty());
$location = VisitLocation::fromLocation(Location::empty());
$mockMethodBehavior = $this->invokeHelperMethods($visit, $location);
$this->lock->method('acquire')->willReturn(true);
@@ -107,7 +107,7 @@ class LocateVisitsCommandTest extends TestCase
public function localhostAndEmptyAddressesAreIgnored(IpCannotBeLocatedException $e, string $message): void
{
$visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::empty());
$location = VisitLocation::fromGeolocation(Location::empty());
$location = VisitLocation::fromLocation(Location::empty());
$this->lock->method('acquire')->willReturn(true);
$this->visitService->expects($this->once())
@@ -134,7 +134,7 @@ class LocateVisitsCommandTest extends TestCase
public function errorWhileLocatingIpIsDisplayed(): void
{
$visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::fromParams(remoteAddress: '1.2.3.4'));
$location = VisitLocation::fromGeolocation(Location::emptyInstance());
$location = VisitLocation::fromLocation(Location::empty());
$this->lock->method('acquire')->willReturn(true);
$this->visitService->expects($this->once())

33
module/Core/src/Spec/InDateRange.php
View File

@@ -1,33 +0,0 @@
<?php
declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Spec;
use Happyr\DoctrineSpecification\Spec;
use Happyr\DoctrineSpecification\Specification\BaseSpecification;
use Happyr\DoctrineSpecification\Specification\Specification;
use Shlinkio\Shlink\Common\Util\DateRange;
class InDateRange extends BaseSpecification
{
public function __construct(private DateRange|null $dateRange, private string $field = 'date')
{
parent::__construct();
}
protected function getSpec(): Specification
{
$criteria = [];
if ($this->dateRange?->startDate !== null) {
$criteria[] = Spec::gte($this->field, $this->dateRange->startDate->toDateTimeString());
}
if ($this->dateRange?->endDate !== null) {
$criteria[] = Spec::lte($this->field, $this->dateRange->endDate->toDateTimeString());
}
return Spec::andX(...$criteria);
}
}

4
module/Core/src/Visit/Entity/Visit.php
View File

@@ -70,7 +70,7 @@ class Visit extends AbstractEntity implements JsonSerializable
remoteAddr: self::processAddress($visitor->remoteAddress, $anonymize),
visitedUrl: $visitor->visitedUrl,
redirectUrl: $visitor->redirectUrl,
visitLocation: $geolocation !== null ? VisitLocation::fromGeolocation($geolocation) : null,
visitLocation: $geolocation !== null ? VisitLocation::fromLocation($geolocation) : null,
);
}
@@ -114,7 +114,7 @@ class Visit extends AbstractEntity implements JsonSerializable
referer: $importedVisit->referer,
potentialBot: isCrawler($importedVisit->userAgent),
visitedUrl: $importedVisit instanceof ImportedShlinkOrphanVisit ? $importedVisit->visitedUrl : null,
visitLocation: $importedLocation !== null ? VisitLocation::fromImport($importedLocation) : null,
visitLocation: $importedLocation !== null ? VisitLocation::fromLocation($importedLocation) : null,
date: normalizeDate($importedVisit->date),
);
}

19
module/Core/src/Visit/Entity/VisitLocation.php
View File

@@ -33,29 +33,16 @@ class VisitLocation extends AbstractEntity implements JsonSerializable
);
}
public static function fromGeolocation(Location $location): self
public static function fromLocation(Location|ImportedShlinkVisitLocation $location): self
{
return new self(
countryCode: $location->countryCode,
countryName: $location->countryName,
regionName: $location->regionName,
cityName: $location->city,
cityName: $location instanceof Location ? $location->city : $location->cityName,
latitude: $location->latitude,
longitude: $location->longitude,
timezone: $location->timeZone,
);
}
public static function fromImport(ImportedShlinkVisitLocation $location): self
{
return new self(
countryCode: $location->countryCode,
countryName: $location->countryName,
regionName: $location->regionName,
cityName: $location->cityName,
latitude: $location->latitude,
longitude: $location->longitude,
timezone: $location->timezone,
timezone: $location instanceof Location ? $location->timeZone : $location->timezone,
);
}

2
module/Core/src/Visit/Geolocation/VisitLocator.php
View File

@@ -57,7 +57,7 @@ readonly class VisitLocator implements VisitLocatorInterface
$location = Location::empty();
}
$this->locateVisit($visit, VisitLocation::fromGeolocation($location), $helper);
$this->locateVisit($visit, VisitLocation::fromLocation($location), $helper);
// Flush and clear after X iterations
if ($count % $persistBlock === 0) {

2
module/Core/test-db/Visit/Repository/VisitIterationRepositoryTest.php
View File

@@ -40,7 +40,7 @@ class VisitIterationRepositoryTest extends DatabaseTestCase
$visit = Visit::forValidShortUrl($shortUrl, Visitor::empty());
if ($i >= 2) {
$location = VisitLocation::fromGeolocation(Location::emptyInstance());
$location = VisitLocation::fromLocation(Location::empty());
$this->getEntityManager()->persist($location);
$visit->locate($location);
}

2
module/Core/test/Matomo/MatomoVisitSenderTest.php
View File

@@ -87,7 +87,7 @@ class MatomoVisitSenderTest extends TestCase
yield 'unlocated orphan visit' => [Visit::forBasePath(Visitor::empty()), null, []];
yield 'located regular visit' => [
Visit::forValidShortUrl(ShortUrl::withLongUrl('https://shlink.io'), Visitor::empty())
->locate(VisitLocation::fromGeolocation(new Location(
->locate(VisitLocation::fromLocation(new Location(
countryCode: 'US',
countryName: 'countryName',
regionName: 'regionName',

28
module/Core/test/Visit/Entity/VisitLocationTest.php
View File

@@ -8,6 +8,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\Core\Visit\Entity\VisitLocation;
use Shlinkio\Shlink\Importer\Model\ImportedShlinkVisitLocation;
use Shlinkio\Shlink\IpGeolocation\Model\Location;
class VisitLocationTest extends TestCase
@@ -16,7 +17,7 @@ class VisitLocationTest extends TestCase
public function isEmptyReturnsTrueWhenAllValuesAreEmpty(array $args, bool $isEmpty): void
{
$payload = new Location(...$args);
$location = VisitLocation::fromGeolocation($payload);
$location = VisitLocation::fromLocation($payload);
self::assertEquals($isEmpty, $location->isEmpty);
}
@@ -32,4 +33,29 @@ class VisitLocationTest extends TestCase
yield [['', '', '', '', 1.0, 0.0, ''], false];
yield [['', '', '', '', 0.0, 1.0, ''], false];
}
#[Test]
public function jsonSerialization(): void
{
$location = VisitLocation::fromLocation(new ImportedShlinkVisitLocation(
countryCode: 'countryCode',
countryName: 'countryName',
regionName: 'regionName',
cityName: 'cityName',
timezone: 'timezone',
latitude: 1,
longitude: 2,
));
self::assertEquals([
'countryCode' => $location->countryCode,
'countryName' => $location->countryName,
'regionName' => $location->regionName,
'cityName' => $location->cityName,
'latitude' => $location->latitude,
'longitude' => $location->longitude,
'timezone' => $location->timezone,
'isEmpty' => $location->isEmpty,
], $location->jsonSerialize());
}
}

2
module/Core/test/Visit/Entity/VisitTest.php
View File

@@ -95,7 +95,7 @@ class VisitTest extends TestCase
->withHeader('Referer', 'referer')
->withUri(new Uri('https://s.test/foo/bar')),
),
)->locate($location = VisitLocation::fromGeolocation(Location::emptyInstance())),
)->locate($location = VisitLocation::fromLocation(Location::empty())),
[
'referer' => 'referer',
'date' => $visit->date->toAtomString(),