External/domain-watchdog
1
0
Fork 0
mirror of https://github.com/maelgangloff/domain-watchdog.git synced 2025-12-22 04:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor/api-platformization

Browse Source 
# Conflicts:
#	src/Controller/WatchListController.php
This commit is contained in:
Vincent 2025-05-30 13:41:57 +02:00
commit 6ac226bcd3
No known key found for this signature in database
GPG Key ID: 056662E78D70E358
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entity/Domain.php
View File

@ -7,6 +7,7 @@ use ApiPlatform\Metadata\Get;
use App\Config\EventAction; use App\Config\EventAction;
use App\Controller\DomainRefreshController; use App\Controller\DomainRefreshController;
use App\Repository\DomainRepository; use App\Repository\DomainRepository;
use App\Service\RDAPService;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
@ -152,7 +153,7 @@ class Domain
public function setLdhName(string $ldhName): static public function setLdhName(string $ldhName): static
{ {
$this->ldhName = strtolower($ldhName); $this->ldhName = RDAPService::convertToIdn($ldhName);
return $this; return $this;
} }

3
src/Entity/Tld.php
View File

@ -9,6 +9,7 @@ use ApiPlatform\Metadata\Get;
use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\GetCollection;
use App\Config\TldType; use App\Config\TldType;
use App\Repository\TldRepository; use App\Repository\TldRepository;
use App\Service\RDAPService;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
@ -119,7 +120,7 @@ class Tld
public function setTld(string $tld): static public function setTld(string $tld): static
{ {
$this->tld = strtolower($tld); $this->tld = RDAPService::convertToIdn($tld);
return $this; return $this;
} }

6
src/Service/RDAPService.php
View File

@ -127,7 +127,7 @@ readonly class RDAPService
*/ */
public function registerDomain(string $fqdn): Domain public function registerDomain(string $fqdn): Domain
{ {
$idnDomain = $this->convertToIdn($fqdn); $idnDomain = RDAPService::convertToIdn($fqdn);
$tld = $this->getTld($idnDomain); $tld = $this->getTld($idnDomain);
$this->logger->info('An update request for domain name {idnDomain} is requested.', [ $this->logger->info('An update request for domain name {idnDomain} is requested.', [
@ -170,7 +170,7 @@ readonly class RDAPService
return $domain; return $domain;
} }
private function getTld(string $domain): Tld public function getTld(string $domain): Tld
{ {
if (!str_contains($domain, '.')) { if (!str_contains($domain, '.')) {
$tldEntity = $this->tldRepository->findOneBy(['tld' => '.']); $tldEntity = $this->tldRepository->findOneBy(['tld' => '.']);
@ -198,7 +198,7 @@ readonly class RDAPService
return $tldEntity; return $tldEntity;
} }
private function convertToIdn(string $fqdn): string public static function convertToIdn(string $fqdn): string
{ {
return strtolower(idn_to_ascii($fqdn)); return strtolower(idn_to_ascii($fqdn));
} }