Commit bec7e231 authored by Project Update Bot's avatar Project Update Bot Committed by Bram Driesen
Browse files

Issue #3297477 by Project Update Bot, BramDriesen: Automated Drupal 10 compatibility fixes

parent 4999d9b3
Loading
Loading
Loading
Loading

.gitignore

0 → 100644
+29 −0
Original line number Diff line number Diff line
# Ignore vim swp files and gedit temp files
*.swp
*.*~
.vim

# eclipse settings files
.project
.pydevproject
.settings
.buildpath

# netbeans settings files
nbproject

# Ignore OS settings files
.DS_Store*
Thumbs.db
ehthumbs.db

# Ignore files generated by PhpStorm
.idea

# Ignore files generated by vscode
.history

# and some random server stuff
.bash_history
.bashrc
errors.log
 No newline at end of file
+3 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Drupal\keycloak\EventSubscriber;

use Symfony\Component\HttpKernel\Event\RequestEvent;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\Core\Path\PathMatcherInterface;
@@ -11,7 +12,6 @@ use Drupal\Core\Url;
use Drupal\keycloak\Service\KeycloakServiceInterface;
use Drupal\openid_connect\OpenIDConnectStateToken;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;

/**
@@ -69,10 +69,10 @@ class KeycloakRequestSubscriber implements EventSubscriberInterface {
  /**
   * Redirects keycloak logout requests to Keycloak.
   *
   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
   * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
   *   The event to process.
   */
  public function onKernelRequestCheckKeycloakRedirect(GetResponseEvent $event) {
  public function onKernelRequestCheckKeycloakRedirect(RequestEvent $event) {
    // Whether Keycloak is enabled and configured for RP initiated
    // Single Sign-Out.
    if (!$this->keycloak->isKeycloakSignOutEnabled()) {