diff --git a/core/core.services.yml b/core/core.services.yml index 328acd8..1f75603 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -348,7 +348,7 @@ services: arguments: ['@menu.tree_storage', '@plugin.manager.menu.link', '@router.route_provider', '@menu.active_trail', '@controller_resolver', '@cache.menu', '@current_route_match'] menu.default_tree_manipulators: class: Drupal\Core\Menu\DefaultMenuLinkTreeManipulators - arguments: ['@access_manager', '@current_user', '@entity.query'] + arguments: ['@access_manager', '@current_user', '@entity.query', '@entity.manager'] menu.active_trail: class: Drupal\Core\Menu\MenuActiveTrail arguments: ['@plugin.manager.menu.link', '@current_route_match'] diff --git a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php index cd1a392..6ca00b4 100644 --- a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php @@ -42,6 +42,13 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase { protected $queryFactory; /** + * The mocked entity manager. + * + * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $entityManager; + + /** * The default menu link tree manipulators. * * @var \Drupal\Core\Menu\DefaultMenuLinkTreeManipulators @@ -68,13 +75,14 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase { protected function setUp() { parent::setUp(); + $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface'); $this->accessManager = $this->getMock('\Drupal\Core\Access\AccessManagerInterface'); $this->currentUser = $this->getMock('Drupal\Core\Session\AccountInterface'); $this->queryFactory = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory') ->disableOriginalConstructor() ->getMock(); - $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->queryFactory); + $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->queryFactory, $this->entityManager); } /**