minor #31308 [HttpClient] fix skipping h2push test case (nicolas-grekas)

fabpot · fabpot · commit 002b48dfc3ae · 2019-04-29T08:25:19.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [HttpClient] fix skipping h2push test case | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30975 | License | MIT | Doc PR | - Commits ------- 3aaa742 [HttpClient] fix skipping h2push test case
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -28,16 +28,15 @@ protected function getHttpClient(string $testCase): HttpClientInterface
 
     /**
      * @requires PHP 7.2.17
-     * @requires extension curl 7.61
      */
     public function testHttp2Push()
     {
         if (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304) {
             $this->markTestSkipped('PHP 7.3.0 to 7.3.3 don\'t support HTTP/2 PUSH');
         }
 
-        if (!\defined('CURLMOPT_PUSHFUNCTION') || !(CURL_VERSION_HTTP2 & curl_version()['features'])) {
-            $this->markTestSkipped('curl is not compiled with support for HTTP/2 PUSH');
+        if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > ($v = curl_version())['version_number'] || !(CURL_VERSION_HTTP2 & $v['features'])) {
+            $this->markTestSkipped('curl <7.61 is used or it is not compiled with support for HTTP/2 PUSH');
         }
 
         $logger = new class() extends AbstractLogger {

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,15 @@ protected function getHttpClient(string $testCase): HttpClientInterface`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* @requires PHP 7.2.17`
`31`		`- * @requires extension curl 7.61`
`32`	`31`	`*/`
`33`	`32`	`public function testHttp2Push()`
`34`	`33`	`{`
`35`	`34`	`if (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304) {`
`36`	`35`	`$this->markTestSkipped('PHP 7.3.0 to 7.3.3 don\'t support HTTP/2 PUSH');`
`37`	`36`	`}`
`38`	`37`
`39`		`- if (!\defined('CURLMOPT_PUSHFUNCTION') \|\| !(CURL_VERSION_HTTP2 & curl_version()['features'])) {`
`40`		`- $this->markTestSkipped('curl is not compiled with support for HTTP/2 PUSH');`
	`38`	`+ if (!\defined('CURLMOPT_PUSHFUNCTION') \|\| 0x073d00 > ($v = curl_version())['version_number'] \|\| !(CURL_VERSION_HTTP2 & $v['features'])) {`
	`39`	`+ $this->markTestSkipped('curl <7.61 is used or it is not compiled with support for HTTP/2 PUSH');`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`$logger = new class() extends AbstractLogger {`