Use definition-finder v2.0

Author: fredemmott

composer.json

@@ -7,7 +7,7 @@
         "hhvm": "^3.23.0",
         "facebook/hack-router": ">=0.14",
         "facebook/hack-codegen": "^3.0.1",
-        "facebook/definition-finder": "^1.5.3",
+        "facebook/definition-finder": "^2.0",
         "hhvm/type-assert": "^3.0"
     },
     "require-dev": {

composer.lock

@@ -95,7 +95,8 @@ public static function forTree(
     string $source_root,
     self::TCodegenConfig $config,
   ): Codegen {
-    return new self(TreeParser::FromPath($source_root), $config);
+    return
+      new self(\HH\Asio\join(TreeParser::fromPathAsync($source_root)), $config);
   }
 
   <<__Memoize>>

src/Codegen.php

@@ -11,11 +11,11 @@
 namespace Facebook\HackRouter\PrivateImpl;
 
 use type Facebook\DefinitionFinder\BaseParser;
-use type Facebook\DefinitionFinder\ScannedBasicClass;
 use type Facebook\DefinitionFinder\ScannedClass;
+use type Facebook\DefinitionFinder\ScannedClassish;
 
 final class ClassFacts {
-  private ImmMap<string, ScannedClass> $classes;
+  private ImmMap<string, ScannedClassish> $classes;
 
   public function __construct(
     BaseParser $parser,
@@ -36,10 +36,10 @@ public function __construct(
 
   public function getSubclassesOf<T>(
     classname<T> $wanted,
-  ): ImmMap<classname<T>, ScannedBasicClass> {
+  ): ImmMap<classname<T>, ScannedClass> {
     $mappable = Map { };
     foreach ($this->classes as $class) {
-      if (!$class instanceof ScannedBasicClass) {
+      if (!$class instanceof ScannedClass) {
         continue;
       }
       $name = $this->asClassname($wanted, $class->getName());

src/privateimpl/ClassFacts.php

@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter\PrivateImpl;
 
-use type \Facebook\DefinitionFinder\ScannedBasicClass;
 use type \Facebook\DefinitionFinder\ScannedClass;
+use type \Facebook\DefinitionFinder\ScannedClassish;
 use type \Facebook\HackRouter\{
   HttpMethod,
   IncludeInUriMap,
@@ -41,9 +41,9 @@ public function getControllers(
 
   <<TestsBypassVisibility>>
   private function isUriMappable(
-    ScannedClass $class
+    ScannedClassish $class
   ): bool {
-    if (!$class instanceof ScannedBasicClass) {
+    if (!$class instanceof ScannedClass) {
       return false;
     }
     if ($class->isAbstract()) {