Fix dependency on namespace fallback in dorm codegen

Author: fredemmott

.travis.sh

@@ -21,7 +21,7 @@ if !(hhvm --version | grep -q -- -dev); then
   vendor/bin/hhast-lint
 fi
 
-hhvm examples/dorm/codegen.php examples/dorm/demo/DormUserSchema.php
+hhvm examples/dorm/codegen.hack examples/dorm/demo/DormUserSchema.php
 if ! git diff --exit-code examples/; then
   echo "Demo codegen not up to date."
   exit 1

examples/dorm/CodegenDorm.php

@@ -60,7 +60,7 @@ public function generate(): void {
     $path = $rc->getFileName() as string;
     $pos = \strrpos((string) $path, '/');
     $dir = \substr($path, 0, $pos + 1);
-    $gen_from = 'codegen.php '.$this->getSchemaName().'Schema';
+    $gen_from = 'codegen.hack '.$this->getSchemaName().'Schema';
 
     // This generates a file (we pass the file name) that contains the
     // class defined above and saves it.

examples/dorm/README.md

@@ -10,7 +10,7 @@ DORM stands for Demo ORM, and although it actually works, it is not indendeed fo
 1. ** Optional ** If you want to try running the generated code (as opposed to just generating the code), you'll need to set up the database:
   1. Using your favorite database, create the "user" table with the schema shown in demo_usage.php
   2. In file DemoUserSchema.php, change the getDsn method to return the DSN pointing to your database.
-2. To generate the code, run: php codegen.php demo/DormUserSchema.php.  This will generate the files DormUser.php and DormUserMutator.php. Take a look a the generated code!
+2. To generate the code, run: `codegen.hack demo/DormUserSchema.php`.  This will generate the files DormUser.php and DormUserMutator.php. Take a look a the generated code!
 3. If you followed step 1, run php demo/demo_usage.php to have it inserting a rown in the database.
 
 Here are a few things that you can try out to better understand the code generation:

examples/dorm/codegen.hack

@@ -0,0 +1,63 @@
+#!/usr/bin/env hhvm
+/*
+ *  Copyright (c) 2015-present, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ *
+ */
+
+namespace Facebook\HackCodegen;
+
+use namespace HH\Lib\{C, Vec};
+
+require_once(__DIR__.'/../../vendor/hh_autoload.hh');
+
+final class DormCodegenCLI extends \Facebook\CLILib\CLIWithRequiredArguments {
+  <<__Override>>
+  public static function getHelpTextForRequiredArguments(): vec<string> {
+    return vec['FILENAME'];
+  }
+
+  <<__Override>>
+  protected function getSupportedOptions(
+  ): vec<\Facebook\CLILib\CLIOptions\CLIOption> {
+    return vec[];
+  }
+
+  <<__Override>>
+  public async function mainAsync(): Awaitable<int> {
+    $fname = C\firstx($this->getArguments());
+    if (!\file_exists($fname)) {
+      await $this->getStderr()
+        ->writeAsync("  File doesn't exist: ".$fname."\n\n");
+      return 1;
+    }
+
+    $classes = \get_declared_classes();
+    require_once($fname);
+    $new_classes = Vec\diff(\get_declared_classes(), $classes);
+
+
+    foreach ($new_classes as $class_name) {
+      $ref = new \ReflectionClass($class_name);
+      if ($ref->isAbstract()) {
+        continue;
+      }
+      $instance = $ref->newInstance() as DormSchema;
+      await $this->getStdout()
+        ->writeAsync("Generating code for ".$class_name."\n");
+      (new CodegenDorm($instance))->generate();
+      (new CodegenMutator($instance))->generate();
+    }
+
+    return 0;
+  }
+}
+
+<<__EntryPoint>>
+async function dorm_codegen_cli_main(): Awaitable<noreturn> {
+  $exit_code = await DormCodegenCLI::runAsync();
+  exit($exit_code);
+}

examples/dorm/codegen.php

@@ -3,10 +3,10 @@
  * This file is partially generated. Only make modifications between BEGIN
  * MANUAL SECTION and END MANUAL SECTION designators.
  *
- * To re-generate this file run codegen.php DormUserSchema
+ * To re-generate this file run codegen.hack DormUserSchema
  *
  *
- * @partially-generated SignedSource<<9e4466dec9ad5e268b1df61c65b84fd3>>
+ * @partially-generated SignedSource<<bb328713820ebe866a4e0292daa0a4de>>
  */
 use namespace Facebook\TypeAssert;
 

examples/dorm/demo/DormUser.php

@@ -30,7 +30,7 @@
  *  );
  *
  * Before trying this example, you'll need to generate the code by running
- * php codegen.php demo/DormUserSchema.php.
+ * php codegen.hack demo/DormUserSchema.php.
  */
 $id = DormUserMutator::create()
  ->setFirstName('John')