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

Slight improvements on RoadRunner config

Browse Source
This commit is contained in:
Alejandro Celaya
2022-08-26 17:58:25 +02:00
parent e9ec32b3c3
commit 846802c003
8 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/Core/src/EventDispatcher/Event/AbstractVisitEvent.php
View File

@@ -9,7 +9,7 @@ use Shlinkio\Shlink\EventDispatcher\Util\JsonUnserializable;
abstract class AbstractVisitEvent implements JsonSerializable, JsonUnserializable
{
public function __construct(public readonly string $visitId)
final public function __construct(public readonly string $visitId)
{
}

14
module/Core/src/EventDispatcher/Event/UrlVisited.php
View File

@@ -6,8 +6,18 @@ namespace Shlinkio\Shlink\Core\EventDispatcher\Event;
final class UrlVisited extends AbstractVisitEvent
{
public function __construct(string $visitId, public readonly ?string $originalIpAddress = null)
private ?string $originalIpAddress = null;
public static function withOriginalIpAddress(string $visitId, ?string $originalIpAddress): self
{
parent::__construct($visitId);
$instance = new self($visitId);
$instance->originalIpAddress = $originalIpAddress;
return $instance;
}
public function originalIpAddress(): ?string
{
return $this->originalIpAddress;
}
}

2
module/Core/src/EventDispatcher/LocateVisit.php
View File

@@ -41,7 +41,7 @@ class LocateVisit
return;
}
$this->locateVisit($visitId, $shortUrlVisited->originalIpAddress, $visit);
$this->locateVisit($visitId, $shortUrlVisited->originalIpAddress(), $visit);
$this->eventDispatcher->dispatch(new VisitLocated($visitId));
}

2
module/Core/src/Visit/VisitsTracker.php
View File

@@ -72,6 +72,6 @@ class VisitsTracker implements VisitsTrackerInterface
$this->em->persist($visit);
$this->em->flush();
$this->eventDispatcher->dispatch(new UrlVisited($visit->getId(), $visitor->remoteAddress));
$this->eventDispatcher->dispatch(UrlVisited::withOriginalIpAddress($visit->getId(), $visitor->remoteAddress));
}
}

2
module/Core/test/EventDispatcher/LocateVisitTest.php
View File

@@ -193,7 +193,7 @@ class LocateVisitTest extends TestCase
{
$ipAddr = $originalIpAddress ?? $visit->getRemoteAddr();
$location = new Location('', '', '', '', 0.0, 0.0, '');
$event = new UrlVisited('123', $originalIpAddress);
$event = UrlVisited::withOriginalIpAddress('123', $originalIpAddress);
$findVisit = $this->em->find(Visit::class, '123')->willReturn($visit);
$flush = $this->em->flush()->will(function (): void {