Updates: (deps): Update drupal/views_bulk_operations requirement from 4.1.4 to 4.2.3

composer.json

@@ -105,6 +105,9 @@
             },
             "drupal/redirect": {
                 "Redirection issue when interface language is different from content language": "https://www.drupal.org/files/issues/2020-06-01/redirect-interface_language_different_from_content_language_2991423-13.patch"
+            },
+            "drupal/views_bulk_operations": {
+                "Issue #3347030: Add #submit attribute to ConfigureAction form": "https://git.drupalcode.org/project/views_bulk_operations/-/merge_requests/57.diff"
             }
         }
     },
@@ -163,6 +166,7 @@
         "drupal/token": "1.12.0",
         "drupal/ultimate_cron": "2.0.0-alpha6",
         "drupal/update_helper": "3.0.4",
+        "drupal/views_bulk_operations": "4.2.4",
         "drupal/url_embed": "2.0.0-alpha1",
         "drupal/views_bulk_operations": "4.1.4",
         "drupal/views_infinite_scroll": "2.0.2",

modules/custom/gvbo/src/Plugin/views/field/GroupViewsBulkOperationsBulkForm.php

@@ -95,7 +95,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function viewsForm(array &$form, FormStateInterface $form_state) {
+  public function viewsForm(array &$form, FormStateInterface $form_state): void {
     parent::viewsForm($form, $form_state);
 
     $wrapper = &$form['header'][$this->options['id']];
@@ -114,7 +114,7 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
-  public function viewsFormSubmit(array &$form, FormStateInterface $form_state) {
+  public function viewsFormSubmit(array &$form, FormStateInterface $form_state): void {
     parent::viewsFormSubmit($form, $form_state);
 
     $redirect = $form_state->getRedirect();

modules/social_features/social_core/src/Controller/SocialCoreController.php

@@ -197,6 +197,7 @@ public function updateSelection(
         break;
     }
 
+    /** @var array $view_data */
     $this->setTempstoreData($view_data);
 
     $count = empty($view_data['exclude_mode'])

modules/social_features/social_event/modules/social_event_managers/social_event_managers.module

@@ -449,12 +449,7 @@ function _social_event_managers_action_batch_finish($success, array $results, ar
     return;
   }
 
-  $operations = array_count_values($results['operations']);
-  $results_count = 0;
-
-  foreach ($operations as $count) {
-    $results_count += $count;
-  }
+  $results_count = $results['operations'][0]['count'];
 
   $hook = 'social_event_managers_action_' . $results['action'] . '_finish';
 
@@ -570,10 +565,11 @@ function social_event_managers_social_event_managers_action_social_event_manager
  * Add node ID to the route of action confirmation step.
  */
 function _social_event_managers_views_bulk_operations_bulk_form_submit($form, FormStateInterface $form_state) {
-  /** @var \Drupal\Core\Url $url */
+  $node = '';
+
+  /** @var \Drupal\Core\Url|null $url */
   $url = $form_state->getRedirect();
 
-  $node = '';
   if ($form_state->get('node')) {
     $node = $form_state->get('node');
   }
@@ -582,17 +578,27 @@ function _social_event_managers_views_bulk_operations_bulk_form_submit($form, Fo
     $node = $route->id();
   }
 
+  if (empty($node)) {
+    return;
+  }
+
   $route_parameters = [
     'node' => $node,
   ];
 
-  if (!empty($node)) {
-    if ($url->getRouteName() === 'views_bulk_operations.execute_configurable') {
-      $url = Url::fromRoute('social_event_managers.vbo.execute_configurable', $route_parameters);
-    }
-    if ($url->getRouteName() === 'social_event_managers.vbo.confirm') {
-      $url = Url::fromRoute('social_event_managers.vbo.confirm', $route_parameters);
-    }
+  // If we have confirm route then just go with it.
+  if ($url && $url->getRouteName() === "social_event_managers.vbo.confirm") {
+    $url = Url::fromRoute('social_event_managers.vbo.confirm', $route_parameters);
+    $form_state->setRedirectUrl($url);
+    return;
+  }
+
+  // For additional configurations, such as 'Send email' action.
+  if ($form['#id'] !== 'views-bulk-operations-configure-action') {
+    $url = Url::fromRoute('social_event_managers.vbo.execute_configurable', $route_parameters);
+  }
+  else {
+    $url = Url::fromRoute('social_event_managers.vbo.confirm', $route_parameters);
   }
 
   $form_state->setRedirectUrl($url);

modules/social_features/social_event/modules/social_event_managers/src/Plugin/Action/SocialEventManagersSendEmail.php

@@ -115,7 +115,7 @@ public function access($object, AccountInterface $account = NULL, $return_as_obj
   /**
    * {@inheritdoc}
    */
-  public function buildPreConfigurationForm(array $form, array $values, FormStateInterface $form_state) {
+  public function buildPreConfigurationForm(array $form, array $values, FormStateInterface $form_state): array {
     return $form;
   }
 

modules/social_features/social_event/modules/social_event_managers/src/Plugin/views/field/SocialEventManagersViewsBulkOperationsBulkForm.php

@@ -39,7 +39,7 @@ class SocialEventManagersViewsBulkOperationsBulkForm extends ViewsBulkOperations
    *
    * @var \Drupal\Core\Action\ActionManager
    */
-  protected $actionManager;
+  protected $pluginActionManager;
 
   /**
    * Constructs a new SocialEventManagersViewsBulkOperationsBulkForm object.
@@ -83,7 +83,7 @@ public function __construct(
     parent::__construct($configuration, $plugin_id, $plugin_definition, $viewData, $actionManager, $actionProcessor, $tempStoreFactory, $currentUser, $requestStack);
 
     $this->entityTypeManager = $entity_type_manager;
-    $this->actionManager = $pluginActionManager;
+    $this->pluginActionManager = $pluginActionManager;
   }
 
   /**
@@ -108,7 +108,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function getBulkOptions() {
+  public function getBulkOptions(): array {
     $bulk_options = parent::getBulkOptions();
 
     if ($this->view->id() !== 'event_manage_enrollments') {
@@ -136,7 +136,7 @@ public function getBulkOptions() {
   /**
    * {@inheritdoc}
    */
-  public function viewsForm(array &$form, FormStateInterface $form_state) {
+  public function viewsForm(array &$form, FormStateInterface $form_state): void {
     $this->view->setExposedInput(['status' => TRUE]);
 
     parent::viewsForm($form, $form_state);
@@ -198,6 +198,8 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
     }
     // Add the Event ID to the data.
     $tempstoreData['event_id'] = $event->id();
+
+    /** @var array $tempstoreData */
     $this->setTempstoreData($tempstoreData, $this->view->id(), $this->view->current_display);
 
     // Reorder the form array.
@@ -225,8 +227,9 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
 
     // Render select all results checkbox.
     if (!empty($wrapper['select_all'])) {
+      $total_results = is_array($this->tempStoreData) ? $this->tempStoreData['total_results'] : 0;
       $wrapper['select_all']['#title'] = $this->t('Select / unselect all @count members across all the pages', [
-        '@count' => $this->tempStoreData['total_results'] ? ' ' . $this->tempStoreData['total_results'] : '',
+        '@count' => ' ' . $total_results,
       ]);
       // Styling attributes for the select box.
       $form['header'][$this->options['id']]['select_all']['#attributes']['class'][] = 'form-no-label';
@@ -340,7 +343,7 @@ public function viewsFormValidate(&$form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
-  public function viewsFormSubmit(array &$form, FormStateInterface $form_state) {
+  public function viewsFormSubmit(array &$form, FormStateInterface $form_state): void {
     parent::viewsFormSubmit($form, $form_state);
 
     if ($form_state->get('step') === 'views_form_views_form' && $this->view->id() === 'event_manage_enrollments') {
@@ -414,7 +417,7 @@ public function getEntityLabel(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  protected function getTempstoreData($view_id = NULL, $display_id = NULL) {
+  protected function getTempstoreData($view_id = NULL, $display_id = NULL): ?array {
     $data = parent::getTempstoreData($view_id, $display_id);
 
     if (is_array($data) && $data) {

modules/social_features/social_group/modules/social_group_gvbo/src/Access/SocialGroupViewsBulkOperationsAccess.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\social_group_gvbo\Access;
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\RouteMatch;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\views_bulk_operations\Access\ViewsBulkOperationsAccess;
@@ -14,7 +15,7 @@ class SocialGroupViewsBulkOperationsAccess extends ViewsBulkOperationsAccess {
   /**
    * {@inheritdoc}
    */
-  public function access(AccountInterface $account, RouteMatch $routeMatch) {
+  public function access(AccountInterface $account, RouteMatch $routeMatch): AccessResult {
     $parameters = [
       'view_id' => 'group_manage_members',
       'display_id' => 'page_group_manage_members',

modules/social_features/social_group/modules/social_group_invite/src/Plugin/views/field/SocialGroupInviteViewsBulkOperationsBulkForm.php

@@ -21,7 +21,7 @@ class SocialGroupInviteViewsBulkOperationsBulkForm extends ViewsBulkOperationsBu
   /**
    * {@inheritdoc}
    */
-  public function getBulkOptions() {
+  public function getBulkOptions(): array {
     $bulk_options = parent::getBulkOptions();
 
     if ($this->view->id() !== 'social_group_invitations') {
@@ -85,6 +85,7 @@ public function viewsForm(array &$form, FormStateInterface $form_state): void {
       $tempstoreData['group_id'] = $group->id();
     }
 
+    /** @var array $tempstoreData */
     $this->setTempstoreData($tempstoreData, $this->view->id(), $this->view->current_display);
 
     // Reorder the form array.
@@ -104,8 +105,9 @@ public function viewsForm(array &$form, FormStateInterface $form_state): void {
 
     // Render select all results checkbox.
     if (!empty($wrapper['select_all'])) {
+      $total_results = is_array($this->tempStoreData) ? $this->tempStoreData['total_results'] : 0;
       $wrapper['select_all']['#title'] = $this->t('Select / unselect all @count invites across all the pages', [
-        '@count' => $this->tempStoreData['total_results'] ? ' ' . $this->tempStoreData['total_results'] : '',
+        '@count' => ' ' . $total_results,
       ]);
       // Styling attributes for the select box.
       $form['header'][$this->options['id']]['select_all']['#attributes']['class'][] = 'form-no-label';

modules/social_features/social_group/src/Plugin/views/field/SocialGroupViewsBulkOperationsBulkForm.php

@@ -20,7 +20,7 @@ class SocialGroupViewsBulkOperationsBulkForm extends ViewsBulkOperationsBulkForm
   /**
    * {@inheritdoc}
    */
-  public function getBulkOptions() {
+  public function getBulkOptions(): array {
     $bulk_options = parent::getBulkOptions();
 
     if ($this->view->id() !== 'group_manage_members') {
@@ -67,7 +67,7 @@ public function getBulkOptions() {
   /**
    * {@inheritdoc}
    */
-  public function viewsForm(array &$form, FormStateInterface $form_state) {
+  public function viewsForm(array &$form, FormStateInterface $form_state): void {
     $this->view->setExposedInput(['status' => TRUE]);
 
     parent::viewsForm($form, $form_state);
@@ -118,6 +118,7 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
       $tempstoreData['group_id'] = $group->id();
     }
 
+    /** @var array $tempstoreData */
     $this->setTempstoreData($tempstoreData, $this->view->id(), $this->view->current_display);
 
     // Reorder the form array.
@@ -137,8 +138,9 @@ public function viewsForm(array &$form, FormStateInterface $form_state) {
 
     // Render select all results checkbox.
     if (!empty($wrapper['select_all'])) {
+      $total_results = is_array($this->tempStoreData) ? $this->tempStoreData['total_results'] : 0;
       $wrapper['select_all']['#title'] = $this->t('Select / unselect all @count members across all the pages', [
-        '@count' => $this->tempStoreData['total_results'] ? ' ' . $this->tempStoreData['total_results'] : '',
+        '@count' => ' ' . $total_results,
       ]);
       // Styling attributes for the select box.
       $form['header'][$this->options['id']]['select_all']['#attributes']['class'][] = 'form-no-label';
@@ -259,7 +261,7 @@ public function viewsFormValidate(&$form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
-  public function viewsFormSubmit(array &$form, FormStateInterface $form_state) {
+  public function viewsFormSubmit(array &$form, FormStateInterface $form_state): void {
     parent::viewsFormSubmit($form, $form_state);
 
     if ($form_state->get('step') === 'views_form_views_form' && $this->view->id() === 'group_manage_members') {

modules/social_features/social_user/src/Plugin/Action/SocialSendEmail.php

@@ -136,7 +136,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function setContext(array &$context) {
+  public function setContext(array &$context): void {
     parent::setContext($context);
     // @todo make the batch size configurable.
     $context['batch_size'] = Settings::get('social_mail_batch_size', 25);
@@ -213,7 +213,8 @@ public function getEmail(UserInterface $account) {
   /**
    * {@inheritdoc}
    */
-  public function buildPreConfigurationForm(array $form, array $values, FormStateInterface $form_state) {
+  public function buildPreConfigurationForm(array $form, array $values, FormStateInterface $form_state): array {
+    return [];
   }
 
   /**