Merge pull request #99 from lexidor/hhvm-upgrade

Compatibility with newer hhvm versions
kazuhikoarase · May 13, 2021 · 139ef3f · 139ef3f
2 parents c213466 + a401f96
commit 139ef3f
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 111 deletions.
diff --git a/hack/.gitignore b/hack/.gitignore
@@ -1,2 +1,3 @@
 vendor/**
-**/*hhast.parser-cache
+**/*hhast.parser-cache
+.var/
diff --git a/hack/.hhconfig b/hack/.hhconfig
@@ -1,3 +1,5 @@
 ignored_paths = [ "vendor/.+/tests/.+", "vendor/.+/bin/.+"]
 hackfmt.line_width = 80
 hackfmt.indent_width = 4
+allowed_decl_fixme_codes = 2053, 4047
+allowed_fixme_codes_strict = 2049, 2053, 4027, 4047, 4104, 4107, 4110, 4128, 4188, 4323
diff --git a/hack/composer.json b/hack/composer.json
@@ -5,8 +5,7 @@
         "hhvm": "^4.32"
     },
     "require-dev": {
-        "hhvm/hhvm-autoload": "^2.0",
-        "hhvm/hsl": "^4.36",
+        "hhvm/hhvm-autoload": "^2.0|^3.0",
         "hhvm/hhast": "^4.41"
     }
 }
diff --git a/hack/composer.lock b/hack/composer.lock
diff --git a/hack/samples/sample_custom.php b/hack/samples/sample_custom.php
@@ -2,10 +2,10 @@
 
 use namespace Kazuhikoarase\QrcodeGenerator;
 
-require_once(__DIR__.'/../vendor/hh_autoload.php');
-
 <<__EntryPoint>>
 function sample_custom(): noreturn {
+    require_once __DIR__.'/../vendor/autoload.hack';
+    \Facebook\AutoloadMap\initialize();
     $qr = QrcodeGenerator\QRCode::getMinimumQRCode(
         "日本語のQR 1234:! 漢字",
         QrcodeGenerator\ErrorCorrectionPercentage::SEVEN,

diff --git a/hack/samples/sample_html.php b/hack/samples/sample_html.php
@@ -2,10 +2,10 @@
 
 use namespace Kazuhikoarase\QrcodeGenerator;
 
-require_once(__DIR__.'/../vendor/hh_autoload.php');
-
 <<__EntryPoint>>
 function sample_html(): noreturn {
+    require_once __DIR__.'/../vendor/autoload.hack';
+    \Facebook\AutoloadMap\initialize();
     //---------------------------------------------------------
 
     print('<meta charset="UTF-8">');

diff --git a/hack/samples/sample_image.php b/hack/samples/sample_image.php
@@ -2,10 +2,11 @@
 
 use namespace Kazuhikoarase\QrcodeGenerator;
 
-require_once(__DIR__.'/../vendor/hh_autoload.php');
 
 <<__EntryPoint>>
 function sample_image(): noreturn {
+    require_once __DIR__.'/../vendor/autoload.hack';
+    \Facebook\AutoloadMap\initialize();
     $qr = QrcodeGenerator\QRCode::getMinimumQRCode(
         "日本語のQR 1234:! 漢字",
         QrcodeGenerator\ErrorCorrectionPercentage::SEVEN,