Issue #3287741 by LOBsTerr, Eduardo Morales Alberti: Automated Drupal 10 compatibility fixes (4f242a35) · Commits · project / ginvite

ginvite.module

+4 −3

Original line number	Diff line number	Diff line
		@@ -213,7 +213,8 @@ function ginvite_mail($key, &$message, $params) {
		$group_invite_config = $group_plugin_collection->getConfiguration()['group_invitation'];

		$language_manager->setConfigOverrideLanguage($original_language);

		$subject = '';
		$body = '';
		if ($key == 'cancel') {
		$subject = $group_invite_config['cancel_user_invitation_subject'];
		$body = $group_invite_config['cancel_user_invitation_body'];
		@@ -312,6 +313,7 @@ function ginvite_entity_type_alter(array &$entity_types) {
		* Implements hook_token_info().
		*/
		function ginvite_token_info() {
		$tokens = [];
		$tokens['register_link'] = [
		'name' => t('Register Link'),
		'description' => t('Url to register page with prefilled email address.'),
		@@ -364,7 +366,7 @@ function ginvite_tokens($type, $tokens, array $data, array $options, BubbleableM
		* Implements hook_form_FORM_ID_alter().
		*/
		function ginvite_form_user_register_form_alter(&$form, FormStateInterface $form_state, $form_id) {
		$invitee_mail = \Drupal::request()->query->get("invitee_mail");
		$invitee_mail = \Drupal::request()->query->get('invitee_mail');
		if (isset($invitee_mail)) {
		$search = ['-', '_'];
		$replace = ['+', '/'];
		@@ -410,7 +412,6 @@ function ginvite_cron() {
		}

		// Query for all the invites that are expired for this group type.

		$config_id = $group_type->getContentPlugin('group_invitation')->getContentTypeConfigId();
		$expired_invites = $group_content_storage->getQuery()
		->accessCheck(FALSE)

src/Controller/InvitationOperations.php

+4 −6

Original line number	Diff line number	Diff line
		@@ -2,21 +2,19 @@

		namespace Drupal\ginvite\Controller;

		use Drupal\Core\Access\AccessResult;
		use Drupal\Core\Controller\ControllerBase;
		use Drupal\Core\Entity\EntityFormBuilderInterface;
		use Drupal\Core\Messenger\MessengerInterface;
		use Drupal\Core\Url;
		use Drupal\Core\Session\AccountInterface;
		use Drupal\ginvite\Plugin\GroupContentEnabler\GroupInvitation;
		use Drupal\group\Entity\GroupContent;
		use Drupal\group\Entity\GroupContentInterface;
		use Drupal\group\Entity\GroupInterface;
		use Drupal\group\GroupMembershipLoader;
		use Symfony\Component\DependencyInjection\ContainerInterface;
		use Symfony\Component\HttpFoundation\RedirectResponse;
		use Symfony\Component\HttpFoundation\Request;
		use Drupal\Core\Access\AccessResult;
		use Drupal\Core\Access\AccessResultInterface;
		use Symfony\Component\DependencyInjection\ContainerInterface;
		use Drupal\group\GroupMembershipLoader;
		use Drupal\group\Entity\GroupInterface;

		/**
		* Handles Accept/Decline operations and Access check for them.

src/Event/InvitationBaseEvent.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@

		namespace Drupal\ginvite\Event;

		use Drupal\ginvite\GroupInvitation;
		use Drupal\Component\EventDispatcher\Event;
		use Drupal\ginvite\GroupInvitation;

		/**
		* Base invitation event.

src/EventSubscriber/GinviteSubscriber.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -4,15 +4,15 @@ namespace Drupal\ginvite\EventSubscriber;

		use Drupal\Component\Render\FormattableMarkup;
		use Drupal\Core\Config\ConfigFactoryInterface;
		use Drupal\Core\Messenger\MessengerInterface;
		use Drupal\Core\Logger\LoggerChannelFactoryInterface;
		use Drupal\Core\Messenger\MessengerInterface;
		use Drupal\Core\Session\AccountInterface;
		use Drupal\Core\StringTranslation\StringTranslationTrait;
		use Drupal\Core\Url;
		use Drupal\ginvite\Event\InvitationBaseEvent;
		use Drupal\ginvite\Event\UserLoginWithInvitationEvent;
		use Drupal\ginvite\GroupInvitationLoader;
		use Drupal\ginvite\Event\UserRegisteredFromInvitationEvent;
		use Drupal\ginvite\GroupInvitationLoader;
		use Drupal\ginvite\Plugin\GroupContentEnabler\GroupInvitation;
		use Drupal\group\Entity\GroupContent;
		use Symfony\Component\EventDispatcher\EventSubscriberInterface;
		@@ -158,7 +158,7 @@ class GinviteSubscriber implements EventSubscriberInterface {
		}

		/**
		* Auto Accept Group Invitations from the ginvite module
		* Auto Accept Group Invitations from the ginvite module.
		*
		* @param \Drupal\ginvite\Event\UserRegisteredFromInvitationEvent $event
		* The UserRegisteredFromInvitationEvent to process.

src/Form/BulkGroupInvitation.php

+22 −8

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		*/
		protected $messenger;


		/**
		* Group.
		*
		@@ -63,6 +62,20 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		*/
		protected $group;

		/**
		* The group membership loader.
		*
		* @var \Drupal\group\GroupMembershipLoaderInterface
		*/
		protected $groupMembershipLoader;

		/**
		* Group invitations loader.
		*
		* @var \Drupal\ginvite\GroupInvitationLoader
		*/
		protected $groupInvitationLoader;

		/**
		* Constructs a new BulkGroupInvitation Form.
		*
		@@ -169,7 +182,7 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		* {@inheritdoc}
		*/
		public function validateForm(array &$form, FormStateInterface $form_state) {
		foreach ($form_state->getValues() as $key => $value) {
		foreach (array_keys($form_state->getValues()) as $key) {

		switch ($key) {
		case 'email_address':
		@@ -189,6 +202,7 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		public function submitForm(array &$form, FormStateInterface $form_state) {

		// Prepare params to store them in tempstore.
		$params = [];
		$params['gid'] = $this->group->id();
		$params['plugin'] = $this->group->getGroupType()->getContentPlugin('group_invitation')->getContentTypeConfigId();
		$params['emails'] = $this->getSubmittedEmails($form_state);
		@@ -234,8 +248,8 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		}

		if (!empty($invalid_emails)) {
		$message_singular = "The @error_message is not a valid e-mail address.";
		$message_plural = "The e-mails: @error_message are not valid e-mail addresses.";
		$message_singular = 'The @error_message is not a valid e-mail address.';
		$message_plural = 'The e-mails: @error_message are not valid e-mail addresses.';

		$this->displayErrorMessage($invalid_emails, $message_singular, $message_plural, $form_state);
		}
		@@ -259,8 +273,8 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		}

		if (!empty($invalid_emails)) {
		$message_singular = "User with @error_message e-mail already a member of this group.";
		$message_plural = "Users with: @error_message e-mails already members of this group.";
		$message_singular = 'User with @error_message e-mail already a member of this group.';
		$message_plural = 'Users with: @error_message e-mails already members of this group.';

		$this->displayErrorMessage($invalid_emails, $message_singular, $message_plural, $form_state);
		}
		@@ -282,8 +296,8 @@ class BulkGroupInvitation extends FormBase implements ContainerInjectionInterfac
		}

		if (!empty($invalid_emails)) {
		$message_singular = "Invitation to @error_message already sent.";
		$message_plural = "Invitations to: @error_message already sent.";
		$message_singular = 'Invitation to @error_message already sent.';
		$message_plural = 'Invitations to: @error_message already sent.';

		$this->displayErrorMessage($invalid_emails, $message_singular, $message_plural, $form_state);
		}