Merge branch 'hotfix/260'

Close #260

Author: weierophinney

.travis.yml

@@ -70,15 +70,6 @@ matrix:
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
-      env:
-        - DEPS=lowest
-    - php: hhvm
-      env:
-        - DEPS=locked
-    - php: hhvm
-      env:
-        - DEPS=latest
 
 before_install:
   - travis_retry composer self-update

CHANGELOG.md

@@ -14,7 +14,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#260](https://github.com/zendframework/zend-diactoros/pull/260) removes
+  support for HHVM, as tests have failed against it for some time.
 
 ### Fixed
 

test/Response/JsonResponseTest.php

@@ -86,10 +86,6 @@ public function testJsonErrorHandlingOfBadEmbeddedData()
             $this->markTestSkipped('Skipped as PHP versions prior to 5.5 are noisy about JSON errors');
         }
 
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Skipped as HHVM happily serializes embedded resources');
-        }
-
         // Serializing something that is not serializable.
         $data = [
             'stream' => fopen('php://memory', 'r'),