Skip all TLS tests on legacy HHVM

clue · clue · commit 8e2f1d7e35f4 · 2020-05-17T23:13:54.000+02:00
diff --git a/tests/FunctionalSecureServerTest.php b/tests/FunctionalSecureServerTest.php
@@ -19,8 +19,8 @@ class FunctionalSecureServerTest extends TestCase
 
     public function setUp()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
     }
 
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -36,8 +36,8 @@ public function gettingStuffFromGoogleShouldWork()
     /** @test */
     public function gettingEncryptedStuffFromGoogleShouldWork()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $loop = Factory::create();
@@ -55,8 +55,8 @@ public function gettingEncryptedStuffFromGoogleShouldWork()
     /** @test */
     public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $loop = Factory::create();
@@ -363,8 +363,8 @@ public function testConnectingFailsIfTimeoutIsTooSmall()
 
     public function testSelfSignedRejectsIfVerificationIsEnabled()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $loop = Factory::create();
@@ -381,8 +381,8 @@ public function testSelfSignedRejectsIfVerificationIsEnabled()
 
     public function testSelfSignedResolvesIfVerificationIsDisabled()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $loop = Factory::create();
diff --git a/tests/SecureConnectorTest.php b/tests/SecureConnectorTest.php
@@ -14,8 +14,8 @@ class SecureConnectorTest extends TestCase
 
     public function setUp()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
diff --git a/tests/SecureIntegrationTest.php b/tests/SecureIntegrationTest.php
@@ -24,8 +24,8 @@ class SecureIntegrationTest extends TestCase
 
     public function setUp()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $this->loop = LoopFactory::create();
diff --git a/tests/SecureServerTest.php b/tests/SecureServerTest.php
@@ -10,8 +10,8 @@ class SecureServerTest extends TestCase
 {
     public function setUp()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
     }
 
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -51,6 +51,9 @@ public function testConstructorCreatesExpectedTcpServer()
 
     public function testConstructorCreatesExpectedUnixServer()
     {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
+        }
         if (!in_array('unix', stream_get_transports())) {
             $this->markTestSkipped('Unix domain sockets (UDS) not supported on your platform (Windows?)');
         }
@@ -182,8 +185,8 @@ public function testEmitsConnectionWithInheritedContextOptions()
 
     public function testDoesNotEmitSecureConnectionForNewPlaintextConnectionThatIsIdle()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
         $loop = Factory::create();

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class FunctionalSecureServerTest extends TestCase`
`19`	`19`
`20`	`20`	`public function setUp()`
`21`	`21`	`{`
`22`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`23`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`22`	`+ if (defined('HHVM_VERSION')) {`
	`23`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public function gettingStuffFromGoogleShouldWork()`
`36`	`36`	`/** @test */`
`37`	`37`	`public function gettingEncryptedStuffFromGoogleShouldWork()`
`38`	`38`	`{`
`39`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`40`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`39`	`+ if (defined('HHVM_VERSION')) {`
	`40`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`$loop = Factory::create();`
`@@ -55,8 +55,8 @@ public function gettingEncryptedStuffFromGoogleShouldWork()`
`55`	`55`	`/** @test */`
`56`	`56`	`public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()`
`57`	`57`	`{`
`58`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`59`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`58`	`+ if (defined('HHVM_VERSION')) {`
	`59`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$loop = Factory::create();`
`@@ -363,8 +363,8 @@ public function testConnectingFailsIfTimeoutIsTooSmall()`
`363`	`363`
`364`	`364`	`public function testSelfSignedRejectsIfVerificationIsEnabled()`
`365`	`365`	`{`
`366`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`367`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`366`	`+ if (defined('HHVM_VERSION')) {`
	`367`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`$loop = Factory::create();`
`@@ -381,8 +381,8 @@ public function testSelfSignedRejectsIfVerificationIsEnabled()`
`381`	`381`
`382`	`382`	`public function testSelfSignedResolvesIfVerificationIsDisabled()`
`383`	`383`	`{`
`384`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`385`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`384`	`+ if (defined('HHVM_VERSION')) {`
	`385`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`$loop = Factory::create();`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ class SecureConnectorTest extends TestCase`
`14`	`14`
`15`	`15`	`public function setUp()`
`16`	`16`	`{`
`17`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`18`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`17`	`+ if (defined('HHVM_VERSION')) {`
	`18`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`$this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ class SecureIntegrationTest extends TestCase`
`24`	`24`
`25`	`25`	`public function setUp()`
`26`	`26`	`{`
`27`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`28`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`27`	`+ if (defined('HHVM_VERSION')) {`
	`28`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`$this->loop = LoopFactory::create();`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ class SecureServerTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`public function setUp()`
`12`	`12`	`{`
`13`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`14`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`13`	`+ if (defined('HHVM_VERSION')) {`
	`14`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ public function testConstructorCreatesExpectedTcpServer()`
`51`	`51`
`52`	`52`	`public function testConstructorCreatesExpectedUnixServer()`
`53`	`53`	`{`
	`54`	`+ if (defined('HHVM_VERSION')) {`
	`55`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
	`56`	`+ }`
`54`	`57`	`if (!in_array('unix', stream_get_transports())) {`
`55`	`58`	`$this->markTestSkipped('Unix domain sockets (UDS) not supported on your platform (Windows?)');`
`56`	`59`	`}`
`@@ -182,8 +185,8 @@ public function testEmitsConnectionWithInheritedContextOptions()`
`182`	`185`
`183`	`186`	`public function testDoesNotEmitSecureConnectionForNewPlaintextConnectionThatIsIdle()`
`184`	`187`	`{`
`185`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`186`		`- $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');`
	`188`	`+ if (defined('HHVM_VERSION')) {`
	`189`	`+ $this->markTestSkipped('Not supported on legacy HHVM');`
`187`	`190`	`}`
`188`	`191`
`189`	`192`	`$loop = Factory::create();`