diff --git a/modules/grequest/src/Plugin/Validation/Constraint/GroupRequestPendingCardinalityValidator.php b/modules/grequest/src/Plugin/Validation/Constraint/GroupRequestPendingCardinalityValidator.php index 66c0c2e..3db412e 100644 --- a/modules/grequest/src/Plugin/Validation/Constraint/GroupRequestPendingCardinalityValidator.php +++ b/modules/grequest/src/Plugin/Validation/Constraint/GroupRequestPendingCardinalityValidator.php @@ -85,19 +85,17 @@ class GroupRequestPendingCardinalityValidator extends ConstraintValidator { $entity_instances = $group->getContentByEntityId($plugin->getPluginId(), $group_content->getEntity()->id()); $entity_count = count($entity_instances); - if ($group_content_id = $group_content->id()) { - foreach ($entity_instances as $instance) { - /** @var \Drupal\group\Entity\GroupContentInterface $instance */ - // If the current group content entity has an ID, exclude that one. - if ($instance->id() === $group_content_id) { - $entity_count--; - break; - } - // Set cardinality only on the memberships that are pending approval. - if ($instance->getEntity()->get('grequest_status')->value !== GroupMembershipRequest::REQUEST_PENDING) { - $entity_count--; - break; - } + foreach ($entity_instances as $instance) { + /** @var \Drupal\group\Entity\GroupContentInterface $instance */ + // If the current group content entity has an ID, exclude that one. + if ($instance->id() === $group_content->id()) { + $entity_count--; + continue; + } + // Set cardinality only on the memberships that are pending approval. + if ($instance->get('grequest_status')->value !== GroupMembershipRequest::REQUEST_PENDING) { + $entity_count--; + continue; } }