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

Update to PHP coding standard 2.4.0

Browse Source
This commit is contained in:
Alejandro Celaya
2024-10-28 22:27:30 +01:00
parent 93a277a94d
commit 3f1d61e01e
192 changed files with 465 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/Core/src/Domain/DomainService.php
View File

@@ -26,7 +26,7 @@ readonly class DomainService implements DomainServiceInterface
/**
* @return DomainItem[]
*/
public function listDomains(?ApiKey $apiKey = null): array
public function listDomains(ApiKey|null $apiKey = null): array
{
[$default, $domains] = $this->defaultDomainAndRest($apiKey);
$mappedDomains = array_map(fn (Domain $domain) => DomainItem::forNonDefaultDomain($domain), $domains);
@@ -47,7 +47,7 @@ readonly class DomainService implements DomainServiceInterface
/**
* @return array{Domain|null, Domain[]}
*/
private function defaultDomainAndRest(?ApiKey $apiKey): array
private function defaultDomainAndRest(ApiKey|null $apiKey): array
{
/** @var DomainRepositoryInterface $repo */
$repo = $this->em->getRepository(Domain::class);
@@ -80,7 +80,7 @@ readonly class DomainService implements DomainServiceInterface
return $domain;
}
public function findByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain
public function findByAuthority(string $authority, ApiKey|null $apiKey = null): Domain|null
{
return $this->em->getRepository(Domain::class)->findOneByAuthority($authority, $apiKey);
}
@@ -88,7 +88,7 @@ readonly class DomainService implements DomainServiceInterface
/**
* @throws DomainNotFoundException
*/
public function getOrCreate(string $authority, ?ApiKey $apiKey = null): Domain
public function getOrCreate(string $authority, ApiKey|null $apiKey = null): Domain
{
$domain = $this->getPersistedDomain($authority, $apiKey);
$this->em->flush();
@@ -102,7 +102,7 @@ readonly class DomainService implements DomainServiceInterface
public function configureNotFoundRedirects(
string $authority,
NotFoundRedirects $notFoundRedirects,
?ApiKey $apiKey = null,
ApiKey|null $apiKey = null,
): Domain {
$domain = $this->getPersistedDomain($authority, $apiKey);
$domain->configureNotFoundRedirects($notFoundRedirects);
@@ -115,7 +115,7 @@ readonly class DomainService implements DomainServiceInterface
/**
* @throws DomainNotFoundException
*/
private function getPersistedDomain(string $authority, ?ApiKey $apiKey): Domain
private function getPersistedDomain(string $authority, ApiKey|null $apiKey): Domain
{
$domain = $this->findByAuthority($authority, $apiKey);
if ($domain === null && $apiKey?->hasRole(Role::DOMAIN_SPECIFIC)) {

8
module/Core/src/Domain/DomainServiceInterface.php
View File

@@ -15,7 +15,7 @@ interface DomainServiceInterface
/**
* @return DomainItem[]
*/
public function listDomains(?ApiKey $apiKey = null): array;
public function listDomains(ApiKey|null $apiKey = null): array;
/**
* @throws DomainNotFoundException
@@ -25,9 +25,9 @@ interface DomainServiceInterface
/**
* @throws DomainNotFoundException If the API key is restricted to one domain and a different one is provided
*/
public function getOrCreate(string $authority, ?ApiKey $apiKey = null): Domain;
public function getOrCreate(string $authority, ApiKey|null $apiKey = null): Domain;
public function findByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain;
public function findByAuthority(string $authority, ApiKey|null $apiKey = null): Domain|null;
/**
* @throws DomainNotFoundException If the API key is restricted to one domain and a different one is provided
@@ -35,6 +35,6 @@ interface DomainServiceInterface
public function configureNotFoundRedirects(
string $authority,
NotFoundRedirects $notFoundRedirects,
?ApiKey $apiKey = null,
ApiKey|null $apiKey = null,
): Domain;
}

12
module/Core/src/Domain/Entity/Domain.php
View File

@@ -15,9 +15,9 @@ class Domain extends AbstractEntity implements JsonSerializable, NotFoundRedirec
private function __construct(
public readonly string $authority,
private ?string $baseUrlRedirect = null,
private ?string $regular404Redirect = null,
private ?string $invalidShortUrlRedirect = null,
private string|null $baseUrlRedirect = null,
private string|null $regular404Redirect = null,
private string|null $invalidShortUrlRedirect = null,
) {
}
@@ -31,7 +31,7 @@ class Domain extends AbstractEntity implements JsonSerializable, NotFoundRedirec
return $this->authority;
}
public function invalidShortUrlRedirect(): ?string
public function invalidShortUrlRedirect(): string|null
{
return $this->invalidShortUrlRedirect;
}
@@ -41,7 +41,7 @@ class Domain extends AbstractEntity implements JsonSerializable, NotFoundRedirec
return $this->invalidShortUrlRedirect !== null;
}
public function regular404Redirect(): ?string
public function regular404Redirect(): string|null
{
return $this->regular404Redirect;
}
@@ -51,7 +51,7 @@ class Domain extends AbstractEntity implements JsonSerializable, NotFoundRedirec
return $this->regular404Redirect !== null;
}
public function baseUrlRedirect(): ?string
public function baseUrlRedirect(): string|null
{
return $this->baseUrlRedirect;
}

10
module/Core/src/Domain/Repository/DomainRepository.php
View File

@@ -20,7 +20,7 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
/**
* @return Domain[]
*/
public function findDomains(?ApiKey $apiKey = null): array
public function findDomains(ApiKey|null $apiKey = null): array
{
$qb = $this->createQueryBuilder('d');
$qb->leftJoin(ShortUrl::class, 's', Join::WITH, 's.domain = d')
@@ -39,7 +39,7 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
return $qb->getQuery()->getResult();
}
public function findOneByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain
public function findOneByAuthority(string $authority, ApiKey|null $apiKey = null): Domain|null
{
$qb = $this->createDomainQueryBuilder($authority, $apiKey);
$qb->select('d');
@@ -47,7 +47,7 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
return $qb->getQuery()->getOneOrNullResult();
}
public function domainExists(string $authority, ?ApiKey $apiKey = null): bool
public function domainExists(string $authority, ApiKey|null $apiKey = null): bool
{
$qb = $this->createDomainQueryBuilder($authority, $apiKey);
$qb->select('COUNT(d.id)');
@@ -55,7 +55,7 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
return ((int) $qb->getQuery()->getSingleScalarResult()) > 0;
}
private function createDomainQueryBuilder(string $authority, ?ApiKey $apiKey): QueryBuilder
private function createDomainQueryBuilder(string $authority, ApiKey|null $apiKey): QueryBuilder
{
$qb = $this->getEntityManager()->createQueryBuilder();
$qb->from(Domain::class, 'd')
@@ -72,7 +72,7 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
return $qb;
}
private function determineExtraSpecs(?ApiKey $apiKey): iterable
private function determineExtraSpecs(ApiKey|null $apiKey): iterable
{
// FIXME The $apiKey->spec() method cannot be used here, as it returns a single spec which assumes the
// ShortUrl is the root entity. Here, the Domain is the root entity.

6
module/Core/src/Domain/Repository/DomainRepositoryInterface.php
View File

@@ -15,9 +15,9 @@ interface DomainRepositoryInterface extends ObjectRepository, EntitySpecificatio
/**
* @return Domain[]
*/
public function findDomains(?ApiKey $apiKey = null): array;
public function findDomains(ApiKey|null $apiKey = null): array;
public function findOneByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain;
public function findOneByAuthority(string $authority, ApiKey|null $apiKey = null): Domain|null;
public function domainExists(string $authority, ?ApiKey $apiKey = null): bool;
public function domainExists(string $authority, ApiKey|null $apiKey = null): bool;
}

2
module/Core/src/Domain/Spec/IsDomain.php
View File

@@ -10,7 +10,7 @@ use Happyr\DoctrineSpecification\Specification\BaseSpecification;
class IsDomain extends BaseSpecification
{
public function __construct(private string $domainId, ?string $context = null)
public function __construct(private string $domainId, string|null $context = null)
{
parent::__construct($context);
}