for hhvm4.58

Author: ytake

.travis.yml

@@ -4,16 +4,7 @@ services:
 - docker
 env:
   matrix:
-    - HHVM_VERSION=4.41.0
-    - HHVM_VERSION=4.42.0
-    - HHVM_VERSION=4.43.0
-    - HHVM_VERSION=4.44.0
-    - HHVM_VERSION=4.45.0
-    - HHVM_VERSION=4.46.0
-    - HHVM_VERSION=4.47.0
-    - HHVM_VERSION=4.48.0
-    - HHVM_VERSION=4.49.0
-    - HHVM_VERSION=4.50.0
+    - HHVM_VERSION=4.58.1
     - HHVM_VERSION=latest
 install:
 - docker pull hhvm/hhvm:$HHVM_VERSION

composer.json

@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "hhvm": "^4.41",
+    "hhvm": "^4.58",
     "hhvm/hsl": "^4.0",
     "hhvm/hsl-experimental": "^4.37",
     "hhvm/hhvm-autoload": "^3.0",
@@ -29,7 +29,7 @@
     "hhvm/hacktest": "^2.0",
     "facebook/fbexpect": "^2.7",
     "hhvm/hhast": "^4.0",
-    "ytake/hungrr": "^0.10"
+    "ytake/hungrr": "^0.12"
   },
   "autoload": {
     "psr-4": {

src/Emitter/SapiEmitter.hack

@@ -46,7 +46,7 @@ class SapiEmitter implements EmitterInterface {
   private function emitBody(
     ReadHandle $readHandle,
   ): void {
-    echo $readHandle->rawReadBlocking();
+    echo $readHandle->read();
   }
 
   private async function emitBodyAsync(

tests/EmitterStackTest.hack

@@ -10,7 +10,7 @@ use function ob_end_clean;
 
 final class EmitterStackTest extends HackTest {
 
-  private ?EmitterStack $stack;
+  <<__LateInit>> private EmitterStack $stack;
 
   <<__Override>>
   public async function beforeEachTestAsync(): Awaitable<void> {
@@ -19,10 +19,11 @@ final class EmitterStackTest extends HackTest {
 
   public function testShouldEmitTrue(): void {
     $sapiEmmiter = new SapiEmitter();
-    $this->stack?->push($sapiEmmiter);
+    $this->stack->push($sapiEmmiter);
     list($readHandle, $writeHandle) = IO\pipe_nd();
+    $writeHandle->write('testing');
     ob_start();
-    $result = $this->stack?->emit(
+    $result = $this->stack->emit(
       $readHandle,
       new Response($writeHandle, StatusCode::OK)
     );
@@ -32,11 +33,11 @@ final class EmitterStackTest extends HackTest {
 
   public function testShouldReturnMessageBody(): void {
     $sapiEmmiter = new SapiEmitter();
-    $this->stack?->push($sapiEmmiter);
+    $this->stack->push($sapiEmmiter);
     list($readHandle, $writeHandle) = IO\pipe_nd();
-    $writeHandle->rawWriteBlocking('content');
+    $writeHandle->write('content');
     ob_start();
-    $_ = $this->stack?->emit(
+    $_ = $this->stack->emit(
       $readHandle,
       new Response($writeHandle, StatusCode::OK)
     );
@@ -47,12 +48,12 @@ final class EmitterStackTest extends HackTest {
 
   public function testEmitsResponseHeaders(): void {
     $sapiEmmiter = new OverrideSapiEmitter();
-    $this->stack?->push($sapiEmmiter);
+    $this->stack->push($sapiEmmiter);
     list($readHandle, $writeHandle) = IO\pipe_nd();
-    $writeHandle->rawWriteBlocking('content');
+    $writeHandle->write('content');
     $response = new TextResponse($writeHandle, StatusCode::OK);
     ob_start();
-    $_ = $this->stack?->emit(
+    $_ = $this->stack->emit(
       $readHandle,
       $response
     );
@@ -63,9 +64,11 @@ final class EmitterStackTest extends HackTest {
     expect($header)->toContainSubstring('Content-Type: text/plain');
   }
 
-  public function testMultipleSetCookieHeadersAreNotReplaced(): void {
+  public async function testMultipleSetCookieHeadersAreNotReplaced(): Awaitable<void> {
     $sapiEmmiter = new OverrideSapiEmitter();
     list($readHandle, $writeHandle) = IO\pipe_nd();
+    await $writeHandle->writeAsync('');
+    await $writeHandle->closeAsync();
     $sapiEmmiter->emit($readHandle, (new Response($writeHandle))
       ->withStatus(200)
       ->withAddedHeader('Set-Cookie', vec['foo=bar', 'bar=baz']));
@@ -76,9 +79,11 @@ final class EmitterStackTest extends HackTest {
     ]);
   }
 
-  public function testDoesNotLetResponseCodeBeOverriddenByHack(): void {
+  public async function testDoesNotLetResponseCodeBeOverriddenByHack(): Awaitable<void> {
     $sapiEmmiter = new OverrideSapiEmitter();
     list($readHandle, $writeHandle) = IO\pipe_nd();
+    await $writeHandle->writeAsync('');
+    await $writeHandle->closeAsync();
     $response = (new Response($writeHandle))
       ->withStatus(StatusCode::ACCEPTED)
       ->withAddedHeader('Location', vec['http://api.my-service.com/12345678'])
@@ -97,13 +102,13 @@ final class EmitterStackTest extends HackTest {
 
   public async function testShouldEmitOutput(): Awaitable<void> {
     $sapiEmmiter = new SapiEmitter();
-    $this->stack?->push($sapiEmmiter);
-    $this->stack?->push($sapiEmmiter);
+    $this->stack->push($sapiEmmiter);
+    $this->stack->push($sapiEmmiter);
     list($readHandle, $writeHandle) = IO\pipe_nd();
     await $writeHandle->writeAsync('content');
     await $writeHandle->closeAsync();
     ob_start();
-    await $this->stack?->emitAsync(
+    await $this->stack->emitAsync(
       $readHandle,
       new Response($writeHandle, StatusCode::OK)
     );

tests/MockRequestHandler.hack

@@ -13,7 +13,7 @@ final class MockRequestHandler implements RequestHandlerInterface {
     IO\WriteHandle $handle,
     ServerRequestInterface $_request
   ): ResponseInterface {
-    $handle->rawWriteBlocking(json_encode(dict[]));
+    $handle->write(json_encode(dict[]));
     return new Response($handle, StatusCode::OK);
   }
 }