[HttpClient] change content and regex checks

rjwebdev · rjwebdev · commit 66c4079cd06c · 2019-07-24T20:31:42.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -44,6 +44,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         if (\is_string($options['buffer'] ?? null) && false === @preg_match($options['buffer'], '')) {
             throw new InvalidArgumentException('Option "buffer" should be a valid regular expression.');
+//            try {
+//                preg_match($options['buffer'], '');
+//            } catch (\Exception $exception) {
+//            }
         }
 
         if (isset($options['json'])) {
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -345,7 +345,7 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
                 return 0;
             }
 
-            if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'])) {
+            if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'] ?? null) && null === $content) {
                 $content = self::createBufferForContentType($headers['content-type'][0], $options['buffer']);
             }
 
diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
@@ -154,7 +154,7 @@ private function open(): void
         stream_set_blocking($h, false);
         $this->context = $this->resolveRedirect = null;
 
-        if (null !== $this->bufferRegex && isset($this->headers['content-type'])) {
+        if ($this->bufferRegex && isset($this->headers['content-type']) && null === $this->content) {
             $this->content = self::createBufferForContentType($this->headers['content-type'][0], $this->bufferRegex);
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient\Tests;
 
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;
 
 abstract class HttpClientTestCase extends BaseHttpClientTestCase
@@ -37,19 +38,18 @@ public function testJsonRegexBuffer(): void
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057', ['buffer' => '/([a-z]+\/json)/']);
-
         $firstContent = $response->getContent();
         $secondContent = $response->getContent();
 
         $this->assertSame($firstContent, $secondContent);
     }
 
-    /**
-     * @expectedException \Symfony\Component\HttpClient\Exception\InvalidArgumentException
-     */
     public function testInvalidRegexBuffer(): void
     {
         $client = $this->getHttpClient(__FUNCTION__);
+
+        $this->expectException(InvalidArgumentException::class);
+
         $response = $client->request('GET', 'http://localhost:8057', ['buffer' => '/([a-z]+\/json))/']);
 
         $firstPosts = $response->getContent();

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`44`	`44`
`45`	`45`	`if (\is_string($options['buffer'] ?? null) && false === @preg_match($options['buffer'], '')) {`
`46`	`46`	`throw new InvalidArgumentException('Option "buffer" should be a valid regular expression.');`
	`47`	`+// try {`
	`48`	`+// preg_match($options['buffer'], '');`
	`49`	`+// } catch (\Exception $exception) {`
	`50`	`+// }`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`if (isset($options['json'])) {`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &`
`345`	`345`	`return 0;`
`346`	`346`	`}`
`347`	`347`
`348`		`- if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'])) {`
	`348`	`+ if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'] ?? null) && null === $content) {`
`349`	`349`	`$content = self::createBufferForContentType($headers['content-type'][0], $options['buffer']);`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private function open(): void`
`154`	`154`	`stream_set_blocking($h, false);`
`155`	`155`	`$this->context = $this->resolveRedirect = null;`
`156`	`156`
`157`		`- if (null !== $this->bufferRegex && isset($this->headers['content-type'])) {`
	`157`	`+ if ($this->bufferRegex && isset($this->headers['content-type']) && null === $this->content) {`
`158`	`158`	`$this->content = self::createBufferForContentType($this->headers['content-type'][0], $this->bufferRegex);`
`159`	`159`	`}`
`160`	`160`