Merge pull request #454 from BoShurik/http-client-symfony

Better file upload support in symfony/http-client

Author: BoShurik

.github/workflows/tests.yaml

@@ -61,7 +61,7 @@ jobs:
 
  -
  name: Remove http client dependencies
- run: composer remove psr/http-client psr/http-factory php-http/multipart-stream-builder symfony/http-client guzzlehttp/guzzle --dev --no-update
+ run: composer remove psr/http-client psr/http-factory php-http/multipart-stream-builder symfony/http-client symfony/mime guzzlehttp/guzzle --dev --no-update
 
  -
  name: Install dependencies with composer

composer.json

@@ -30,14 +30,16 @@
  "psr/http-factory": "^1.0",
  "php-http/multipart-stream-builder": "^1.0",
  "symfony/http-client": "^4.3 | ^5.0 | ^6.0",
+ "symfony/mime": "^4.3 | ^5.0 | ^6.0",
  "guzzlehttp/guzzle": "^7.0"
  },
  "suggest": {
  "psr/http-client": "To use psr/http-client",
  "psr/http-factory": "To use psr/http-client",
  "php-http/multipart-stream-builder": "To use psr/http-client",
- "guzzlehttp/guzzle": "To use psr/http-client",
- "symfony/http-client": "To use symfony/http-client"
+ "guzzlehttp/guzzle": "To use guzzlehttp/guzzle psr implementation",
+ "symfony/http-client": "To use symfony/http-client",
+ "symfony/mime": "To use symfony/http-client"
  },
  "autoload": {
  "psr-4": {

src/Http/SymfonyHttpClient.php

@@ -2,6 +2,8 @@
 
 namespace TelegramBot\Api\Http;
 
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\Part\Multipart\FormDataPart;
 use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface as SymfonyHttpClientInterface;
 use TelegramBot\Api\HttpException;
@@ -26,13 +28,19 @@ protected function doRequest($url, array $data = null)
  $options = [];
  if ($data) {
  $method = 'POST';
+
+ $data = array_filter($data);
  foreach ($data as &$value) {
  if ($value instanceof \CURLFile) {
- $value = fopen($value->getFilename(), 'r');
+ $value = DataPart::fromPath($value->getFilename());
+ } elseif (!\is_string($value) && !\is_array($value)) {
+ $value = (string) $value;
  }
  }
+ $formData = new FormDataPart($data);
 
- $options['body'] = $data;
+ $options['headers'] = $formData->getPreparedHeaders()->toArray();
+ $options['body'] = $formData->toIterable();
  } else {
  $method = 'GET';
  }