chore(http-client): update PSR discovery package to psr-discovery/http-client-implementations and psr-discovery/http-factory-implementations

Author: aidan-casey

composer.json

@@ -22,7 +22,8 @@
         "nikic/php-parser": "^5.3",
         "nunomaduro/collision": "^8.4",
         "php": "^8.3",
-        "php-http/discovery": "^1.19.2",
+        "psr-discovery/http-client-implementations": "1.x-dev",
+        "psr-discovery/http-factory-implementations": "1.x-dev",
         "psr/cache": "^3.0",
         "psr/clock": "^1.0.0",
         "psr/http-client": "^1.0.0",
@@ -43,7 +44,6 @@
         "illuminate/view": "~11.7.0",
         "jenssegers/blade": "^2.0",
         "nyholm/psr7": "^1.8",
-        "php-http/mock-client": "^1.6",
         "phpat/phpat": "^0.10.14",
         "phpstan/phpstan": "^1.10.0",
         "phpunit/phpunit": "^11.3.5",
@@ -134,11 +134,6 @@
     "bin": [
         "src/Tempest/Console/bin/tempest"
     ],
-    "config": {
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
-    },
     "scripts": {
         "phpunit": "vendor/bin/phpunit --display-warnings --display-skipped --display-deprecations --display-errors --display-notices",
         "coverage": "vendor/bin/phpunit --coverage-html build/reports/html --coverage-clover build/reports/clover.xml",

src/Tempest/HttpClient/.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_send_request_proxies_to_http_client":0.003,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_get_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_get_with_headers_proxies_to_http_client_with_headers":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_head_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_post_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_trace_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_put_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_patch_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_delete_proxies_to_http_client":0,"Tempest\\HttpClient\\Tests\\GenericHttpClientTest::test_options_proxies_to_http_client":0}}

src/Tempest/HttpClient/composer.json

@@ -5,11 +5,12 @@
     "minimum-stability": "dev",
     "require": {
         "php": "^8.3",
-        "php-http/discovery": "^1.19.2",
         "psr/http-client": "^1.0.0",
         "psr/http-message": "^1.0|^2.0",
         "tempest/container": "dev-main",
-        "tempest/http": "dev-main"
+        "tempest/http": "dev-main",
+        "psr-discovery/http-factory-implementations": "1.x-dev",
+        "psr-discovery/http-client-implementations": "1.x-dev"
     },
     "require-dev": {
         "aidan-casey/mock-client": "dev-master",
@@ -24,10 +25,5 @@
         "psr-4": {
             "Tempest\\HttpClient\\Tests\\": "tests"
         }
-    },
-    "config": {
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
     }
 }

src/Tempest/HttpClient/src/HttpClientDriverInitializer.php

@@ -4,9 +4,8 @@
 
 namespace Tempest\HttpClient;
 
-use Http\Discovery\Psr17FactoryDiscovery;
-use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
+use PsrDiscovery\Discover;
 use Tempest\Container\Container;
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
@@ -18,10 +17,10 @@ final class HttpClientDriverInitializer implements Initializer
     public function initialize(Container $container): HttpClientDriver|ClientInterface
     {
         return new Psr18Driver(
-            client: Psr18ClientDiscovery::find(),
-            uriFactory: Psr17FactoryDiscovery::findUriFactory(),
-            requestFactory: Psr17FactoryDiscovery::findRequestFactory(),
-            streamFactory: Psr17FactoryDiscovery::findStreamFactory()
+            client: Discover::httpClient(),
+            uriFactory: Discover::httpUriFactory(),
+            requestFactory: Discover::httpRequestFactory(),
+            streamFactory: Discover::httpStreamFactory(),
         );
     }
 }