Use regex as buffer + tests + isset check

symfony · Jul 18, 2019 · f4ddd10 · f4ddd10
1 parent 950166d
commit f4ddd10
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 20 deletions.
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -287,8 +287,8 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
             // Regular header line: add it to the list
 
             self::addResponseHeaders([substr($data, 0, -2)], $info, $headers);
-            if (\array_key_exists('content-type', $headers)) {
-                self::handleContentType($content, $headers['content-type'][0]);
+            if (isset($headers['content-type'], $options['buffer']) && is_string($options['buffer'])) {
+                self::handleContentType($content, $headers['content-type'][0], $options['buffer']);
             }
 
             if (0 !== strpos($data, 'HTTP/')) {

diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
@@ -35,6 +35,7 @@ final class NativeResponse implements ResponseInterface
     private $inflate;
     private $multi;
     private $debugBuffer;
+    private $bufferRegex;
 
     /**
      * @internal
@@ -51,6 +52,7 @@ public function __construct(NativeClientState $multi, $context, string $url, $op
         $this->resolveRedirect = $resolveRedirect;
         $this->onProgress = $onProgress;
         $this->content = $options['buffer'] ? fopen('php://temp', 'w+') : null;
+        $this->bufferRegex = isset($options['buffer']) && is_string($options['buffer']) ? $options['buffer'] : null;
 
         // Temporary resources to dechunk/inflate the response stream
         $this->buffer = fopen('php://temp', 'w+');
@@ -130,8 +132,8 @@ private function open(): void
                 // Send request and follow redirects when needed
                 $this->handle = $h = fopen($url, 'r', false, $this->context);
                 self::addResponseHeaders($http_response_header, $this->info, $this->headers, $this->info['debug']);
-                if (\array_key_exists('content-type', $this->headers)) {
-                    self::handleContentType($this->content, $this->headers['content-type'][0]);
+                if (null !== $this->bufferRegex && isset($this->headers['content-type'])) {
+                    self::handleContentType($this->content, $this->headers['content-type'][0], $this->bufferRegex);
                 }
 
                 $url = ($this->resolveRedirect)($this->multi, $this->headers['location'][0] ?? null, $this->context);

diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -244,11 +244,10 @@ private static function addResponseHeaders(array $responseHeaders, array &$info,
         }
     }
 
-    private static function handleContentType(&$content, string $contentType)
+    private static function handleContentType(&$content, string $contentType, string $bufferRegex): void
     {
         $contentType = substr($contentType, 0, strpos($contentType, ';'));
-        if (1 === preg_match('/(text\/[a-z]+|[a-z]+\/(json|xml)$)/', $contentType) && null === $content) {
-            $options['buffer'] = true;
+        if (null === $content && preg_match($bufferRegex, $contentType)) {
             $content = fopen('php://temp', 'w+');
         }
     }

diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -13,6 +13,8 @@
 
 use Psr\Log\AbstractLogger;
 use Symfony\Component\HttpClient\CurlHttpClient;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -72,34 +74,48 @@ public function log($level, $message, array $context = [])
         $this->assertSame($expected, $logger->logs);
     }
 
-    public function testBufferForJson(): void
+    public function testJsonRegexBuffer(): void
     {
-        $client = new CurlHttpClient(['buffer' => false]);
-        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/posts');
+        $client = new CurlHttpClient(['buffer' => '/([a-z]+\/json$)/']);
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
+
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
+
+        $this->assertSame($firstContent, $secondContent);
+    }
+
+    public function testPdfRegexBuffer(): void
+    {
+        $client = new CurlHttpClient(['buffer' => '/application\/pdf$/']);
+        $response = $client->request('GET', 'http://s2.q4cdn.com/235752014/files/doc_downloads/test.pdf');
+
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
 
-        $this->assertSame($response->getContent(false), $response->getContent(false));
+        $this->assertSame($firstContent, $secondContent);
     }
 
     /**
      * @expectedException \Symfony\Component\HttpClient\Exception\TransportException
      */
-    public function testBufferForImagesWithFalseBuffer(): void
+    public function testFalseBuffer(): void
     {
         $client = new CurlHttpClient(['buffer' => false]);
-        $response = $client->request('GET', 'http://s2.q4cdn.com/235752014/files/doc_downloads/test.pdf');
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
 
-        $pdf = $response->getContent(false);
-        $secondPdf = $response->getContent(false);
+        $firstPosts = $response->getContent();
+        $secondPosts = $response->getContent();
     }
 
-    public function testBufferForImagesWithTrueBuffer(): void
+    public function testTrueBuffer(): void
     {
         $client = new CurlHttpClient(['buffer' => true]);
-        $response = $client->request('GET', 'http://s2.q4cdn.com/235752014/files/doc_downloads/test.pdf');
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
 
-        $pdf = $response->getContent(false);
-        $secondPdf = $response->getContent(false);
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
 
-        $this->assertSame($pdf, $secondPdf);
+        $this->assertSame($firstContent, $secondContent);
     }
 }
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -122,6 +122,9 @@ protected function getHttpClient(string $testCase): HttpClientInterface
             case 'testUncheckedTimeoutThrows':
                 $body = ['<1>', '', '<2>'];
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);
+                break;
+            case 'testBufferRegex':
+
                 break;
         }
 

diff --git a/src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php
@@ -20,4 +20,49 @@ protected function getHttpClient(string $testCase): HttpClientInterface
     {
         return new NativeHttpClient();
     }
+
+    public function testJsonRegexBuffer(): void
+    {
+        $client = new NativeHttpClient(['buffer' => '/([a-z]+\/json$)/']);
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
+
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
+
+        $this->assertSame($firstContent, $secondContent);
+    }
+
+    public function testPdfRegexBuffer(): void
+    {
+        $client = new NativeHttpClient(['buffer' => '/application\/pdf$/']);
+        $response = $client->request('GET', 'http://s2.q4cdn.com/235752014/files/doc_downloads/test.pdf');
+
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
+
+        $this->assertSame($firstContent, $secondContent);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\HttpClient\Exception\TransportException
+     */
+    public function testFalseBuffer(): void
+    {
+        $client = new NativeHttpClient(['buffer' => false]);
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
+
+        $firstPosts = $response->getContent();
+        $secondPosts = $response->getContent();
+    }
+
+    public function testTrueBuffer(): void
+    {
+        $client = new NativeHttpClient(['buffer' => true]);
+        $response = $client->request('GET', 'https://jsonplaceholder.typicode.com/users');
+
+        $firstContent = $response->getContent();
+        $secondContent = $response->getContent();
+
+        $this->assertSame($firstContent, $secondContent);
+    }
 }