changed dependencies

Author: ytake

.travis.yml

@@ -4,13 +4,13 @@ services:
 - docker
 env:
   matrix:
-  - HHVM_VERSION=4.20.0
-  - HHVM_VERSION=4.21.0
-  - HHVM_VERSION=4.22.0
-  - HHVM_VERSION=4.23.0
-  - HHVM_VERSION=4.24.0
-  - HHVM_VERSION=4.25.0
-  - HHVM_VERSION=4.26.0
+  - HHVM_VERSION=4.25.1
+  - HHVM_VERSION=4.26.1
+  - HHVM_VERSION=4.27.1
+  - HHVM_VERSION=4.28.2
+  - HHVM_VERSION=4.29.0
+  - HHVM_VERSION=4.30.0
+  - HHVM_VERSION=4.31.0
   - HHVM_VERSION=latest
 install:
 - docker pull hhvm/hhvm:$HHVM_VERSION

composer.json

@@ -18,18 +18,18 @@
     }
   ],
   "require": {
-    "hhvm": "^4.20",
-    "hhvm/hsl": "^4.15",
-    "hhvm/hsl-experimental": "^4.15",
-    "hhvm/hhvm-autoload": "^2.0.0",
+    "hhvm": "^4.25",
+    "hhvm/hsl": "^4.0",
+    "hhvm/hsl-experimental": "^4.25",
+    "hhvm/hhvm-autoload": "^2.0.10",
     "facebook/hack-http-request-response-interfaces": "^0.2",
     "nazg/http-server-request-handler": "^0.3.0"
   },
   "require-dev": {
-    "hhvm/hacktest": "^1.6",
-    "facebook/fbexpect": "^2.5.2",
-    "hhvm/hhast": "^4.0",
-    "ytake/hungrr": "^0.5"
+    "hhvm/hacktest": "^2.0.0",
+    "facebook/fbexpect": "^2.7.3",
+    "hhvm/hhast": "^4.0.0",
+    "ytake/hungrr": "^0.6"
   },
   "autoload": {
     "psr-4": {

tests/AsyncRequestHandleExecutorTest.hack

@@ -13,7 +13,7 @@ final class AsyncRequestHandleExecutorTest extends HackTest {
   public async function testShouldReturnNullStackEmitter(): Awaitable<void> {
     $stack = new EmitterStack();
     $stack->push(new OverrideSapiEmitter());
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $executor = new AsyncRequestHandleExecutor(
       $readHandle,
       $writeHandle,

tests/EmitterStackTest.hack

@@ -20,7 +20,7 @@ final class EmitterStackTest extends HackTest {
   public function testShouldEmitTrue(): void {
     $sapiEmmiter = new SapiEmitter();
     $this->stack?->push($sapiEmmiter);
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     ob_start();
     $result = $this->stack?->emit(
       $readHandle,
@@ -33,10 +33,10 @@ final class EmitterStackTest extends HackTest {
   public function testShouldReturnMessageBody(): void {
     $sapiEmmiter = new SapiEmitter();
     $this->stack?->push($sapiEmmiter);
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $writeHandle->rawWriteBlocking('content');
     ob_start();
-    $result = $this->stack?->emit(
+    $_ = $this->stack?->emit(
       $readHandle,
       new Response($writeHandle, StatusCode::OK)
     );
@@ -48,24 +48,24 @@ final class EmitterStackTest extends HackTest {
   public function testEmitsResponseHeaders(): void {
     $sapiEmmiter = new OverrideSapiEmitter();
     $this->stack?->push($sapiEmmiter);
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $writeHandle->rawWriteBlocking('content');
     $response = new TextResponse($writeHandle, StatusCode::OK);
     ob_start();
-    $result = $this->stack?->emit(
+    $_ = $this->stack?->emit(
       $readHandle,
       $response
     );
     $out = ob_get_contents();
     ob_end_clean();
     expect($out)->toBeSame('content');
     list($header, $_, $_) = $sapiEmmiter->getPutHeaders()[0];
-    expect($header)->toContain('Content-Type: text/plain');
+    expect($header)->toContainSubstring('Content-Type: text/plain');
   }
 
   public function testMultipleSetCookieHeadersAreNotReplaced(): void {
     $sapiEmmiter = new OverrideSapiEmitter();
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $sapiEmmiter->emit($readHandle, (new Response($writeHandle))
       ->withStatus(200)
       ->withAddedHeader('Set-Cookie', vec['foo=bar', 'bar=baz']));
@@ -78,16 +78,12 @@ final class EmitterStackTest extends HackTest {
 
   public function testDoesNotLetResponseCodeBeOverriddenByHack(): void {
     $sapiEmmiter = new OverrideSapiEmitter();
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $response = (new Response($writeHandle))
       ->withStatus(StatusCode::ACCEPTED)
       ->withAddedHeader('Location', vec['http://api.my-service.com/12345678'])
       ->withAddedHeader('Content-Type', vec['text/plain']);
     $sapiEmmiter->emit($readHandle, $response);
-    $expectedStack = vec[
-      tuple('Location: http://api.my-service.com/12345678', true, 202),
-      tuple('Content-Type: text/plain', true, 202),
-    ];
     expect($sapiEmmiter->getPutHeaders())
       ->toBeSame(vec[
         tuple('Location: http://api.my-service.com/12345678', true, 202),
@@ -103,7 +99,7 @@ final class EmitterStackTest extends HackTest {
     $sapiEmmiter = new SapiEmitter();
     $this->stack?->push($sapiEmmiter);
     $this->stack?->push($sapiEmmiter);
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     await $writeHandle->writeAsync('content');
     await $writeHandle->closeAsync();
     ob_start();

tests/MockAsyncRequestHandler.hack

@@ -14,7 +14,9 @@ final class MockAsyncRequestHandler implements AsyncRequestHandlerInterface {
     ServerRequestInterface $_request
   ): Awaitable<ResponseInterface> {
     await $handle->writeAsync(json_encode(dict[]));
-    await $handle->closeAsync();
+    if($handle is IO\NonDisposableHandle) {
+      await $handle->closeAsync();
+    }
     return new Response($handle, StatusCode::OK);
   }
 }

tests/RequestHandleExecutorTest.hack

@@ -13,7 +13,7 @@ final class RequestHandleExecutorTest extends HackTest {
   public function testShouldReturnNullStackEmitter(): void {
     $stack = new EmitterStack();
     $stack->push(new OverrideSapiEmitter());
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $executor = new RequestHandleExecutor(
       $readHandle,
       $writeHandle,
@@ -28,7 +28,7 @@ final class RequestHandleExecutorTest extends HackTest {
   }
 
   public function testShouldReturnNullSapiEmitter(): void {
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     $executor = new RequestHandleExecutor(
       $readHandle,
       $writeHandle,

tests/SapiEmitterTest.hack

@@ -11,7 +11,7 @@ final class SapiEmitterTest extends HackTest {
 
   public async function testShouldAsync(): Awaitable<void> {
     $sapi = new SapiEmitter();
-    list($readHandle, $writeHandle) = IO\pipe_non_disposable();
+    list($readHandle, $writeHandle) = IO\pipe_nd();
     await $writeHandle->writeAsync('async content');
     await $writeHandle->closeAsync();
     ob_start();