\Drupal calls should be avoided in classes

Hi,

I reviewed MR !7.
It successfully fixes the phpstan errors, the gitlab ci pipeline passes.
The changes are following the dependency injection.
Looks good to me.

Moving to RTBC.

I just merged in another MR. Can someone address the merge conflicts and any new PHPStan errors?

Thanks.

Conflicts fixed. Please review again.

When attempting to apply this against 2.0.x-dev, this is failing to apply for me in:

settings.php

--- src/Form/Settings.php
+++ src/Form/Settings.php
@@ -30,8 +30,10 @@ class Settings extends ConfigFormBase {
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   Date Formatter.
    */
-  public function __construct(ConfigFactoryInterface $config_factory,
-                              DateFormatterInterface $date_formatter) {
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    DateFormatterInterface $date_formatter,
+  ) {
     parent::__construct($config_factory);
     $this->dateFormatter = $date_formatter;
   }

and EloquaApiClient.php.

--- src/Service/EloquaApiClient.php
+++ src/Service/EloquaApiClient.php
@@ -70,16 +77,22 @@ class EloquaApiClient {
    *   A Guzzle client object.
    * @param \Drupal\Component\Datetime\TimeInterface $time
    *   Time service.
+   * @param \Drupal\eloqua_api_redux\Service\EloquaAuthFallbackInterface $authFallbackDefault
+   *   Eloqua auth fallback service.
    */
-  public function __construct(ConfigFactory $config,
-                              LoggerChannelFactoryInterface $loggerFactory,
-                              ClientFactory $httpClientFactory,
-                              TimeInterface $time) {
+  public function __construct(
+    ConfigFactory $config,
+    LoggerChannelFactoryInterface $loggerFactory,
+    ClientFactory $httpClientFactory,
+    TimeInterface $time,
+    EloquaAuthFallbackInterface $authFallbackDefault,
+  ) {
     $this->config = $config->get('eloqua_api_redux.settings');
     $this->configTokens = $config->getEditable('eloqua_api_redux.tokens');
     $this->loggerFactory = $loggerFactory;
     $this->httpClientFactory = $httpClientFactory;
     $this->time = $time;
+    $this->authFallbackDefault = $authFallbackDefault;
   }
 
   /**

I applied the diff and this merges cleanly.
GitLab pipeline is still passing.

Thanks @erindarri, @diwakar07

Automatically closed - issue fixed for 2 weeks with no activity.