Update dependencies for 4.1 compatibility

hhvm · Mar 26, 2019 · a8c2ce9 · a8c2ce9
1 parent 239025b
commit a8c2ce9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -9,10 +9,12 @@ php --version
   cd $(mktemp -d)
   curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 )
+if (hhvm --version | grep -q -- -dev); then
+  rm composer.lock
+fi
 composer install
 
 hh_client
-hhvm vendor/bin/hacktest tests/
-if !(hhvm --version | grep -q -- -dev); then
-  hhvm vendor/bin/hhast-lint
-fi
+
+vendor/bin/hacktest tests/
+vendor/bin/hhast-lint
diff --git a/composer.lock b/composer.lock
diff --git a/src/router/PrefixMatchingResolver.php b/src/router/PrefixMatchingResolver.php
@@ -71,7 +71,7 @@ private function resolveWithMap(
       $matched = $matches[0];
       $remaining = Str\strip_prefix($path, $matched);
 
-      $data = Dict\filter_keys($matches, $key ==> is_string($key));
+      $data = Dict\filter_keys($matches, $key ==> $key is string);
       $sub = $regexps[$regexp];
 
       if ($sub->isResponder()) {

diff --git a/src/router/SimpleRegexpResolver.php b/src/router/SimpleRegexpResolver.php
@@ -38,7 +38,7 @@ public function resolve(
         continue;
       }
       $ret =
-        tuple($responder, Dict\filter_keys($matches, $key ==> is_string($key)));
+        tuple($responder, Dict\filter_keys($matches, $key ==> $key is string));
       return $ret;
     }
     throw new NotFoundException();