Merge pull request #2 from nazg-hack/develop

ytake · web-flow · commit b7671fab16b9 · 2019-03-05T03:14:47.000+09:00
Updated For HHVM4.0
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 composer.phar
 composer.lock
 vendor/
-.vscode/
+docker/
+docker-compose.yml
+.vscode
diff --git a/.hhconfig b/.hhconfig
@@ -1,5 +1,7 @@
 assume_php = false
+enable_experimental_tc_features = no_fallback_in_namespaces
 ignored_paths = [ "vendor/.+/tests/.+" ]
 safe_array = true
 safe_vector_array = true
+disallow_assign_by_ref = false
 unsafe_rx = false
diff --git a/.travis.sh b/.travis.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
 set -ex
+apt update -y
+DEBIAN_FRONTEND=noninteractive apt install -y php-cli zip unzip
 hhvm --version
-curl https://getcomposer.org/installer | hhvm -d hhvm.jit=0 --php -- /dev/stdin --install-dir=/usr/local/bin --filename=composer
+php --version
 
-cd /var/source
-hhvm /usr/local/bin/composer install
+(
+  cd $(mktemp -d)
+  curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+)
+composer install
+hh_client
 
 hhvm ./vendor/bin/hacktest tests/
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,16 @@
+
 sudo: required
 language: generic
 services:
  - docker
 env:
   matrix:
-   - HHVM_VERSION=3.30.0
-   - HHVM_VERSION=3.30.1
+   - HHVM_VERSION=4.0.0
+   - HHVM_VERSION=4.0.1
+   - HHVM_VERSION=4.0.2
+   - HHVM_VERSION=4.0.3
    - HHVM_VERSION=latest
 install:
  - docker pull hhvm/hhvm:$HHVM_VERSION
 script:
- - env | egrep '^(HHVM_VERSION|GITHUB_API_KEY|TRAVIS_EVENT_TYPE)=' > ./env-list
- - docker run --env-file ./env-list -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION /var/source/.travis.sh
+ - docker run --rm -w /var/source -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION ./.travis.sh
diff --git a/composer.json b/composer.json
@@ -18,17 +18,18 @@
     }
   ],
   "require": {
-    "hhvm": ">=3.30",
-    "hhvm/hsl": "^3.30.0",
-    "hhvm/hsl-experimental": "^3.30.2",
-    "facebook/hack-http-request-response-interfaces": "^0.1",
-    "nazg/http-server-request-handler": "^0.1.0"
+    "hhvm": "^4.0",
+    "hhvm/hsl": "^4.0",
+    "hhvm/hsl-experimental": "^4.0",
+    "hhvm/hhvm-autoload": "^2.0.0",
+    "facebook/hack-http-request-response-interfaces": "^0.2",
+    "nazg/http-server-request-handler": "^0.2.0"
   },
   "require-dev": {
-    "hhvm/hacktest": "^1.3",
-    "facebook/fbexpect": "^2.3.0",
-    "hhvm/hhast": "^3.30.0",
-    "ytake/hungrr": "^0.2.0"
+    "hhvm/hacktest": "^1.4",
+    "facebook/fbexpect": "^2.5.2",
+    "hhvm/hhast": "^4.0.0",
+    "ytake/hungrr": "^0.3.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Emitter/EmitterInterface.hack b/src/Emitter/EmitterInterface.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/Emitter/EmitterStack.hack b/src/Emitter/EmitterStack.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/Emitter/SapiEmitter.hack b/src/Emitter/SapiEmitter.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/Emitter/SapiEmitterTrait.hack b/src/Emitter/SapiEmitterTrait.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -50,7 +48,7 @@ protected function putStatusLine(
         'HTTP/%s %d%s',
         $version,
         $statusCode,
-        ($reasonPhrase ? ' ' . $reasonPhrase : '')
+        (!Str\is_empty($reasonPhrase) ? ' ' . $reasonPhrase : '')
       ),
       true,
       $statusCode
diff --git a/src/Exception/EmitterException.hack b/src/Exception/EmitterException.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/src/RequestHandleExecutor.hack b/src/RequestHandleExecutor.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/tests/EmitterStackTest.hack b/tests/EmitterStackTest.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 use type Ytake\Hungrr\Response;
 use type Ytake\Hungrr\StatusCode;
 use type Ytake\Hungrr\Response\TextResponse;
diff --git a/tests/MockRequestHandler.hack b/tests/MockRequestHandler.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 use type Nazg\Http\Server\RequestHandlerInterface;
 use type Facebook\Experimental\Http\Message\ServerRequestInterface;
 use type Facebook\Experimental\Http\Message\ResponseInterface;
diff --git a/tests/OverrideSapiEmitter.hack b/tests/OverrideSapiEmitter.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 use type Nazg\HttpExecutor\Emitter\SapiEmitter;
 
 use namespace HH\Lib\Str;
@@ -21,7 +19,7 @@ protected function putStatusLine(
         'HTTP/%s %d%s',
         $version,
         $statusCode,
-        ($reasonPhrase ? ' ' . $reasonPhrase : '')
+        (!Str\is_empty($reasonPhrase) ? ' ' . $reasonPhrase : '')
       ),
       $replace,
       $statusCode,
diff --git a/tests/RequestHandleExecutorTest.hack b/tests/RequestHandleExecutorTest.hack
@@ -1,5 +1,3 @@
-<?hh // strict
-
 use type Ytake\Hungrr\ServerRequestFactory;
 use type Nazg\HttpExecutor\RequestHandleExecutor;
 use type Nazg\HttpExecutor\Emitter\SapiEmitter;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-<?hh // strict`
`2`		`-`
`3`	`1`	`/**`
`4`	`2`	`* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR`
`5`	`3`	`* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,`