diff --git a/composer.json b/composer.json
index a7d8ae1..32542d5 100644
--- a/composer.json
+++ b/composer.json
@@ -4,15 +4,16 @@
     "keywords": ["hack", "router", "routing", "hhvm"],
     "homepage": "https://github.com/hhvm/hack-router-codegen",
     "require": {
-        "hhvm": "^3.28.0",
-        "facebook/hack-router": "^0.17",
+        "hhvm": "^4.0",
+        "facebook/hack-router": "^0.18",
         "facebook/hack-http-request-response-interfaces": "^0.1",
         "facebook/hack-codegen": "^4.0.1",
         "facebook/definition-finder": "^2.0",
         "hhvm/type-assert": "^3.0"
     },
     "require-dev": {
-        "hhvm/hhast": "^3.28",
+        "hhvm/hhast": "^4.0",
+        "hhvm/hhvm-autoload": "^2.0",
         "hhvm/hacktest": "^1.1",
         "facebook/fbexpect": "^2.1",
         "usox/hackttp": "^0.1"
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index a072f20..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,649 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "75acdda8dcabacc73a7c77dd3487d18a",
-    "packages": [
-        {
-            "name": "facebook/definition-finder",
-            "version": "v2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/definition-finder.git",
-                "reference": "1c952746196c285c93620c54ccc69e5c182a57fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/definition-finder/zipball/1c952746196c285c93620c54ccc69e5c182a57fe",
-                "reference": "1c952746196c285c93620c54ccc69e5c182a57fe",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.29.0",
-                "hhvm/hhast": "^3.29.0",
-                "hhvm/hhvm-autoload": "^1.6",
-                "hhvm/hsl": "^3.26.0",
-                "hhvm/type-assert": "^3.2"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.0.0",
-                "hhvm/hacktest": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ],
-                "files": [
-                    "autoload_files.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Find definitions in PHP or Hack files. Useful for autoloaders.",
-            "homepage": "https://github.com/hhvm/definitions-finder",
-            "keywords": [
-                "autoload",
-                "definitions",
-                "hack",
-                "hhvm"
-            ],
-            "time": "2018-10-25T19:50:52+00:00"
-        },
-        {
-            "name": "facebook/difflib",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/difflib.git",
-                "reference": "09505c7d66224fa7e5a8f775825bd70f05e57b01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/difflib/zipball/09505c7d66224fa7e5a8f775825bd70f05e57b01",
-                "reference": "09505c7d66224fa7e5a8f775825bd70f05e57b01",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm/hsl": "^3.28"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.1.2",
-                "hhvm/hacktest": "^1.0",
-                "hhvm/hhast": "^3.28"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.2.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "time": "2018-09-24T22:01:02+00:00"
-        },
-        {
-            "name": "facebook/hack-codegen",
-            "version": "v4.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hack-codegen.git",
-                "reference": "6b6371066c65379208c459c4d13b8e405a1e5dce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hack-codegen/zipball/6b6371066c65379208c459c4d13b8e405a1e5dce",
-                "reference": "6b6371066c65379208c459c4d13b8e405a1e5dce",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": ">=3.28.0",
-                "hhvm/hhvm-autoload": "^1.6",
-                "hhvm/hsl": "^3.28.0"
-            },
-            "require-dev": {
-                "facebook/difflib": "^1.0",
-                "facebook/fbexpect": "^2.1.0",
-                "hhvm/hacktest": "^1.0",
-                "hhvm/hhast": "^3.28.0",
-                "hhvm/type-assert": "^3.1"
-            },
-            "bin": [
-                "bin/hh-codegen-verify-signatures"
-            ],
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Drew Hoskins",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Gaurav Kumar",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Alejandro Marcu",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Matthieu Martin",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Fred Emmott",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Hack Codegen is a library for programatically generating Hack code",
-            "keywords": [
-                "code generation",
-                "hack"
-            ],
-            "time": "2018-12-14T23:34:26+00:00"
-        },
-        {
-            "name": "facebook/hack-http-request-response-interfaces",
-            "version": "v0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hack-http-request-response-interfaces.git",
-                "reference": "5baf46d6682a02331c533ec72782385a12bb7aa2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hack-http-request-response-interfaces/zipball/5baf46d6682a02331c533ec72782385a12bb7aa2",
-                "reference": "5baf46d6682a02331c533ec72782385a12bb7aa2",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm/hsl-experimental": "^3.29"
-            },
-            "require-dev": {
-                "hhvm/hhast": "^3.28.0"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/facebookexperimental/hack-http-request-response-interfaces",
-            "time": "2018-11-14T19:58:39+00:00"
-        },
-        {
-            "name": "facebook/hack-router",
-            "version": "v0.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hack-router.git",
-                "reference": "f7b35d925dbc27d11dd0f46540ac80920392cce2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hack-router/zipball/f7b35d925dbc27d11dd0f46540ac80920392cce2",
-                "reference": "f7b35d925dbc27d11dd0f46540ac80920392cce2",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/hack-http-request-response-interfaces": "^0.1",
-                "hhvm": "^3.29.0",
-                "hhvm/hhvm-autoload": "^1.5.3",
-                "hhvm/hsl": "^3.29.0"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.0",
-                "hhvm/hacktest": "^1.1",
-                "hhvm/hhast": "^3.29.0",
-                "usox/hackttp": "^0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "URI routing for Hack",
-            "homepage": "https://github.com/hhvm/hack-router",
-            "keywords": [
-                "hack",
-                "hhvm",
-                "router",
-                "routing"
-            ],
-            "time": "2018-12-10T20:46:28+00:00"
-        },
-        {
-            "name": "facebook/hh-clilib",
-            "version": "v2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hh-clilib.git",
-                "reference": "ef39116c527ac2496c985657f93af0253c9d8227"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hh-clilib/zipball/ef39116c527ac2496c985657f93af0253c9d8227",
-                "reference": "ef39116c527ac2496c985657f93af0253c9d8227",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm/hsl": "^3.26",
-                "hhvm/hsl-experimental": "^3.29.5",
-                "hhvm/type-assert": "^3.2"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.1.0",
-                "hhvm/hacktest": "^1.0.0",
-                "hhvm/hhast": "^3.29.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "time": "2018-12-05T19:10:19+00:00"
-        },
-        {
-            "name": "hhvm/hhast",
-            "version": "v3.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hhast.git",
-                "reference": "525177bd5328483af2c2bc2a4d23be0599a8e418"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hhast/zipball/525177bd5328483af2c2bc2a4d23be0599a8e418",
-                "reference": "525177bd5328483af2c2bc2a4d23be0599a8e418",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/difflib": "^1.0.0",
-                "facebook/hh-clilib": "^2.0.0",
-                "hhvm": "3.30.*",
-                "hhvm/hsl": "^3.30.0",
-                "hhvm/type-assert": "^3.1"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.1.1",
-                "facebook/hack-codegen": "^4.0",
-                "hhvm/hacktest": "^1.3",
-                "hhvm/hhvm-autoload": "^1.5"
-            },
-            "bin": [
-                "bin/hhast-lint",
-                "bin/hhast-inspect",
-                "bin/hhast-migrate"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "time": "2018-12-14T22:20:05+00:00"
-        },
-        {
-            "name": "hhvm/hhvm-autoload",
-            "version": "v1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hhvm-autoload.git",
-                "reference": "2e8b1ec08f00101d63f5ec797d9db47faa99a6dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hhvm-autoload/zipball/2e8b1ec08f00101d63f5ec797d9db47faa99a6dc",
-                "reference": "2e8b1ec08f00101d63f5ec797d9db47faa99a6dc",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "hhvm": "^3.28"
-            },
-            "replace": {
-                "facebook/hhvm-autoload": "1.*"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.1",
-                "hhvm/hacktest": "^1.0"
-            },
-            "bin": [
-                "bin/hh-autoload"
-            ],
-            "type": "composer-plugin",
-            "extra": {
-                "class": [
-                    "Facebook\\AutoloadMap\\ComposerPlugin"
-                ],
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/Writer.php",
-                    "src/"
-                ],
-                "files": [
-                    "src/AutoloadMap.php",
-                    "src/Config.php",
-                    "src/TypeAssert.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "time": "2018-12-14T20:41:25+00:00"
-        },
-        {
-            "name": "hhvm/hsl",
-            "version": "v3.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hsl.git",
-                "reference": "9a5f26ad5e7c078281f66dd74117af3a3b785e50"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hsl/zipball/9a5f26ad5e7c078281f66dd74117af3a3b785e50",
-                "reference": "9a5f26ad5e7c078281f66dd74117af3a3b785e50",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.30.0",
-                "hhvm/hhvm-autoload": "^1.7"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.0.0",
-                "hhvm/hacktest": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The Hack Standard Library",
-            "time": "2018-12-14T21:18:17+00:00"
-        },
-        {
-            "name": "hhvm/hsl-experimental",
-            "version": "v3.30.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hsl-experimental.git",
-                "reference": "9ec62ca7d6a846b85c53c3a42e992ba17ad90ea7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hsl-experimental/zipball/9ec62ca7d6a846b85c53c3a42e992ba17ad90ea7",
-                "reference": "9ec62ca7d6a846b85c53c3a42e992ba17ad90ea7",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.30.0",
-                "hhvm/hhvm-autoload": "^1.7",
-                "hhvm/hsl": "^3.30.0"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.0",
-                "hhvm/hacktest": "^1.0"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The Hack Standard Library - Experimental Additions",
-            "time": "2018-12-14T21:34:20+00:00"
-        },
-        {
-            "name": "hhvm/type-assert",
-            "version": "v3.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/type-assert.git",
-                "reference": "ab4d907d5fd4894a6833b5926cafc9fb9c894ff9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/type-assert/zipball/ab4d907d5fd4894a6833b5926cafc9fb9c894ff9",
-                "reference": "ab4d907d5fd4894a6833b5926cafc9fb9c894ff9",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.29.0",
-                "hhvm/hhvm-autoload": "^1.4",
-                "hhvm/hsl": "^3.29.0"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.0.0",
-                "hhvm/hacktest": "^1.0",
-                "hhvm/hhast": "^3.27"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Convert untyped data to typed data",
-            "keywords": [
-                "TypeAssert",
-                "hack"
-            ],
-            "time": "2018-12-14T23:24:44+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "facebook/fbexpect",
-            "version": "v2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/fbexpect.git",
-                "reference": "22b9d59d9ab5e22a07e66fe1d07ba8d0472ae49b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/fbexpect/zipball/22b9d59d9ab5e22a07e66fe1d07ba8d0472ae49b",
-                "reference": "22b9d59d9ab5e22a07e66fe1d07ba8d0472ae49b",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/difflib": "^1.0.0",
-                "hhvm": "^3.28",
-                "hhvm/hacktest": "^1.0",
-                "hhvm/hhvm-autoload": "^1.6",
-                "hhvm/hsl": "^3.26"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Unit test helpers for Facebook projects",
-            "time": "2018-11-29T21:04:58+00:00"
-        },
-        {
-            "name": "hhvm/hacktest",
-            "version": "v1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hacktest.git",
-                "reference": "ed8eaf18c1a4443e0a735707ac3d0c2749273f08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hacktest/zipball/ed8eaf18c1a4443e0a735707ac3d0c2749273f08",
-                "reference": "ed8eaf18c1a4443e0a735707ac3d0c2749273f08",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/hh-clilib": "^2.0.0",
-                "hhvm": "^3.28.0",
-                "hhvm/hhvm-autoload": "^1.6",
-                "hhvm/hsl": "^3.26",
-                "hhvm/type-assert": "^3.2"
-            },
-            "require-dev": {
-                "facebook/fbexpect": "^2.3.0",
-                "hhvm/hhast": "^3.27"
-            },
-            "bin": [
-                "bin/hacktest"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The Hack Test Library",
-            "time": "2018-11-30T17:17:20+00:00"
-        },
-        {
-            "name": "usox/hack-http-factory-interfaces",
-            "version": "0.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/usox/hack-http-factory-interfaces.git",
-                "reference": "c385fb02e020aef3d30b3461ec755f75b0b6f977"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/usox/hack-http-factory-interfaces/zipball/c385fb02e020aef3d30b3461ec755f75b0b6f977",
-                "reference": "c385fb02e020aef3d30b3461ec755f75b0b6f977",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/hack-http-request-response-interfaces": "^0.1",
-                "hhvm": "^3.29"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Usox\\HackHttpFactory\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Jakob",
-                    "email": "dev@usox.org"
-                }
-            ],
-            "description": "PSR-17 like http factory interfaces",
-            "homepage": "https://github.com/usox/hack-http-factory-interfaces",
-            "keywords": [
-                "factory",
-                "hack",
-                "hhvm",
-                "http"
-            ],
-            "time": "2018-11-28T06:22:08+00:00"
-        },
-        {
-            "name": "usox/hackttp",
-            "version": "v0.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/usox/hackttp.git",
-                "reference": "c83c31abec98c76e6eb557e8330990f8106de1ad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/usox/hackttp/zipball/c83c31abec98c76e6eb557e8330990f8106de1ad",
-                "reference": "c83c31abec98c76e6eb557e8330990f8106de1ad",
-                "shasum": ""
-            },
-            "require": {
-                "facebook/hack-http-request-response-interfaces": "0.1",
-                "hhvm": "^3.29",
-                "hhvm/hsl": "^3.29",
-                "hhvm/hsl-experimental": "^3.29.3",
-                "hhvm/type-assert": "^3.2",
-                "usox/hack-http-factory-interfaces": "^0.1"
-            },
-            "require-dev": {
-                "hhvm/hhast": "^3.29",
-                "usox/hackmock": "^1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Usox\\HackTTP\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Jakob",
-                    "email": "dev@usox.org",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Work in progress demo implementation of facebookexperimental/hack-http-request-response-interfaces",
-            "homepage": "https://github.com/usox/hackttp",
-            "keywords": [
-                "hack",
-                "hacklang",
-                "hhvm",
-                "http",
-                "message",
-                "request",
-                "response",
-                "stream"
-            ],
-            "time": "2018-12-09T11:57:41+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "hhvm": "^3.28.0"
-    },
-    "platform-dev": []
-}