diff --git a/src/Controller/RulesReactionListBuilder.php b/src/Controller/RulesReactionListBuilder.php index 08a58b3..d23728b 100644 --- a/src/Controller/RulesReactionListBuilder.php +++ b/src/Controller/RulesReactionListBuilder.php @@ -49,7 +49,7 @@ class RulesReactionListBuilder extends ConfigEntityListBuilder { public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) { return new static( $entity_type, - $container->get('entity.manager')->getStorage($entity_type->id()), + $container->get('entity_type.manager')->getStorage($entity_type->id()), $container->get('plugin.manager.rules_event') ); } diff --git a/tests/src/Unit/Integration/RulesIntegrationTestBase.php b/tests/src/Unit/Integration/RulesIntegrationTestBase.php index b8bf7a4..cb8b452 100644 --- a/tests/src/Unit/Integration/RulesIntegrationTestBase.php +++ b/tests/src/Unit/Integration/RulesIntegrationTestBase.php @@ -8,7 +8,6 @@ use Drupal\Core\DependencyInjection\ClassResolverInterface; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Config\Entity\ConfigEntityStorageInterface; use Drupal\Core\Entity\EntityFieldManagerInterface; -use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeBundleInfoInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator; @@ -39,11 +38,6 @@ use Prophecy\Argument; abstract class RulesIntegrationTestBase extends UnitTestCase { /** - * @var \Drupal\Core\Entity\EntityManagerInterface|\Prophecy\Prophecy\ProphecyInterface - */ - protected $entityManager; - - /** * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\Prophecy\Prophecy\ProphecyInterface */ protected $entityTypeManager; @@ -212,10 +206,6 @@ abstract class RulesIntegrationTestBase extends UnitTestCase { $this->aliasManager = $this->prophesize(AliasManagerInterface::class); - // Keep the deprecated entity manager around because it is still used in a - // few places. - $this->entityManager = $this->prophesize(EntityManagerInterface::class); - $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); $this->entityTypeManager->getDefinitions()->willReturn([]); @@ -239,7 +229,6 @@ abstract class RulesIntegrationTestBase extends UnitTestCase { // Mock the Rules debug logger service and make it return our mocked logger. $this->logger = $this->prophesize(LoggerChannelInterface::class); - $container->set('entity.manager', $this->entityManager->reveal()); $container->set('entity_type.manager', $this->entityTypeManager->reveal()); $container->set('entity_field.manager', $this->entityFieldManager->reveal()); $container->set('entity_type.bundle.info', $this->entityTypeBundleInfo->reveal());