diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php index 63bd799..3c63365 100644 --- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php @@ -7,30 +7,18 @@ namespace Drupal\menu_link_content\Form; -use Drupal\Component\Utility\UrlHelper; -use Drupal\Core\Access\AccessManagerInterface; use Drupal\Core\Entity\ContentEntityForm; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageManagerInterface; -use Drupal\Core\Menu\Form\MenuLinkFormInterface; -use Drupal\Core\Menu\MenuLinkInterface; use Drupal\Core\Menu\MenuParentFormSelectorInterface; -use Drupal\Core\Path\AliasManagerInterface; use Drupal\Core\Path\PathValidatorInterface; -use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Routing\RequestContext; /** * Provides a form to add/update content menu links. - * - * Note: This is not only a content entity form, but also implements the - * MenuLinkFormInterface, so the same class can be used in places expecting a - * generic menu link plugin configuration form. */ -class MenuLinkContentForm extends ContentEntityForm implements MenuLinkFormInterface { +class MenuLinkContentForm extends ContentEntityForm { /** * The content menu link. @@ -47,34 +35,6 @@ class MenuLinkContentForm extends ContentEntityForm implements MenuLinkFormInter protected $menuParentSelector; /** - * The request context. - * - * @var \Symfony\Component\Routing\RequestContext - */ - protected $requestContext; - - /** - * The language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface - */ - protected $languageManager; - - /** - * The access manager. - * - * @var \Drupal\Core\Access\AccessManagerInterface - */ - protected $accessManager; - - /** - * The current user. - * - * @var \Drupal\Core\Session\AccountInterface - */ - protected $account; - - /** * The path validator. * * @var \Drupal\Core\Path\PathValidatorInterface @@ -88,30 +48,14 @@ class MenuLinkContentForm extends ContentEntityForm implements MenuLinkFormInter * The entity manager. * @param \Drupal\Core\Menu\MenuParentFormSelectorInterface $menu_parent_selector * The menu parent form selector service. - * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager - * The alias manager. - * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler - * The module handler; - * @param \Symfony\Component\Routing\RequestContext $request_context - * The request context. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. - * @param \Drupal\Core\Access\AccessManagerInterface $access_manager - * The access manager. - * @param \Drupal\Core\Session\AccountInterface $account - * The current user. * @param \Drupal\Core\Path\PathValidatorInterface $path_validator * The path validator. */ - public function __construct(EntityManagerInterface $entity_manager, MenuParentFormSelectorInterface $menu_parent_selector, AliasManagerInterface $alias_manager, ModuleHandlerInterface $module_handler, RequestContext $request_context, LanguageManagerInterface $language_manager, AccessManagerInterface $access_manager, AccountInterface $account, PathValidatorInterface $path_validator) { + public function __construct(EntityManagerInterface $entity_manager, MenuParentFormSelectorInterface $menu_parent_selector, LanguageManagerInterface $language_manager, PathValidatorInterface $path_validator) { parent::__construct($entity_manager, $language_manager); $this->menuParentSelector = $menu_parent_selector; - $this->pathAliasManager = $alias_manager; - $this->moduleHandler = $module_handler; - $this->requestContext = $request_context; - $this->languageManager = $language_manager; - $this->accessManager = $access_manager; - $this->account = $account; $this->pathValidator = $path_validator; } @@ -122,63 +66,21 @@ public static function create(ContainerInterface $container) { return new static( $container->get('entity.manager'), $container->get('menu.parent_form_selector'), - $container->get('path.alias_manager'), - $container->get('module_handler'), - $container->get('router.request_context'), $container->get('language_manager'), - $container->get('access_manager'), - $container->get('current_user'), $container->get('path.validator') ); } /** - * {@inheritdoc} - */ - public function setMenuLinkInstance(MenuLinkInterface $menu_link) { - // Load the entity for the entity form. Loading by entity ID is much faster - // than loading by UUID, so use that ID if we have it. - $metadata = $menu_link->getMetaData(); - if (!empty($metadata['entity_id'])) { - $this->entity = $this->entityManager->getStorage('menu_link_content')->load($metadata['entity_id']); - } - else { - // Fallback to the loading by UUID. - $links = $this->entityManager->getStorage('menu_link_content')->loadByProperties(array('uuid' => $menu_link->getDerivativeId())); - $this->entity = reset($links); - } - } - - /** - * {@inheritdoc} - */ - public function buildConfigurationForm(array $form, FormStateInterface $form_state) { - $this->setOperation('default'); - $this->init($form_state); - - return $this->form($form, $form_state); - } - - /** - * {@inheritdoc} - */ - public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { - $this->doValidate($form, $form_state); - } - - /** - * {@inheritdoc} - */ - public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { - // Remove button and internal Form API values from submitted values. - parent::submitForm($form, $form_state); - $this->save($form, $form_state); - } - - /** - * {@inheritdoc} + * Helper method to extract information from the form values. + * + * @param FormStateInterface $form_state + * The form state with submitted values. + * + * @return array + * The new menu link plugin definition. */ - public function extractFormValues(array &$form, FormStateInterface $form_state) { + protected function extractFormValues(FormStateInterface $form_state) { $new_definition = array(); $new_definition['expanded'] = !$form_state->isValueEmpty(array('expanded', 'value')) ? 1 : 0; $new_definition['enabled'] = !$form_state->isValueEmpty(array('enabled', 'value')) ? 1 : 0; @@ -241,13 +143,13 @@ protected function actions(array $form, FormStateInterface $form_state) { return $element; } - /** - * {@inheritdoc} - */ + /** + * {@inheritdoc} + */ public function buildEntity(array $form, FormStateInterface $form_state) { /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */ $entity = parent::buildEntity($form, $form_state); - $new_definition = $this->extractFormValues($form, $form_state); + $new_definition = $this->extractFormValues($form_state); $entity->parent->value = $new_definition['parent']; $entity->menu_name->value = $new_definition['menu_name']; @@ -278,26 +180,4 @@ public function save(array $form, FormStateInterface $form_state) { } } - /** - * Validates the form, both on the menu link edit and content menu link form. - * - * $form is not currently used, but passed here to match the normal form - * validation method signature. - * - * @param array $form - * A nested array form elements comprising the form. - * @param \Drupal\Core\Form\FormStateInterface $form_state - * The current state of the form. - * - * @todo Remove this code, as validation is already performed by the link - * field: https://www.drupal.org/node/2418031. - */ - protected function doValidate(array $form, FormStateInterface $form_state) { - $extracted = $this->pathValidator->getUrlIfValid($form_state->getValue(['link', 0, 'uri'])); - - if (!$extracted) { - $form_state->setErrorByName('link][0][uri', $this->t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $form_state->getValue(['link', 0, 'uri'])))); - } - } - }