diff -u b/src/DefaultContentServiceProvider.php b/src/DefaultContentServiceProvider.php --- b/src/DefaultContentServiceProvider.php +++ b/src/DefaultContentServiceProvider.php @@ -23,6 +23,7 @@ // Add a normalizer service for term entities. $service_definition = new Definition(TermEntityNormalizer::class, [ new Reference('hal.link_manager'), + new Reference('entity.manager'), new Reference('module_handler'), ]); // The priority must be higher than that of diff -u b/tests/src/Kernel/ExporterIntegrationTest.php b/tests/src/Kernel/ExporterIntegrationTest.php --- b/tests/src/Kernel/ExporterIntegrationTest.php +++ b/tests/src/Kernel/ExporterIntegrationTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\default_content\Kernel; -use Drupal\default_content\Exporter; use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\KernelTests\KernelTestBase; use Drupal\node\Entity\Node; @@ -34,20 +33,12 @@ protected $exporter; /** - * The link manager service. - * - * @var \Drupal\hal\LinkManager\LinkManager - */ - protected $linkManager; - - /** * {@inheritdoc} */ protected function setUp() { parent::setUp(); $this->installSchema('system', ['router', 'sequences']); - $this->linkManager = $this->getLinkManager(); } /** @@ -69,7 +60,7 @@ /** @var \Symfony\Component\Serializer\Serializer $serializer */ $serializer = \Drupal::service('serializer'); - $this->linkManager + $this->getLinkManager() ->setLinkDomain($this->container->getParameter('default_content.link_domain')); $expected = $serializer->serialize($term, 'hal_json', ['json_encode_options' => JSON_PRETTY_PRINT]); @@ -122,7 +113,7 @@ /** @var \Symfony\Component\Serializer\Serializer $serializer */ $serializer = \Drupal::service('serializer'); - $this->linkManager + $this->getLinkManager() ->setLinkDomain($this->container->getParameter('default_content.link_domain')); $expected_node = $serializer->serialize($node, 'hal_json', ['json_encode_options' => JSON_PRETTY_PRINT]); $expected_user = $serializer->serialize($user, 'hal_json', ['json_encode_options' => JSON_PRETTY_PRINT]); @@ -186,7 +177,7 @@ $node->save(); $node = Node::load($node->id()); $serializer = \Drupal::service('serializer'); - $this->linkManager + $this->getLinkManager() ->setLinkDomain($this->container->getParameter('default_content.link_domain')); $expected_node = $serializer->serialize($node, 'hal_json', ['json_encode_options' => JSON_PRETTY_PRINT]); @@ -219,7 +210,7 @@ * @see https://www.drupal.org/node/2830467 * - * @return \Drupal\hal\LinkManager\LinkManager|\Drupal\rest\LinkManager\LinkManager + * @return \Drupal\hal\LinkManager\LinkManager * The link manager service. */ protected function getLinkManager() { only in patch2: unchanged: --- a/tests/src/Functional/DefaultContentTest.php +++ b/tests/src/Functional/DefaultContentTest.php @@ -3,9 +3,9 @@ namespace Drupal\Tests\default_content\Functional; use Drupal\Core\Config\FileStorage; -use Drupal\simpletest\BrowserTestBase; use Drupal\simpletest\ContentTypeCreationTrait; use Drupal\simpletest\NodeCreationTrait; +use Drupal\Tests\BrowserTestBase; /** * Test import of default content.