Commit 50a92d06 authored by Narendra Rajwar's avatar Narendra Rajwar Committed by João Ventura
Browse files

Issue #3310347 by narendra.rajwar27, lifedraft, dpi, jcnventura: The OpenID... 

Issue #3310347 by narendra.rajwar27, lifedraft, dpi, jcnventura: The OpenID Connect claims service should use ModuleHandler interface instead of the implementation
parent 4f02c4e7

src/OpenIDConnect.php

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ namespace Drupal\openid_connect; 
use Drupal\Core\Config\ConfigFactoryInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Entity\EntityFieldManagerInterface;

use Drupal\Core\Extension\ModuleHandler;

use Drupal\Core\Extension\ModuleHandlerInterface;

use Drupal\Core\File\FileSystemInterface;

use Drupal\Core\Logger\LoggerChannelFactoryInterface;

use Drupal\Core\Messenger\MessengerInterface;
@@ -75,7 +75,7 @@ class OpenIDConnect { 
  /**

   * The module handler.

   *

   * @var \Drupal\Core\Extension\ModuleHandler

   * @var \Drupal\Core\Extension\ModuleHandlerInterface

   */

  protected $moduleHandler;
@@ -119,7 +119,7 @@ class OpenIDConnect { 
   *   The email validator service.

   * @param \Drupal\Core\Messenger\MessengerInterface $messenger

   *   The messenger service.

   * @param \Drupal\Core\Extension\ModuleHandler $module_handler

   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler

   *   The module handler.

   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger

   *   A logger channel factory instance.
@@ -135,7 +135,7 @@ class OpenIDConnect { 
    UserDataInterface $user_data,

    EmailValidatorInterface $email_validator,

    MessengerInterface $messenger,

    ModuleHandler $module_handler,

    ModuleHandlerInterface $module_handler,

    LoggerChannelFactoryInterface $logger,

    FileSystemInterface $fileSystem

  ) {

src/OpenIDConnectClaims.php

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ namespace Drupal\openid_connect; 


use Drupal\Core\Config\ConfigFactory;

use Drupal\Core\DependencyInjection\ContainerInjectionInterface;

use Drupal\Core\Extension\ModuleHandler;

use Drupal\Core\Extension\ModuleHandlerInterface;

use Drupal\Core\StringTranslation\StringTranslationTrait;

use Drupal\openid_connect\Plugin\OpenIDConnectClientInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -50,12 +50,12 @@ class OpenIDConnectClaims implements ContainerInjectionInterface { 
   *

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

   *   The configuration factory.

   * @param \Drupal\Core\Extension\ModuleHandler $module_handler

   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler

   *   The module handler.

   */

  public function __construct(

    ConfigFactory $config_factory,

    ModuleHandler $module_handler

    ModuleHandlerInterface $module_handler

  ) {



    $this->configFactory = $config_factory;

tests/src/Unit/OpenIDConnectTest.php

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ namespace Drupal\Tests\openid_connect\Unit; 
use Drupal\Core\Config\ConfigFactoryInterface;

use Drupal\Core\Entity\EntityFieldManagerInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Extension\ModuleHandler;

use Drupal\Core\Extension\ModuleHandlerInterface;

use Drupal\Core\Logger\LoggerChannelFactoryInterface;

use Drupal\Core\Messenger\MessengerInterface;

use Drupal\Core\Session\AccountProxyInterface;
@@ -189,7 +189,7 @@ class OpenIDConnectTest extends UnitTestCase { 
      ->createMock(MessengerInterface::class);



    $this->moduleHandler = $this

      ->createMock(ModuleHandler::class);

      ->createMock(ModuleHandlerInterface::class);



    $this->logger = $this

      ->createMock(LoggerChannelFactoryInterface::class);

tests/src/Unit/OpenIdConnectClaimsTest.php

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ namespace Drupal\Tests\openid_connect\Unit; 
use Drupal\Core\Config\ConfigFactory;

use Drupal\Core\Config\ImmutableConfig;

use Drupal\Core\DependencyInjection\ContainerBuilder;

use Drupal\Core\Extension\ModuleHandler;

use Drupal\Core\Extension\ModuleHandlerInterface;

use Drupal\openid_connect\OpenIDConnectClaims;

use Drupal\Tests\UnitTestCase;
@@ -67,7 +67,7 @@ class OpenIdConnectClaimsTest extends UnitTestCase { 
    parent::setUp();



    $this->configFactory = $this->createMock(ConfigFactory::class);

    $this->moduleHandler = $this->createMock(ModuleHandler::class);

    $this->moduleHandler = $this->createMock(ModuleHandlerInterface::class);



    $this->container = new ContainerBuilder();