diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php index ffdeb3595662a7c17280e3a23689e4867002686e..732887a85d681dd1ad808e53edb3aaedfb02adcc 100644 --- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php @@ -3,12 +3,10 @@ namespace Drupal\menu_link_content\Form; use Drupal\Component\Datetime\TimeInterface; -use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait; use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityRepositoryInterface; use Drupal\Core\Entity\EntityTypeBundleInfoInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Menu\MenuParentFormSelectorInterface; use Drupal\Core\Path\PathValidatorInterface; use Drupal\system\MenuInterface; @@ -21,13 +19,6 @@ */ class MenuLinkContentForm extends ContentEntityForm { - use DeprecatedServicePropertyTrait; - - /** - * The deprecated properties and services on this class. - */ - protected array $deprecatedProperties = ['languageManager' => 'language_manager']; - /** * The content menu link. * @@ -35,39 +26,27 @@ class MenuLinkContentForm extends ContentEntityForm { */ protected $entity; - /** - * The parent form selector service. - */ - protected MenuParentFormSelectorInterface $menuParentSelector; - - /** - * The path validator. - */ - protected PathValidatorInterface $pathValidator; - /** * Constructs a MenuLinkContentForm object. * * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository * The entity repository. - * @param \Drupal\Core\Menu\MenuParentFormSelectorInterface $menu_parent_selector + * @param \Drupal\Core\Menu\MenuParentFormSelectorInterface $menuParentSelector * The menu parent form selector service. - * @param \Drupal\Core\Path\PathValidatorInterface|\Drupal\Core\Language\LanguageManagerInterface $path_validator + * @param \Drupal\Core\Path\PathValidatorInterface $pathValidator * The path validator. - * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface|\Drupal\Core\Path\PathValidatorInterface $entity_type_bundle_info + * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info * The entity type bundle service. - * @param \Drupal\Component\Datetime\TimeInterface|\Drupal\Core\Entity\EntityTypeBundleInfoInterface $time + * @param \Drupal\Component\Datetime\TimeInterface $time * The time service. */ - public function __construct(EntityRepositoryInterface $entity_repository, MenuParentFormSelectorInterface $menu_parent_selector, PathValidatorInterface|LanguageManagerInterface $path_validator, EntityTypeBundleInfoInterface|PathValidatorInterface $entity_type_bundle_info = NULL, TimeInterface|EntityTypeBundleInfoInterface $time = NULL) { - if ($path_validator instanceof LanguageManagerInterface) { - $path_validator = func_get_arg(3); - $entity_type_bundle_info = func_get_arg(4); - $time = func_get_arg(5); - @trigger_error('Calling ' . __CLASS__ . '::__construct() with the $language_manager argument is deprecated in drupal:10.2.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/3325178', E_USER_DEPRECATED); - } - $this->menuParentSelector = $menu_parent_selector; - $this->pathValidator = $path_validator; + public function __construct( + EntityRepositoryInterface $entity_repository, + protected MenuParentFormSelectorInterface $menuParentSelector, + protected PathValidatorInterface $pathValidator, + EntityTypeBundleInfoInterface $entity_type_bundle_info, + TimeInterface $time, + ) { parent::__construct($entity_repository, $entity_type_bundle_info, $time); } diff --git a/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeprecationsTest.php b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeprecationsTest.php deleted file mode 100644 index 1af2a651521fff7a8c303c020eafdb0422bac232..0000000000000000000000000000000000000000 --- a/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeprecationsTest.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php - -declare(strict_types=1); - -namespace Drupal\Tests\menu_link_content\Kernel; - -use Drupal\Component\Datetime\TimeInterface; -use Drupal\Core\Entity\EntityRepositoryInterface; -use Drupal\Core\Entity\EntityTypeBundleInfoInterface; -use Drupal\Core\Language\LanguageManagerInterface; -use Drupal\Core\Menu\MenuParentFormSelectorInterface; -use Drupal\Core\Path\PathValidatorInterface; -use Drupal\KernelTests\KernelTestBase; -use Drupal\menu_link_content\Form\MenuLinkContentForm; - -/** - * Tests the deprecation notices of the menu_link_content module. - * - * @group menu_link_content - * @group legacy - */ -class MenuLinkContentDeprecationsTest extends KernelTestBase { - - /** - * Tests the deprecation in the \Drupal\menu_link_content\Form\MenuLinkContentForm constructor. - */ - public function testMenuLinkContentFormConstructorDeprecation(): void { - $entity_repository = $this->prophesize(EntityRepositoryInterface::class); - $menu_parent_form_selector = $this->prophesize(MenuParentFormSelectorInterface::class); - $language_manager = $this->prophesize(LanguageManagerInterface::class); - $path_validator = $this->prophesize(PathValidatorInterface::class); - $entity_type_bundle_info = $this->prophesize(EntityTypeBundleInfoInterface::class); - $time = $this->prophesize(TimeInterface::class); - $this->expectDeprecation('Calling Drupal\menu_link_content\Form\MenuLinkContentForm::__construct() with the $language_manager argument is deprecated in drupal:10.2.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/3325178'); - new MenuLinkContentForm( - $entity_repository->reveal(), - $menu_parent_form_selector->reveal(), - $language_manager->reveal(), - $path_validator->reveal(), - $entity_type_bundle_info->reveal(), - $time->reveal() - ); - } - -}