fix: PSR requests not setting headers or body correctly

Author: joelbutcher

composer.json

@@ -21,15 +21,17 @@
         "php": "^7.3 || ^8.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.0",
+        "php-http/httplug": "^2.4",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0|^2.0"
+        "psr/http-message": "^1.0|^2.0",
+        "symfony/http-client": "^7.2"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^2.0",
         "mockery/mockery": "^1.0",
-        "php-http/guzzle7-adapter": "^1.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3",
+        "symfony/var-dumper": "^7.2"
     },
     "autoload": {
         "psr-4": {

src/Client.php

@@ -24,9 +24,9 @@
 namespace Facebook;
 
 use Facebook\Exception\SDKException;
-use Http\Client\HttpClient;
-use Http\Discovery\HttpClientDiscovery;
 use Http\Discovery\Psr17FactoryDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 
 class Client
 {
@@ -83,31 +83,31 @@ class Client
     /**
      * Instantiates a new Client object.
      *
-     * @param null|HttpClient $httpClient
+     * @param null|ClientInterface $httpClient
      * @param bool            $enableBeta
      */
-    public function __construct(HttpClient $httpClient = null, $enableBeta = false)
+    public function __construct(ClientInterface $httpClient = null, $enableBeta = false)
     {
-        $this->httpClient = $httpClient ?: HttpClientDiscovery::find();
+        $this->httpClient = $httpClient ?: Psr18ClientDiscovery::find();
         $this->enableBetaMode = $enableBeta;
     }
 
     /**
      * Sets the HTTP client handler.
      *
-     * @param HttpClient $httpClient
+     * @param ClientInterface $httpClient
      */
-    public function setHttpClient(HttpClient $httpClient)
+    public function setClientInterface(ClientInterface $httpClient)
     {
         $this->httpClient = $httpClient;
     }
 
     /**
      * Returns the HTTP client handler.
      *
-     * @return HttpClient
+     * @return ClientInterface
      */
-    public function getHttpClient()
+    public function getClientInterface()
     {
         return $this->httpClient;
     }
@@ -186,11 +186,17 @@ public function sendRequest(Request $request)
             $request->validateAccessToken();
         }
 
-        list($url, $method, $headers, $body) = $this->prepareRequestMessage($request);
+        [$url, $method, $headers, $body] = $this->prepareRequestMessage($request);
 
-        $psr7Response = $this->httpClient->sendRequest(
-            Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $url, $headers, $body)
-        );
+        $psrRequest = Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $url, $headers, $body)
+            ->withBody(Psr17FactoryDiscovery::findStreamFactory()->createStream($body));
+
+        foreach ($headers as $headerKey => $headerValue) {
+            $psrRequest->withHeader($headerKey, $headerValue);
+        }
+
+
+        $psr7Response = $this->httpClient->sendRequest($psrRequest);
 
         static::$requestCount++;
 

src/Facebook.php

@@ -39,7 +39,7 @@
 use Facebook\PersistentData\PersistentDataInterface;
 use Facebook\Url\UrlDetectionHandler;
 use Facebook\Url\UrlDetectionInterface;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 
 class Facebook
 {
@@ -123,7 +123,7 @@ public function __construct(array $config = [])
         if (!$config['app_secret']) {
             throw new SDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "'.static::APP_SECRET_ENV_NAME.'"');
         }
-        if ($config['http_client'] !== null && !$config['http_client'] instanceof HttpClient) {
+        if ($config['http_client'] !== null && !$config['http_client'] instanceof ClientInterface) {
             throw new \InvalidArgumentException('Required "http_client" key to be null or an instance of \Http\Client\HttpClient');
         }
         if (!$config['default_graph_version']) {

tests/ClientTest.php

@@ -36,8 +36,8 @@
 use Facebook\Response;
 use Facebook\Tests\Fixtures\MyFooBatchHttpClient;
 use Facebook\Tests\Fixtures\MyFooHttpClient;
-use Http\Client\HttpClient;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Client\ClientInterface;
 
 class ClientTest extends TestCase
 {
@@ -71,17 +71,17 @@ public function testACustomHttpClientCanBeInjected()
     {
         $handler = new MyFooHttpClient();
         $client = new Client($handler);
-        $httpClient = $client->getHttpClient();
+        $httpClient = $client->getClientInterface();
 
         $this->assertInstanceOf(MyFooHttpClient::class, $httpClient);
     }
 
     public function testTheHttpClientWillFallbackToDefault()
     {
         $client = new Client();
-        $httpClient = $client->getHttpClient();
+        $httpClient = $client->getClientInterface();
 
-        $this->assertInstanceOf(HttpClient::class, $httpClient);
+        $this->assertInstanceOf(ClientInterface::class, $httpClient);
     }
 
     public function testBetaModeCanBeDisabledOrEnabledViaConstructor()
@@ -160,7 +160,7 @@ public function testABatchRequestWillProperlyBatchFiles()
         $fbBatchRequest = new BatchRequest($this->fbApp, $fbRequests);
         $fbBatchRequest->prepareRequestsForBatch();
 
-        list($url, $method, $headers, $body) = $this->fbClient->prepareRequestMessage($fbBatchRequest);
+        [$url, $method, $headers, $body] = $this->fbClient->prepareRequestMessage($fbBatchRequest);
 
         $this->assertEquals(Client::BASE_GRAPH_VIDEO_URL, $url);
         $this->assertEquals('POST', $method);

tests/FacebookTest.php

@@ -224,7 +224,7 @@ public function testCanInjectCustomHandlers()
 
         $this->assertInstanceOf(
             FooHttpClientInterface::class,
-            $fb->getClient()->getHttpClient()
+            $fb->getClient()->getClientInterface()
         );
         $this->assertInstanceOf(
             FooPersistentDataInterface::class,

tests/Fixtures/FakeGraphApiForResumableUpload.php

@@ -24,11 +24,11 @@
 namespace Facebook\Tests\Fixtures;
 
 use GuzzleHttp\Psr7\Response;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class FakeGraphApiForResumableUpload implements HttpClient
+class FakeGraphApiForResumableUpload implements ClientInterface
 {
     public $transferCount = 0;
     private $respondWith = 'SUCCESS';

tests/Fixtures/FooHttpClientInterface.php

@@ -24,11 +24,11 @@
 namespace Facebook\Tests\Fixtures;
 
 use GuzzleHttp\Psr7\Response;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class FooHttpClientInterface implements HttpClient
+class FooHttpClientInterface implements ClientInterface
 {
     public function sendRequest(RequestInterface $request): ResponseInterface
     {

tests/Fixtures/MyFooBatchHttpClient.php

@@ -24,11 +24,11 @@
 namespace Facebook\Tests\Fixtures;
 
 use GuzzleHttp\Psr7\Response;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class MyFooBatchHttpClient implements HttpClient
+class MyFooBatchHttpClient implements ClientInterface
 {
     public function sendRequest(RequestInterface $request): ResponseInterface
     {

tests/Fixtures/MyFooHttpClient.php

@@ -24,11 +24,11 @@
 namespace Facebook\Tests\Fixtures;
 
 use GuzzleHttp\Psr7\Response;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class MyFooHttpClient implements HttpClient
+class MyFooHttpClient implements ClientInterface
 {
     public function sendRequest(RequestInterface $request): ResponseInterface
     {