Supported HHVM 4.0 (#3) (#4)

* wip

* added

* changed to travis ci

* Update .travis.sh

* Update .travis.yml

* rename

Author: ytake

.gitignore

@@ -1,3 +1,5 @@
 composer.phar
 composer.lock
 vendor/
+docker/
+docker-compose.yml

.hhconfig

@@ -1,6 +1,7 @@
-assume_php=false
-ignored_paths = [ "vendor/.+/tests/.+", "vendor/hhvm/hhast/.+" ]
+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
-enable_experimental_tc_features = no_fallback_in_namespaces

.travis.sh

@@ -1,8 +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 -d xdebug.enable=0 -d hhvm.jit=0 -d hhvm.hack.lang.auto_typecheck=0 /usr/local/bin/composer install
-hhvm -d xdebug.enable=0 -d hhvm.jit=0 vendor/bin/hacktest tests/
+(
+  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/

.travis.yml

@@ -4,11 +4,12 @@ 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

composer.json

@@ -11,15 +11,15 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "hhvm": "^3.30.0",
-    "hhvm/hhvm-autoload": "^1.7",
-    "hhvm/hsl": "^3.30.0",
-    "hhvm/hsl-experimental": "^3.30.0"
+    "hhvm": "^4.0",
+    "hhvm/hsl": "^4.0",
+    "hhvm/hsl-experimental": "^4.0",
+    "hhvm/hhvm-autoload": "^2.0.0"
   },
   "require-dev": {
-    "hhvm/hacktest": "^1.3",
-    "facebook/fbexpect": "^2.3",
-    "hhvm/hhast": "^3.30.0"
+    "hhvm/hacktest": "^1.4",
+    "facebook/fbexpect": "^2.5.2",
+    "hhvm/hhast": "^4.0.0"
   },
   "autoload": {
     "psr-4": {

hh_autoload.json

@@ -1,26 +1,23 @@
-<?hh // strict
-
 namespace Nazg\Glue;
 
 use namespace Nazg\Glue\Exception;
 use namespace HH\Lib\{C, Str, Dict};
-type CallableInjector = (function(\Nazg\Glue\Container): mixed);
 
-class Container {
+class Container<T> {
   private bool $lock = false;
-  private dict<string, (Scope, CallableInjector)> $map = dict[];
+  private dict<string, (Scope, (function(\Nazg\Glue\Container<T>): T))> $map = dict[];
 
-  public function set<T>(
-    classname<T> $id,
-    CallableInjector $callback,
+  public function set(
+    typename<T> $id,
+    (function(\Nazg\Glue\Container<T>): T) $callback,
     Scope $scope = Scope::PROTOTYPE,
   ): void {
     if(!$this->lock) {
       $this->map[$id] = tuple($scope, $callback);
     }
   }
 
-  protected function resolve<T>(classname<T> $id): mixed {
+  protected function resolve(typename<T> $id): T {
     if ($this->has($id)) {
       list($scope, $callable) = $this->map[$id];
       if ($callable is nonnull) {
@@ -35,20 +32,18 @@ protected function resolve<T>(classname<T> $id): mixed {
     );
   }
 
-  public function getInstance<T>(classname<T> $t): T {
-    $mixed = $this->resolve($t);
-    invariant($mixed instanceof $t, "invalid use of incomplete type %s", $t);
-    return $mixed;
+  public function get(typename<T> $t): T {
+    return $this->resolve($t);
   }
 
   <<__Memoize>>
-  protected function shared<T>(classname<T> $id): mixed {
+  protected function shared(typename<T> $id): T {
     list($_, $callable) = $this->map[$id];
     return $callable($this);
   }
 
   <<__Rx>>
-  public function has(string $id): bool {
+  public function has(typename<T> $id): bool {
     if($this->lock) {
       return C\contains_key($this->map, $id);
     }
@@ -65,7 +60,7 @@ public function unlock(): void {
     $this->lock = false;
   }
 
-  public function remove<T>(classname<T> $id): void {
+  public function remove(typename<T> $id): void {
     if(!$this->lock) {
       $this->map = Dict\filter_with_key($this->map, ($k, $_) ==> $k !== $id);
     }

hhast-lint.json

@@ -1,5 +1,3 @@
-<?hh // strict
-
 namespace Nazg\Glue\Exception;
 
 final class ContainerNotLockedException extends \Exception {}

src/Container.php src/Container.hacksrc/Container.php renamed to src/Container.hack

@@ -1,5 +1,3 @@
-<?hh // strict
-
 namespace Nazg\Glue\Exception;
 
 final class NotFoundException extends \Exception {}