[HttpClient] fix bufferRegex declaration

rjwebdev · rjwebdev · commit 917a8d98c2a6 · 2019-07-25T22:44:24.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -44,10 +44,6 @@ 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
@@ -70,7 +70,7 @@ public function __construct(CurlClientState $multi, $ch, array $options = null,
                 rewind($content);
                 $multi->handlesActivity[$id][] = stream_get_contents($content);
             }
-            $content = isset($options['buffer']) && true === $options['buffer'] ? $content : null;
+            $content = ($options['buffer'] ?? true) && !\is_string($options['buffer'] ?? true) ? $content : null;
         }
 
         curl_setopt($ch, CURLOPT_HEADERFUNCTION, static function ($ch, string $data) use (&$info, &$headers, $options, $multi, $id, &$location, $resolveRedirect, $logger, &$content): int {
@@ -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'] ?? null) && null === $content) {
+            if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'] ?? 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
@@ -52,7 +52,7 @@ public function __construct(NativeClientState $multi, $context, string $url, $op
         $this->resolveRedirect = $resolveRedirect;
         $this->onProgress = $onProgress;
         $this->content = ($options['buffer'] ?? true) && !\is_string($options['buffer'] ?? true) ? fopen('php://temp', 'w+') : null;
-        $this->bufferRegex = \is_string($options['buffer'] ?? null);
+        $this->bufferRegex = \is_string($options['buffer'] ?? null) ? $options['buffer'] : null;
 
         // Temporary resources to dechunk/inflate the response stream
         $this->buffer = fopen('php://temp', 'w+');
@@ -154,7 +154,7 @@ private function open(): void
         stream_set_blocking($h, false);
         $this->context = $this->resolveRedirect = null;
 
-        if ($this->bufferRegex && isset($this->headers['content-type']) && null === $this->content) {
+        if (null !== $this->bufferRegex && isset($this->headers['content-type']) && null === $this->content) {
             $this->content = self::createBufferForContentType($this->headers['content-type'][0], $this->bufferRegex);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,6 @@ 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`		`-// }`
`51`	`47`	`}`
`52`	`48`
`53`	`49`	`if (isset($options['json'])) {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function __construct(CurlClientState $multi, $ch, array $options = null,`
`70`	`70`	`rewind($content);`
`71`	`71`	`$multi->handlesActivity[$id][] = stream_get_contents($content);`
`72`	`72`	`}`
`73`		`- $content = isset($options['buffer']) && true === $options['buffer'] ? $content : null;`
	`73`	`+ $content = ($options['buffer'] ?? true) && !\is_string($options['buffer'] ?? true) ? $content : null;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`curl_setopt($ch, CURLOPT_HEADERFUNCTION, static function ($ch, string $data) use (&$info, &$headers, $options, $multi, $id, &$location, $resolveRedirect, $logger, &$content): int {`
`@@ -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'] ?? null) && null === $content) {`
	`348`	`+ if (isset($headers['content-type'], $options['buffer']) && \is_string($options['buffer'] ?? null) && !$content) {`
`349`	`349`	`$content = self::createBufferForContentType($headers['content-type'][0], $options['buffer']);`
`350`	`350`	`}`
`351`	`351`