From 09f858a0ddfabfed10df358c83ef460181c79e54 Mon Sep 17 00:00:00 2001
From: Ivan Kurnosov <ivan@wialus.co.nz>
Date: Thu, 20 Apr 2023 09:03:09 +1200
Subject: [PATCH 1/4] Deprecated HttpClient service, added ClientInterface

Fixes #425
---
 CHANGELOG.md                      | 5 +++++
 src/Resources/config/services.xml | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb493b6c..8906444d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+# unreleased
+
+- Marked `Http\Client\HttpClient` service as deprecated (#425).
+- Added `Psr\Http\Client\ClientInterface` service (#425).
+
 # 1.27.1 - 2023-03-03
 
 - Added `: void` to `Collector::reset` to avoid PHP warning.
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index a839d134..1fe4f9cd 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -47,7 +47,10 @@
         <service id="httplug.client.default" class="Http\Client\HttpClient">
             <factory class="Http\Discovery\HttpClientDiscovery" method="find" />
         </service>
-        <service id="Http\Client\HttpClient" alias="httplug.client" public="false" />
+        <service id="Http\Client\HttpClient" alias="httplug.client" public="false">
+            <deprecated />
+        </service>
+        <service id="Psr\Http\Client\ClientInterface" alias="httplug.client" public="false" />
 
         <!-- Discovery for PSR-18 -->
         <service id="httplug.psr18_client.default" class="Psr\Http\Client\ClientInterface">

From d6bb040a601880a14c866ff2de1ccd7c0a29bda7 Mon Sep 17 00:00:00 2001
From: David Buchmann <david@liip.ch>
Date: Thu, 20 Apr 2023 08:21:46 +0200
Subject: [PATCH 2/4] Apply suggestions from code review

---
 CHANGELOG.md                      | 2 +-
 src/Resources/config/services.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8906444d..d3c1f1c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 # unreleased
 
-- Marked `Http\Client\HttpClient` service as deprecated (#425).
+- Deprecated `Http\Client\HttpClient` in favor of `Psr\Http\Client\ClientInterface` (#425).
 - Added `Psr\Http\Client\ClientInterface` service (#425).
 
 # 1.27.1 - 2023-03-03
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 1fe4f9cd..83e10612 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -48,7 +48,7 @@
             <factory class="Http\Discovery\HttpClientDiscovery" method="find" />
         </service>
         <service id="Http\Client\HttpClient" alias="httplug.client" public="false">
-            <deprecated />
+            <deprecated version="1.28" />
         </service>
         <service id="Psr\Http\Client\ClientInterface" alias="httplug.client" public="false" />
 

From 3c6f40c65b6b3ad40e9fe77f52b6033b91173f04 Mon Sep 17 00:00:00 2001
From: David Buchmann <david@liip.ch>
Date: Thu, 20 Apr 2023 08:45:36 +0200
Subject: [PATCH 3/4] Update src/Resources/config/services.xml

---
 src/Resources/config/services.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 83e10612..bc76b6b0 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -48,7 +48,7 @@
             <factory class="Http\Discovery\HttpClientDiscovery" method="find" />
         </service>
         <service id="Http\Client\HttpClient" alias="httplug.client" public="false">
-            <deprecated version="1.28" />
+            <deprecated package="php-http/httplug-bundle" version="1.28" message="deprecated in favor of PSR-7 ClientInterface" />
         </service>
         <service id="Psr\Http\Client\ClientInterface" alias="httplug.client" public="false" />
 

From 8c7af0a4a4f4bfe8614e0e4eb39b48e5f9b0b0a4 Mon Sep 17 00:00:00 2001
From: David Buchmann <david@liip.ch>
Date: Thu, 20 Apr 2023 08:59:42 +0200
Subject: [PATCH 4/4] Update src/Resources/config/services.xml

---
 src/Resources/config/services.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index bc76b6b0..fbc7775b 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -48,7 +48,7 @@
             <factory class="Http\Discovery\HttpClientDiscovery" method="find" />
         </service>
         <service id="Http\Client\HttpClient" alias="httplug.client" public="false">
-            <deprecated package="php-http/httplug-bundle" version="1.28" message="deprecated in favor of PSR-7 ClientInterface" />
+            <deprecated package="php-http/httplug-bundle" version="1.28" />
         </service>
         <service id="Psr\Http\Client\ClientInterface" alias="httplug.client" public="false" />