Merge pull request #216 from phil-davis/remove-hhvm

Remove HHVM special comments and test code
sabre-io · Aug 17, 2023 · dc50bc9 · dc50bc9
2 parents 6a88b28 + 24173c3
commit dc50bc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 37 deletions.
diff --git a/lib/Client.php b/lib/Client.php
@@ -410,11 +410,9 @@ protected function createCurlSettingsArray(RequestInterface $request): array
             $settings[CURLOPT_HTTPHEADER] = $nHeaders;
         }
         $settings[CURLOPT_URL] = $request->getUrl();
-        // FIXME: CURLOPT_PROTOCOLS is currently unsupported by HHVM
         if (defined('CURLOPT_PROTOCOLS')) {
             $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
         }
-        // FIXME: CURLOPT_REDIR_PROTOCOLS is currently unsupported by HHVM
         if (defined('CURLOPT_REDIR_PROTOCOLS')) {
             $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
         }

diff --git a/tests/HTTP/ClientTest.php b/tests/HTTP/ClientTest.php
@@ -22,15 +22,10 @@ public function testCreateCurlSettingsArrayGET(): void
                 CURLOPT_URL => 'http://example.org/',
                 CURLOPT_CUSTOMREQUEST => 'GET',
                 CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+                CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
+                CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
             ];
 
-        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
-        // at least if this unit test fails in the future we know it is :)
-        if (false === defined('HHVM_VERSION')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
         self::assertEquals($settings, $client->createCurlSettingsArray($request));
     }
 
@@ -74,15 +69,10 @@ public function testCreateCurlSettingsArrayHEAD(): void
                 CURLOPT_HTTPHEADER => ['X-Foo: bar'],
                 CURLOPT_URL => 'http://example.org/',
                 CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+                CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
+                CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
             ];
 
-        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
-        // at least if this unit test fails in the future we know it is :)
-        if (false === defined('HHVM_VERSION')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
         self::assertEquals($settings, $client->createCurlSettingsArray($request));
     }
 
@@ -107,15 +97,10 @@ public function testCreateCurlSettingsArrayGETAfterHEAD(): void
                 CURLOPT_NOBODY => false,
                 CURLOPT_URL => 'http://example.org/',
                 CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+                CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
+                CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
             ];
 
-        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
-        // at least if this unit test fails in the future we know it is :)
-        if (false === defined('HHVM_VERSION')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
         self::assertEquals($settings, $client->createCurlSettingsArray($request));
     }
 
@@ -139,15 +124,10 @@ public function testCreateCurlSettingsArrayPUTStream(): void
                 CURLOPT_HTTPHEADER => ['X-Foo: bar'],
                 CURLOPT_URL => 'http://example.org/',
                 CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+                CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
+                CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
             ];
 
-        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
-        // at least if this unit test fails in the future we know it is :)
-        if (false === defined('HHVM_VERSION')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
         self::assertEquals($settings, $client->createCurlSettingsArray($request));
     }
 
@@ -165,15 +145,10 @@ public function testCreateCurlSettingsArrayPUTString(): void
                 CURLOPT_HTTPHEADER => ['X-Foo: bar'],
                 CURLOPT_URL => 'http://example.org/',
                 CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+                CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
+                CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
             ];
 
-        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
-        // at least if this unit test fails in the future we know it is :)
-        if (false === defined('HHVM_VERSION')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
         self::assertEquals($settings, $client->createCurlSettingsArray($request));
     }