Unverified Commit cfafb873 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3222168 by hmendes, kriboogh, longwave, pookmish: Replace... 

Issue #3222168 by hmendes, kriboogh, longwave, pookmish: Replace \GuzzleHttp\Client with \GuzzleHttp\ClientInterface
parent 12aec14a

core/modules/migrate/src/Plugin/migrate/process/Download.php

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
use Drupal\migrate\MigrateException;

use Drupal\migrate\MigrateExecutableInterface;

use Drupal\migrate\Row;

use GuzzleHttp\Client;

use GuzzleHttp\ClientInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;



/**
@@ -83,10 +83,10 @@ class Download extends FileProcessBase implements ContainerFactoryPluginInterfac 
   *   The plugin definition.

   * @param \Drupal\Core\File\FileSystemInterface $file_system

   *   The file system service.

   * @param \GuzzleHttp\Client $http_client

   * @param \GuzzleHttp\ClientInterface $http_client

   *   The HTTP client.

   */

  public function __construct(array $configuration, $plugin_id, array $plugin_definition, FileSystemInterface $file_system, Client $http_client) {

  public function __construct(array $configuration, $plugin_id, array $plugin_definition, FileSystemInterface $file_system, ClientInterface $http_client) {

    $configuration += [

      'guzzle_options' => [],

    ];

core/modules/system/src/SecurityAdvisories/SecurityAdvisoriesFetcher.php

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
use Drupal\Core\Site\Settings;

use Drupal\Core\Utility\ProjectInfo;

use Drupal\Core\Extension\ExtensionVersion;

use GuzzleHttp\Client;

use GuzzleHttp\ClientInterface;

use GuzzleHttp\Exception\TransferException;

use GuzzleHttp\RequestOptions;

use Psr\Log\LoggerInterface;
@@ -75,7 +75,7 @@ final class SecurityAdvisoriesFetcher { 
   *   The config factory.

   * @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface $key_value_factory

   *   The expirable key/value factory.

   * @param \GuzzleHttp\Client $client

   * @param \GuzzleHttp\ClientInterface $client

   *   The HTTP client.

   * @param \Drupal\Core\Extension\ModuleExtensionList $module_list

   *   The module extension list.
@@ -88,7 +88,7 @@ final class SecurityAdvisoriesFetcher { 
   * @param \Drupal\Core\Site\Settings $settings

   *   The settings instance.

   */

  public function __construct(ConfigFactoryInterface $config_factory, KeyValueExpirableFactoryInterface $key_value_factory, Client $client, ModuleExtensionList $module_list, ThemeExtensionList $theme_list, ProfileExtensionList $profile_list, LoggerInterface $logger, Settings $settings) {

  public function __construct(ConfigFactoryInterface $config_factory, KeyValueExpirableFactoryInterface $key_value_factory, ClientInterface $client, ModuleExtensionList $module_list, ThemeExtensionList $theme_list, ProfileExtensionList $profile_list, LoggerInterface $logger, Settings $settings) {

    $this->config = $config_factory->get('system.advisories');

    $this->keyValueExpirable = $key_value_factory->get('system');

    $this->httpClient = $client;