Merge pull request #5556 from cakephp/3.0-hhvm-fixes

More hhvm fixes

tests/TestCase/I18n/Formatter/IcuFormatterTest.php

@@ -95,7 +95,8 @@ class IcuFormatterTest extends TestCase
     /**
      * Tests that passing a message in the wrong format will throw an exception
      *
-     * @expectedException \Aura\Intl\Exception\CannotInstantiateFormatter
+     * @expectedException Exception
+     * @expectedExceptionMessage msgfmt_create: message formatter
      * @return void
      */
     public function testBadMessageFormat()

tests/TestCase/Network/SocketTest.php

@@ -392,7 +392,10 @@ class SocketTest extends TestCase
      */
     public function testGetContext()
     {
-        $this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
+        $this->skipIf(
+            !extension_loaded('openssl') || defined('HHVM_VERSION'),
+            'OpenSSL is not enabled cannot test SSL.'
+        );
         $config = [
             'host' => 'smtp.gmail.com',
             'port' => 465,