From 4effd1ccb6eee678fd674d338c5cd422e6fbe805 Mon Sep 17 00:00:00 2001 From: Romain Date: Tue, 22 Aug 2023 10:24:29 +0200 Subject: [PATCH 1/2] fix: fatal with api interface Fix: #5761 --- src/Api/IdentifiersExtractorInterface.php | 7 ++++++- src/Api/IriConverterInterface.php | 7 ++++++- src/Api/ResourceClassResolverInterface.php | 5 ++++- src/Api/UriVariablesConverterInterface.php | 7 ++++++- src/Api/UrlGeneratorInterface.php | 11 +++++++++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/Api/IdentifiersExtractorInterface.php b/src/Api/IdentifiersExtractorInterface.php index 757d37e1171..bcb61cd2950 100644 --- a/src/Api/IdentifiersExtractorInterface.php +++ b/src/Api/IdentifiersExtractorInterface.php @@ -15,7 +15,12 @@ class_exists(\ApiPlatform\Metadata\IdentifiersExtractorInterface::class); -if (!class_exists(IdentifiersExtractorInterface::class)) { +class_alias( + \ApiPlatform\Metadata\IdentifiersExtractorInterface::class, + __NAMESPACE__.'\IdentifiersExtractorInterface' +); + +if (false) { interface IdentifiersExtractorInterface extends \ApiPlatform\Metadata\IdentifiersExtractorInterface { } diff --git a/src/Api/IriConverterInterface.php b/src/Api/IriConverterInterface.php index 59a798403ac..272fa52f698 100644 --- a/src/Api/IriConverterInterface.php +++ b/src/Api/IriConverterInterface.php @@ -15,7 +15,12 @@ class_exists(\ApiPlatform\Metadata\IriConverterInterface::class); -if (!class_exists(IriConverterInterface::class)) { +class_alias( + \ApiPlatform\Metadata\IriConverterInterface::class, + __NAMESPACE__.'\IriConverterInterface' +); + +if (false) { interface IriConverterInterface extends \ApiPlatform\Metadata\IriConverterInterface { } diff --git a/src/Api/ResourceClassResolverInterface.php b/src/Api/ResourceClassResolverInterface.php index 0dd636478b9..325dfa96cd4 100644 --- a/src/Api/ResourceClassResolverInterface.php +++ b/src/Api/ResourceClassResolverInterface.php @@ -13,7 +13,10 @@ namespace ApiPlatform\Api; -class_exists(\ApiPlatform\Metadata\ResourceClassResolverInterface::class); +class_alias( + \ApiPlatform\Metadata\ResourceClassResolverInterface::class, + __NAMESPACE__.'\ResourceClassResolverInterface' +); if (false) { // @phpstan-ignore-line interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface diff --git a/src/Api/UriVariablesConverterInterface.php b/src/Api/UriVariablesConverterInterface.php index 4ed3c921c68..5de5200cad0 100644 --- a/src/Api/UriVariablesConverterInterface.php +++ b/src/Api/UriVariablesConverterInterface.php @@ -15,7 +15,12 @@ class_exists(\ApiPlatform\Metadata\UriVariablesConverterInterface::class); -if (!class_exists(UriVariablesConverterInterface::class)) { +class_alias( + \ApiPlatform\Metadata\UriVariablesConverterInterface::class, + __NAMESPACE__.'\UriVariablesConverterInterface' +); + +if (false) { interface UriVariablesConverterInterface extends \ApiPlatform\Metadata\UriVariablesConverterInterface { } diff --git a/src/Api/UrlGeneratorInterface.php b/src/Api/UrlGeneratorInterface.php index 91da13770da..e7d7494d8ad 100644 --- a/src/Api/UrlGeneratorInterface.php +++ b/src/Api/UrlGeneratorInterface.php @@ -13,6 +13,13 @@ namespace ApiPlatform\Api; -interface UrlGeneratorInterface extends \ApiPlatform\Metadata\UrlGeneratorInterface -{ +class_alias( + \ApiPlatform\Metadata\UrlGeneratorInterface::class, + __NAMESPACE__.'\UrlGeneratorInterface' +); + +if (false) { + interface UrlGeneratorInterface extends \ApiPlatform\Metadata\UrlGeneratorInterface + { + } } From 1e4b3119151b954e67e044878b36ceadfc21dcc5 Mon Sep 17 00:00:00 2001 From: Romain Date: Tue, 22 Aug 2023 10:49:31 +0200 Subject: [PATCH 2/2] fix: coding standards and tests --- src/Api/IdentifiersExtractorInterface.php | 2 +- src/Api/IriConverterInterface.php | 2 +- src/Api/ResourceClassResolverInterface.php | 5 +---- src/Api/UriVariablesConverterInterface.php | 2 +- src/Api/UrlGeneratorInterface.php | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Api/IdentifiersExtractorInterface.php b/src/Api/IdentifiersExtractorInterface.php index bcb61cd2950..ff0f428c0a3 100644 --- a/src/Api/IdentifiersExtractorInterface.php +++ b/src/Api/IdentifiersExtractorInterface.php @@ -20,7 +20,7 @@ class_alias( __NAMESPACE__.'\IdentifiersExtractorInterface' ); -if (false) { +if (false) { // @phpstan-ignore-line interface IdentifiersExtractorInterface extends \ApiPlatform\Metadata\IdentifiersExtractorInterface { } diff --git a/src/Api/IriConverterInterface.php b/src/Api/IriConverterInterface.php index 272fa52f698..e1f39780324 100644 --- a/src/Api/IriConverterInterface.php +++ b/src/Api/IriConverterInterface.php @@ -20,7 +20,7 @@ class_alias( __NAMESPACE__.'\IriConverterInterface' ); -if (false) { +if (false) { // @phpstan-ignore-line interface IriConverterInterface extends \ApiPlatform\Metadata\IriConverterInterface { } diff --git a/src/Api/ResourceClassResolverInterface.php b/src/Api/ResourceClassResolverInterface.php index 325dfa96cd4..0dd636478b9 100644 --- a/src/Api/ResourceClassResolverInterface.php +++ b/src/Api/ResourceClassResolverInterface.php @@ -13,10 +13,7 @@ namespace ApiPlatform\Api; -class_alias( - \ApiPlatform\Metadata\ResourceClassResolverInterface::class, - __NAMESPACE__.'\ResourceClassResolverInterface' -); +class_exists(\ApiPlatform\Metadata\ResourceClassResolverInterface::class); if (false) { // @phpstan-ignore-line interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface diff --git a/src/Api/UriVariablesConverterInterface.php b/src/Api/UriVariablesConverterInterface.php index 5de5200cad0..45dd27a07ed 100644 --- a/src/Api/UriVariablesConverterInterface.php +++ b/src/Api/UriVariablesConverterInterface.php @@ -20,7 +20,7 @@ class_alias( __NAMESPACE__.'\UriVariablesConverterInterface' ); -if (false) { +if (false) { // @phpstan-ignore-line interface UriVariablesConverterInterface extends \ApiPlatform\Metadata\UriVariablesConverterInterface { } diff --git a/src/Api/UrlGeneratorInterface.php b/src/Api/UrlGeneratorInterface.php index e7d7494d8ad..5b199a684c1 100644 --- a/src/Api/UrlGeneratorInterface.php +++ b/src/Api/UrlGeneratorInterface.php @@ -18,7 +18,7 @@ class_alias( __NAMESPACE__.'\UrlGeneratorInterface' ); -if (false) { +if (false) { // @phpstan-ignore-line interface UrlGeneratorInterface extends \ApiPlatform\Metadata\UrlGeneratorInterface { }