Commit 02bcdb80 authored by Nikolay Lobachev's avatar Nikolay Lobachev
Browse files

Issue #3304797: Remove useless use statements, Update GroupMembershipRequestValidator class.

parent 906c2b4b

src/Plugin/Group/Relation/GroupMembershipRequest.php

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ use Drupal\group\Access\GroupAccessResult; 
use Drupal\group\Entity\GroupInterface;

use Drupal\group\Entity\GroupContentInterface;

use Drupal\group\Plugin\Group\Relation\GroupRelationBase;

use Drupal\field\Entity\FieldConfig;

use Drupal\field\Entity\FieldStorageConfig;

use Drupal\Core\Entity\Entity\EntityViewDisplay;

use Drupal\Core\Session\AccountInterface;



/**

src/Plugin/Validation/Constraint/GroupMembershipRequestValidator.php

+7 −7
Original line number Diff line number Diff line
@@ -20,29 +20,29 @@ class GroupMembershipRequestValidator extends ConstraintValidator { 
  /**

   * {@inheritdoc}

   */

  public function validate($group_content, Constraint $constraint) {

  public function validate($group_relation, Constraint $constraint) {



    /** @var \Drupal\group\Entity\GroupContentInterface $group_content */

    /** @var \Drupal\group\Entity\GroupRelationshipInterface $group_relation */

    /** @var \Drupal\grequest\Plugin\Validation\Constraint\GroupMembershipRequest $constraint */



    // Apply logic only to group request membership group content.

    if ($group_content->getContentPlugin()->getPluginId() !== 'group_membership_request') {

    if ($group_relation->getContentPlugin()->getPluginId() !== 'group_membership_request') {

      return;

    }



    // Only run our checks if a group was referenced.

    if (!$group = $group_content->getGroup()) {

    if (!$group = $group_relation->getGroup()) {

      return;

    }



    // Only run our checks if an entity was referenced.

    if (empty($group_content->getEntity())) {

    if (empty($group_relation->getEntity())) {

      return;

    }



    if ($group->getMember($group_content->getEntity())) {

    if ($group->getMember($group_relation->getEntity())) {

      $this->context->addViolation($constraint->message, [

        '%name' => $group_content->getEntity()->getDisplayName(),

        '%name' => $group_relation->getEntity()->getDisplayName(),

      ]);

    }