Merge branch 'master' into refactor/api-platformization

# 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

View File

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

View File

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

View File

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