From bfca0317316f5b384a7e3702ae8e41ef1ab702dc Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 14 Sep 2022 17:18:47 +0200 Subject: [PATCH] chore: drop dependency on fig/link-util --- composer.json | 1 - src/Hydra/EventListener/AddLinkHeaderListener.php | 4 ++-- src/Symfony/EventListener/AddLinkHeaderListener.php | 4 ++-- src/Symfony/EventListener/SerializeListener.php | 4 ++-- tests/Hydra/EventListener/AddLinkHeaderListenerTest.php | 4 ++-- tests/Symfony/EventListener/AddLinkHeaderListenerTest.php | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index a5ddcde857a..0d06269f253 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ "require": { "php": ">=7.1", "doctrine/inflector": "^1.0 || ^2.0", - "fig/link-util": "^1.0", "psr/cache": "^1.0 || ^2.0 || ^3.0", "psr/container": "^1.0 || ^2.0", "symfony/http-foundation": "^4.4 || ^5.1 || ^6.0", diff --git a/src/Hydra/EventListener/AddLinkHeaderListener.php b/src/Hydra/EventListener/AddLinkHeaderListener.php index 18b100a3873..2c1d7f70e07 100644 --- a/src/Hydra/EventListener/AddLinkHeaderListener.php +++ b/src/Hydra/EventListener/AddLinkHeaderListener.php @@ -16,9 +16,9 @@ use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\JsonLd\ContextBuilder; use ApiPlatform\Util\CorsTrait; -use Fig\Link\GenericLinkProvider; -use Fig\Link\Link; use Symfony\Component\HttpKernel\Event\ResponseEvent; +use Symfony\Component\WebLink\GenericLinkProvider; +use Symfony\Component\WebLink\Link; /** * Adds the HTTP Link header pointing to the Hydra documentation. diff --git a/src/Symfony/EventListener/AddLinkHeaderListener.php b/src/Symfony/EventListener/AddLinkHeaderListener.php index 88f16c383ed..392a4e19c89 100644 --- a/src/Symfony/EventListener/AddLinkHeaderListener.php +++ b/src/Symfony/EventListener/AddLinkHeaderListener.php @@ -18,10 +18,10 @@ use ApiPlatform\Util\CorsTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; use ApiPlatform\Util\RequestAttributesExtractor; -use Fig\Link\GenericLinkProvider; -use Fig\Link\Link; use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\Mercure\Discovery; +use Symfony\Component\WebLink\GenericLinkProvider; +use Symfony\Component\WebLink\Link; /** * Adds the HTTP Link header pointing to the Mercure hub for resources having their updates dispatched. diff --git a/src/Symfony/EventListener/SerializeListener.php b/src/Symfony/EventListener/SerializeListener.php index 00f7de69777..3c132b7f2cc 100644 --- a/src/Symfony/EventListener/SerializeListener.php +++ b/src/Symfony/EventListener/SerializeListener.php @@ -21,14 +21,14 @@ use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; use ApiPlatform\Util\RequestAttributesExtractor; -use Fig\Link\GenericLinkProvider; -use Fig\Link\Link; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\Serializer\Encoder\EncoderInterface; use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer; use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\WebLink\GenericLinkProvider; +use Symfony\Component\WebLink\Link; /** * Serializes data. diff --git a/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php b/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php index 9f6b19ed729..0a22abe56e2 100644 --- a/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php +++ b/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php @@ -16,14 +16,14 @@ use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Hydra\EventListener\AddLinkHeaderListener; -use Fig\Link\GenericLinkProvider; -use Fig\Link\Link; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\HttpKernelInterface; +use Symfony\Component\WebLink\GenericLinkProvider; use Symfony\Component\WebLink\HttpHeaderSerializer; +use Symfony\Component\WebLink\Link; /** * @author Kévin Dunglas diff --git a/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php b/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php index da39379cd59..869b89158a8 100644 --- a/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php +++ b/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php @@ -18,8 +18,6 @@ use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Symfony\EventListener\AddLinkHeaderListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; -use Fig\Link\GenericLinkProvider; -use Fig\Link\Link; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -29,7 +27,9 @@ use Symfony\Component\Mercure\Hub; use Symfony\Component\Mercure\HubRegistry; use Symfony\Component\Mercure\Jwt\StaticTokenProvider; +use Symfony\Component\WebLink\GenericLinkProvider; use Symfony\Component\WebLink\HttpHeaderSerializer; +use Symfony\Component\WebLink\Link; /** * @author Kévin Dunglas