diff --git a/core/modules/hal/src/Normalizer/EntityReferenceEmbeddingTrait.php b/core/modules/hal/src/Normalizer/EntityReferenceEmbeddingTrait.php index 7798f08..1d64988 100644 --- a/core/modules/hal/src/Normalizer/EntityReferenceEmbeddingTrait.php +++ b/core/modules/hal/src/Normalizer/EntityReferenceEmbeddingTrait.php @@ -3,8 +3,6 @@ namespace Drupal\hal\Normalizer; use Drupal\Core\Entity\EntityInterface; -use Drupal\rest\LinkManager\LinkManagerInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; /** * Defines a trait for embedding one entity into another one. diff --git a/core/modules/link/src/LinkServiceProvider.php b/core/modules/link/src/LinkServiceProvider.php index 9b4ee2a..03b034d 100644 --- a/core/modules/link/src/LinkServiceProvider.php +++ b/core/modules/link/src/LinkServiceProvider.php @@ -34,7 +34,7 @@ public function register(ContainerBuilder $container) { // Add a hal normalizer service for LinkItem fields. $service_definition = new Definition(HalLinkItemNormalizer::class, [ new Reference('entity_type.manager'), - new Reference('rest.link_manager'), + new Reference('serialization.link_manager'), new Reference('entity.repository'), ]); // The priority must be higher than that of diff --git a/core/modules/link/src/Normalizer/HalLinkItemNormalizer.php b/core/modules/link/src/Normalizer/HalLinkItemNormalizer.php index 71fe612..6f9d6d0 100644 --- a/core/modules/link/src/Normalizer/HalLinkItemNormalizer.php +++ b/core/modules/link/src/Normalizer/HalLinkItemNormalizer.php @@ -8,7 +8,7 @@ use Drupal\hal\Normalizer\EntityReferenceEmbeddingTrait; use Drupal\hal\Normalizer\FieldItemNormalizer; use Drupal\link\Plugin\Field\FieldType\LinkItem; -use Drupal\rest\LinkManager\LinkManagerInterface; +use Drupal\serialization\LinkManager\LinkManagerInterface; /** * A normalizer to handle LinkItem data types. @@ -32,7 +32,7 @@ class HalLinkItemNormalizer extends FieldItemNormalizer { /** * Link manager service. * - * @var \Drupal\rest\LinkManager\LinkManagerInterface + * @var \Drupal\serialization\LinkManager\LinkManagerInterface */ protected $linkManager; @@ -48,7 +48,7 @@ class HalLinkItemNormalizer extends FieldItemNormalizer { * * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * Entity type manager service. - * @param \Drupal\rest\LinkManager\LinkManagerInterface $link_manager + * @param \Drupal\serialization\LinkManager\LinkManagerInterface $link_manager * Link manager service. * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository * Entity repository service. diff --git a/core/modules/menu_link_content/src/MenuLinkContentServiceProvider.php b/core/modules/menu_link_content/src/MenuLinkContentServiceProvider.php index 273228d..521d190 100644 --- a/core/modules/menu_link_content/src/MenuLinkContentServiceProvider.php +++ b/core/modules/menu_link_content/src/MenuLinkContentServiceProvider.php @@ -22,7 +22,7 @@ public function alter(ContainerBuilder $container) { if (isset($modules['hal'])) { // Add a hal normalizer service for menu-link-content entities. $service_definition = new Definition(HalMenuLinkContentNormalizer::class, [ - new Reference('rest.link_manager'), + new Reference('serialization.link_manager'), new Reference('entity.manager'), new Reference('module_handler'), ]); diff --git a/core/modules/menu_link_content/tests/src/Kernel/Normalizer/HalMenuLinkContentNormalizerTest.php b/core/modules/menu_link_content/tests/src/Kernel/Normalizer/HalMenuLinkContentNormalizerTest.php index 0669b7a..5551640 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Normalizer/HalMenuLinkContentNormalizerTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Normalizer/HalMenuLinkContentNormalizerTest.php @@ -21,7 +21,6 @@ class HalMenuLinkContentNormalizerTest extends KernelTestBase { public static $modules = [ 'menu_link_content', 'serialization', - 'rest', 'hal', 'node', 'user', @@ -72,7 +71,7 @@ public function testMenuLinkNormalizer() { ]); $link->save(); $serializer = $this->container->get('serializer'); - $link_manager = $this->container->get('rest.link_manager'); + $link_manager = $this->container->get('serialization.link_manager'); $mock_field_uri = $link_manager->getRelationUri('menu_link_content', 'menu_link_content', 'link_target', []); $parent_field_uri = $link_manager->getRelationUri('menu_link_content', 'menu_link_content', HalMenuLinkContentNormalizer::PSEUDO_PARENT_FIELD_NAME, []); $node_url = $node->toUrl('canonical', ['absolute' => TRUE])->setRouteParameter('_format', 'hal_json')->toString(); diff --git a/core/modules/menu_link_content/tests/src/Kernel/Normalizer/MenuLinkContentNormalizerTest.php b/core/modules/menu_link_content/tests/src/Kernel/Normalizer/MenuLinkContentNormalizerTest.php index 515408c..d1f478e 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Normalizer/MenuLinkContentNormalizerTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Normalizer/MenuLinkContentNormalizerTest.php @@ -20,7 +20,6 @@ class MenuLinkContentNormalizerTest extends KernelTestBase { public static $modules = [ 'menu_link_content', 'serialization', - 'rest', 'node', 'user', 'text',