From cfafb8735aecf7b04d75ab18aa65f326672a31d6 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 6 Jul 2021 16:40:04 +0100
Subject: [PATCH] Issue #3222168 by hmendes, kriboogh, longwave, pookmish:
Replace \GuzzleHttp\Client with \GuzzleHttp\ClientInterface
---
.../modules/migrate/src/Plugin/migrate/process/Download.php | 6 +++---
.../src/SecurityAdvisories/SecurityAdvisoriesFetcher.php | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Download.php b/core/modules/migrate/src/Plugin/migrate/process/Download.php
index 60770d81d117..af7ca4070b17 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Download.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Download.php
@@ -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' => [],
];
diff --git a/core/modules/system/src/SecurityAdvisories/SecurityAdvisoriesFetcher.php b/core/modules/system/src/SecurityAdvisories/SecurityAdvisoriesFetcher.php
index 486ea5783f08..b8b0a5323692 100644
--- a/core/modules/system/src/SecurityAdvisories/SecurityAdvisoriesFetcher.php
+++ b/core/modules/system/src/SecurityAdvisories/SecurityAdvisoriesFetcher.php
@@ -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;
--
GitLab