Commit 032b34b6 authored by Bram Driesen's avatar Bram Driesen Committed by Bram Driesen
Browse files

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

parent bec7e231

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    "source": "http://cgit.drupalcode.org/keycloak"

  },

  "require": {

    "drupal/openid_connect": "^1.0"

    "drupal/openid_connect": "^3.0"

  },

  "authors": [

    {

keycloak.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ description: Enables OpenID Connect Keycloak sign on and user data synchronizati 
package: Other



type: module

core_version_requirement: ^8 || ^9

core_version_requirement: ^8 || ^9 || ^10



dependencies:

  - openid_connect:openid_connect

keycloak.services.yml

+1 −1
Original line number Diff line number Diff line 
services:

  keycloak.keycloak:

    class: Drupal\keycloak\Service\KeycloakService

    arguments: ['@config.factory', '@plugin.manager.openid_connect_client.processor', '@language_manager', '@current_user', '@tempstore.private', '@logger.factory']

    arguments: ['@config.factory', '@plugin.manager.openid_connect_client', '@language_manager', '@current_user', '@tempstore.private', '@logger.factory']



  keycloak.route_subscriber:

    class: Drupal\keycloak\Routing\KeycloakRouteSubscriber

src/Controller/KeycloakController.php

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Drupal\Core\Controller\ControllerBase; 
use Drupal\Core\Session\AccountProxyInterface;

use Drupal\keycloak\Service\KeycloakServiceInterface;

use Drupal\openid_connect\OpenIDConnectClaims;

use Drupal\openid_connect\Plugin\OpenIDConnectClientManager;

use Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Symfony\Component\HttpFoundation\RequestStack;
@@ -29,7 +29,7 @@ class KeycloakController extends ControllerBase { 
  /**

   * The OpenID Connect plug-in manager.

   *

   * @var \Drupal\openid_connect\Plugin\OpenIDConnectClientManager

   * @var \Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager

   */

  protected $pluginManager;
@@ -61,7 +61,7 @@ class KeycloakController extends ControllerBase { 
   *   A Keycloak service instance.

   * @param \Drupal\Core\Session\AccountProxyInterface $current_user

   *   Account proxy for the currently logged-in user.

   * @param \Drupal\openid_connect\Plugin\OpenIDConnectClientManager $plugin_manager

   * @param \Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager $plugin_manager

   *   The OpenID Connect plug-in manager.

   * @param \Drupal\openid_connect\OpenIDConnectClaims $claims

   *   The OpenID Connect claims.
@@ -71,7 +71,7 @@ class KeycloakController extends ControllerBase { 
  public function __construct(

    KeycloakServiceInterface $keycloak,

    AccountProxyInterface $current_user,

    OpenIDConnectClientManager $plugin_manager,

    OpenIDConnectClientPluginManager $plugin_manager,

    OpenIDConnectClaims $claims,

    RequestStack $request_stack

  ) {
@@ -89,7 +89,7 @@ class KeycloakController extends ControllerBase { 
    return new static(

      $container->get('keycloak.keycloak'),

      $container->get('current_user'),

      $container->get('plugin.manager.openid_connect_client.processor'),

      $container->get('plugin.manager.openid_connect_client'),

      $container->get('openid_connect.claims'),

      $container->get('request_stack')

    );

src/Service/KeycloakService.php

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Drupal\Core\Language\LanguageManagerInterface; 
use Drupal\Core\Logger\LoggerChannelFactoryInterface;

use Drupal\Core\Session\AccountProxyInterface;

use Drupal\Core\Url;

use Drupal\openid_connect\Plugin\OpenIDConnectClientManager;

use Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager;

use Drupal\Core\TempStore\PrivateTempStoreFactory;

use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -31,7 +31,7 @@ class KeycloakService implements KeycloakServiceInterface { 
  /**

   * Client plugin manager of the OpenID Connect module.

   *

   * @var \Drupal\openid_connect\Plugin\OpenIDConnectClientManager

   * @var \Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager

   */

  protected $oidcClientManager;
@@ -76,7 +76,7 @@ class KeycloakService implements KeycloakServiceInterface { 
   *

   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory

   *   The config factory.

   * @param \Drupal\openid_connect\Plugin\OpenIDConnectClientManager $oidc_client_manager

   * @param \Drupal\openid_connect\Plugin\OpenIDConnectClientPluginManager $oidc_client_manager

   *   Client plugin manager of the OpenID Connect module.

   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager

   *   A language manager instance.
@@ -89,7 +89,7 @@ class KeycloakService implements KeycloakServiceInterface { 
   */

  public function __construct(

    ConfigFactoryInterface $config_factory,

    OpenIDConnectClientManager $oidc_client_manager,

    OpenIDConnectClientPluginManager $oidc_client_manager,

    LanguageManagerInterface $language_manager,

    AccountProxyInterface $current_user,

    PrivateTempStoreFactory $private_tempstore,