From 0fc5ad58024e49c434ef0d68a04b2fcc83308e5f Mon Sep 17 00:00:00 2001 From: soyuka Date: Mon, 24 Apr 2023 10:37:36 +0200 Subject: [PATCH 1/2] chore: move interfaces without breaking --- src/Api/FilterInterface.php | 9 ++------- src/Api/ResourceClassResolverInterface.php | 8 ++------ src/Metadata/FilterInterface.php | 4 ---- .../Operation/PathSegmentNameGeneratorInterface.php | 4 ---- src/Metadata/ResourceClassResolverInterface.php | 4 ---- src/Operation/PathSegmentNameGeneratorInterface.php | 8 ++------ 6 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/Api/FilterInterface.php b/src/Api/FilterInterface.php index afe05873b08..01b9ec589d9 100644 --- a/src/Api/FilterInterface.php +++ b/src/Api/FilterInterface.php @@ -13,11 +13,6 @@ namespace ApiPlatform\Api; -interface_exists(\ApiPlatform\Metadata\FilterInterface::class); - -/* @phpstan-ignore-next-line */ -if (false) { - interface FilterInterface extends \ApiPlatform\Metadata\FilterInterface - { - } +interface FilterInterface extends \ApiPlatform\Metadata\FilterInterface +{ } diff --git a/src/Api/ResourceClassResolverInterface.php b/src/Api/ResourceClassResolverInterface.php index 9a4f03ae5d5..8ea37c8b086 100644 --- a/src/Api/ResourceClassResolverInterface.php +++ b/src/Api/ResourceClassResolverInterface.php @@ -13,11 +13,7 @@ namespace ApiPlatform\Api; -interface_exists(\ApiPlatform\Metadata\ResourceClassResolverInterface::class); - /* @phpstan-ignore-next-line */ -if (false) { - interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface - { - } +interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface +{ } diff --git a/src/Metadata/FilterInterface.php b/src/Metadata/FilterInterface.php index da3e3dc29f3..3a8b8036513 100644 --- a/src/Metadata/FilterInterface.php +++ b/src/Metadata/FilterInterface.php @@ -54,7 +54,3 @@ interface FilterInterface */ public function getDescription(string $resourceClass): array; } - -if (!interface_exists(\ApiPlatform\Api\FilterInterface::class)) { - class_alias(FilterInterface::class, \ApiPlatform\Api\FilterInterface::class); -} diff --git a/src/Metadata/Operation/PathSegmentNameGeneratorInterface.php b/src/Metadata/Operation/PathSegmentNameGeneratorInterface.php index 83f69245e0b..321fe16b0dd 100644 --- a/src/Metadata/Operation/PathSegmentNameGeneratorInterface.php +++ b/src/Metadata/Operation/PathSegmentNameGeneratorInterface.php @@ -29,7 +29,3 @@ interface PathSegmentNameGeneratorInterface */ public function getSegmentName(string $name, bool $collection = true): string; } - -if (!interface_exists(\ApiPlatform\Operation\PathSegmentNameGeneratorInterface::class)) { - class_alias(PathSegmentNameGeneratorInterface::class, \ApiPlatform\Operation\PathSegmentNameGeneratorInterface::class); -} diff --git a/src/Metadata/ResourceClassResolverInterface.php b/src/Metadata/ResourceClassResolverInterface.php index 5d0acc3f9c6..4a4adeb18ec 100644 --- a/src/Metadata/ResourceClassResolverInterface.php +++ b/src/Metadata/ResourceClassResolverInterface.php @@ -37,7 +37,3 @@ public function getResourceClass(mixed $value, string $resourceClass = null, boo */ public function isResourceClass(string $type): bool; } - -if (!interface_exists(\ApiPlatform\Api\ResourceClassResolverInterface::class)) { - class_alias(ResourceClassResolverInterface::class, \ApiPlatform\Api\ResourceClassResolverInterface::class); -} diff --git a/src/Operation/PathSegmentNameGeneratorInterface.php b/src/Operation/PathSegmentNameGeneratorInterface.php index 382616b2952..47a49423dd2 100644 --- a/src/Operation/PathSegmentNameGeneratorInterface.php +++ b/src/Operation/PathSegmentNameGeneratorInterface.php @@ -13,11 +13,7 @@ namespace ApiPlatform\Operation; -interface_exists(\ApiPlatform\Metadata\Operation\PathSegmentNameGeneratorInterface::class); - /* @phpstan-ignore-next-line */ -if (false) { - interface PathSegmentNameGeneratorInterface extends \ApiPlatform\Metadata\Operation\PathSegmentNameGeneratorInterface - { - } +interface PathSegmentNameGeneratorInterface extends \ApiPlatform\Metadata\Operation\PathSegmentNameGeneratorInterface +{ } From 19920a07dd88c8ee37ae81b1f5ffae68f46bf536 Mon Sep 17 00:00:00 2001 From: soyuka Date: Mon, 24 Apr 2023 10:46:47 +0200 Subject: [PATCH 2/2] chore: phpstan --- src/Api/ResourceClassResolverInterface.php | 1 - src/Operation/PathSegmentNameGeneratorInterface.php | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Api/ResourceClassResolverInterface.php b/src/Api/ResourceClassResolverInterface.php index 8ea37c8b086..753238f2f14 100644 --- a/src/Api/ResourceClassResolverInterface.php +++ b/src/Api/ResourceClassResolverInterface.php @@ -13,7 +13,6 @@ namespace ApiPlatform\Api; -/* @phpstan-ignore-next-line */ interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface { } diff --git a/src/Operation/PathSegmentNameGeneratorInterface.php b/src/Operation/PathSegmentNameGeneratorInterface.php index 47a49423dd2..4486babb640 100644 --- a/src/Operation/PathSegmentNameGeneratorInterface.php +++ b/src/Operation/PathSegmentNameGeneratorInterface.php @@ -13,7 +13,6 @@ namespace ApiPlatform\Operation; -/* @phpstan-ignore-next-line */ interface PathSegmentNameGeneratorInterface extends \ApiPlatform\Metadata\Operation\PathSegmentNameGeneratorInterface { }