Commit f78fb96a authored by catch's avatar catch

Issue #2894261 by alexpott, Berdir, Sam152, deepakaryan1988, larowlan,...

Issue #2894261 by alexpott, Berdir, Sam152, deepakaryan1988, larowlan, andypost: Deprecated service entity.manager needs to be replaced with entity_type.manager in ContentEntityForm

(cherry picked from commit 077e2307)
parent f208a930
......@@ -56,6 +56,7 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
public function __construct(EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
if ($entity_repository instanceof EntityManagerInterface) {
@trigger_error('Passing the entity.manager service to ContentEntityForm::__construct() is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Pass the entity.repository service instead. See https://www.drupal.org/node/2549139.', E_USER_DEPRECATED);
$this->entityManager = $entity_repository;
}
$this->entityRepository = $entity_repository;
$this->entityTypeBundleInfo = $entity_type_bundle_info ?: \Drupal::service('entity_type.bundle.info');
......
......@@ -22,7 +22,12 @@ public function testEntityManagerDeprecation() {
$entity_manager = $this->prophesize(EntityManagerInterface::class)->reveal();
$entity_type_bundle_info = $this->prophesize(EntityTypeBundleInfoInterface::class)->reveal();
$time = $this->prophesize(TimeInterface::class)->reveal();
new ContentEntityForm($entity_manager, $entity_type_bundle_info, $time);
$form = new ContentEntityForm($entity_manager, $entity_type_bundle_info, $time);
$reflected_form = new \ReflectionClass($form);
$entity_manager_property = $reflected_form->getProperty('entityManager');
$entity_manager_property->setAccessible(TRUE);
$this->assertTrue($entity_manager_property->getValue($form) === $entity_manager);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment