Merge branch 'redirectUrl' into 1.1.x

[#25] Use `setRedirectUrl()` instead of route-based redirects
systopia · May 16, 2024 · ec43395 · ec43395
2 parents 61c032a + b7b5d02
commit ec43395
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/modules/civiremote_event/src/Form/RegisterForm.php b/modules/civiremote_event/src/Form/RegisterForm.php
@@ -1212,11 +1212,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
             /* @var Url $url */
             $url = Drupal::service('path.validator')
               ->getUrlIfValid($config->get('form_redirect_route'));
-            $form_state->setRedirect(
-              $url->getRouteName(),
-              $url->getRouteParameters(),
-              $url->getOptions()
-            );
+            $form_state->setRedirectUrl($url);
           }
         }
         catch (Exception $exception) {

diff --git a/modules/civiremote_event/src/Form/RegistrationCancelForm.php b/modules/civiremote_event/src/Form/RegistrationCancelForm.php
@@ -136,11 +136,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     /* @var Url $url */
     $url = Drupal::service('path.validator')
       ->getUrlIfValid($config->get('form_redirect_route'));
-    $form_state->setRedirect(
-      $url->getRouteName(),
-      $url->getRouteParameters(),
-      $url->getOptions()
-    );
+    $form_state->setRedirectUrl($url);
   }
 
   /**

diff --git a/modules/civiremote_event/src/Form/RegistrationUpdateForm.php b/modules/civiremote_event/src/Form/RegistrationUpdateForm.php
@@ -84,11 +84,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
             /* @var Url $url */
             $url = Drupal::service('path.validator')
               ->getUrlIfValid($config->get('form_redirect_route'));
-            $form_state->setRedirect(
-              $url->getRouteName(),
-              $url->getRouteParameters(),
-              $url->getOptions()
-            );
+            $form_state->setRedirectUrl($url);
           }
         }
         catch (Exception $exception) {