fix lint (including example codegen)

examples/dorm/CodegenDorm.php

@@ -87,7 +87,7 @@ private function getConstructor(): CodegenConstructor {
   private function getLoad(): CodegenMethod {
     $sql = 'select * from '.
       $this->schema->getTableName().
-      ' where '.$this->schema->getIdField().'=".$id."';
+      ' where '.$this->schema->getIdField().'=\'.$id.\'';
 
     // Here's how to build a block of code using hack_builder.
     // Notice that some methods have a sprintf style of arguments
@@ -97,7 +97,7 @@ private function getLoad(): CodegenMethod {
     $body = $this->codegen->codegenHackBuilder()
       ->addLinef('$conn = new PDO(\'%s\');', $this->schema->getDsn())
       ->add('$cursor = ')
-      ->addMultilineCall('$conn->query', Vector {"\"".$sql."\""}, true)
+      ->addMultilineCall('$conn->query', Vector {"'".$sql."'"}, true)
       ->addLine('$result = $cursor->fetch(PDO::FETCH_ASSOC);')
       ->startIfBlock('!$result')
       ->addReturnf('null')

examples/dorm/CodegenMutator.php

@@ -165,22 +165,22 @@ private function getSaveMethod(): CodegenMethod {
       )
       ->startIfBlock('$id === null')
       ->addLine('$this->checkRequiredFields();')
-      ->addLine('$names = "(".implode(",", $quoted->keys()).")";')
-      ->addLine('$values = "(".implode(",", $quoted->values()).")";')
+      ->addLine('$names = \'(\'.implode(\',\', $quoted->keys()).\')\';')
+      ->addLine('$values = \'(\'.implode(\',\', $quoted->values()).\')\';')
       ->addLinef(
-        '$st = "insert into %s ".$names." values ".$values;',
+        '$st = \'insert into %s \'.$names.\' values \'.$values;',
         $this->schema->getTableName(),
       )
       ->addLine('$conn->exec($st);')
       ->addReturnf('(int) $conn->lastInsertId()')
       ->addElseBlock()
       ->addAssignment(
         '$pairs',
-        '$quoted->mapWithKey(($field, $value) ==>  $field."=".$value)',
+        '$quoted->mapWithKey(($field, $value) ==>  $field.\'=\'.$value)',
         HackBuilderValues::literal(),
       )
       ->addLinef(
-        '$st = "update %s set ".implode(",", $pairs)." where %s=".$this->id;',
+        '$st = \'update %s set \'.implode(\',\', $pairs).\' where %s=\'.$this->id;',
         $this->schema->getTableName(),
         $this->schema->getIdField(),
       )
@@ -219,8 +219,8 @@ private function getCheckRequiredFieldsMethod(): CodegenMethod {
         'invariant',
         Vector {
           '$missing->isEmpty()',
-          '"The following required fields are missing: %s"',
-          'implode(", ", $missing)',
+          '\'The following required fields are missing: %s\'',
+          'implode(\', \', $missing)',
         }
       );
 
@@ -234,7 +234,7 @@ private function getSetters(): Vector<CodegenMethod> {
     $methods = Vector {};
     foreach($this->schema->getFields() as $name => $field) {
       if ($field->getType() === 'DateTime') {
-        $value = '$value->format("Y-m-d")';
+        $value = '$value->format(\'Y-m-d\')';
       } else {
         $value = '$value';
       }
@@ -250,7 +250,7 @@ private function getSetters(): Vector<CodegenMethod> {
           ->addInlineComment('You may manually change this section of code');
       }
       $body
-        ->addLinef('$this->data["%s"] = %s;', $field->getDbColumn(), $value);
+        ->addLinef('$this->data[\'%s\'] = %s;', $field->getDbColumn(), $value);
 
       if ($field->isManual()) {
         // You always need to close a manual section

examples/dorm/DormCodegenCLI.hack

@@ -44,7 +44,7 @@ final class DormCodegenCLI extends \Facebook\CLILib\CLIWithRequiredArguments {
       $instance = $ref->newInstance() as DormSchema;
       /* HHAST_IGNORE_ERROR[DontAwaitInALoop] */
       await $this->getStdout()
-        ->writeAsync("Generating code for ".$class_name."\n");
+        ->writeAsync('Generating code for '.$class_name."\n");
       (new CodegenDorm($instance))->generate();
       (new CodegenMutator($instance))->generate();
     }

examples/dorm/demo/DormUser.php

@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.hack DormUserSchema
  *
  *
- * @partially-generated SignedSource<<bb328713820ebe866a4e0292daa0a4de>>
+ * @partially-generated SignedSource<<38fb8f142407a1689b579ad904452961>>
  */
 use namespace Facebook\TypeAssert;
 
@@ -25,7 +25,7 @@ private function __construct(private self::TData $data) {
 
   public static function load(int $id): ?DormUser {
     $conn = new PDO('sqlite:/path/to/database.db');
-    $cursor = $conn->query("select * from user where user_id=".$id."");
+    $cursor = $conn->query('select * from user where user_id='.$id.'');
     $result = $cursor->fetch(PDO::FETCH_ASSOC);
     if (!$result) {
       return null;

examples/dorm/demo/DormUserMutator.php

@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.php DormUserSchema
  *
  *
- * @partially-generated SignedSource<<48c599867b0b679f5bb9cf27d8801e89>>
+ * @partially-generated SignedSource<<cdbb99cace41afb39438c6b6a0ed401f>>
  */
 
 final class DormUserMutator {
@@ -40,14 +40,14 @@ public function save(): int {
     $id = $this->id;
     if ($id === null) {
       $this->checkRequiredFields();
-      $names = "(".implode(",", $quoted->keys()).")";
-      $values = "(".implode(",", $quoted->values()).")";
-      $st = "insert into user ".$names." values ".$values;
+      $names = '('.implode(',', $quoted->keys()).')';
+      $values = '('.implode(',', $quoted->values()).')';
+      $st = 'insert into user '.$names.' values '.$values;
       $conn->exec($st);
       return (int) $conn->lastInsertId();
     } else {
-      $pairs = $quoted->mapWithKey(($field, $value) ==>  $field."=".$value);
-      $st = "update user set ".implode(",", $pairs)." where user_id=".$this->id;
+      $pairs = $quoted->mapWithKey(($field, $value) ==>  $field.'='.$value);
+      $st = 'update user set '.implode(',', $pairs).' where user_id='.$this->id;
       $conn->exec($st);
       return $id;
     }
@@ -62,36 +62,36 @@ public function checkRequiredFields(): void {
     $missing = $required->removeAll($this->data->keys());;
     invariant(
       $missing->isEmpty(),
-      "The following required fields are missing: %s",
-      implode(", ", $missing),
+      'The following required fields are missing: %s',
+      implode(', ', $missing),
     );
   }
 
   public function setFirstName(string $value): this {
-    $this->data["first_name"] = $value;
+    $this->data['first_name'] = $value;
     return $this;
   }
 
   public function setLastName(string $value): this {
-    $this->data["last_name"] = $value;
+    $this->data['last_name'] = $value;
     return $this;
   }
 
   public function setBirthday(DateTime $value): this {
-    $this->data["birthday"] = $value->format("Y-m-d");
+    $this->data['birthday'] = $value->format('Y-m-d');
     return $this;
   }
 
   public function setCountryId(int $value): this {
     /* BEGIN MANUAL SECTION CountryId */
     // You may manually change this section of code
-    $this->data["country_id"] = $value;
+    $this->data['country_id'] = $value;
     /* END MANUAL SECTION */
     return $this;
   }
 
   public function setIsActive(bool $value): this {
-    $this->data["is_active"] = $value;
+    $this->data['is_active'] = $value;
     return $this;
   }
 }

examples/dorm/demo/demo_usage.php

@@ -42,11 +42,11 @@ function dorm_demo_main(): void {
     ->setIsActive(true)
     ->save();
 
-  echo "Created user with id ".$id."\n";
+  echo 'Created user with id '.$id."\n";
 
   $user = \DormUser::load($id);
   invariant($user is nonnull, 'Failed to load user');
-  echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
+  echo 'Loaded: '.$user->getFirstName().' '.$user->getLastName()."\n";
 
   \DormUserMutator::update($id)
     ->setFirstName('Peter')
@@ -56,5 +56,5 @@ function dorm_demo_main(): void {
 
   $user = \DormUser::load($id);
   invariant($user is nonnull, 'Failed to load user');
-  echo "Loaded: ".$user->getFirstName()." ".$user->getLastName()."\n";
+  echo 'Loaded: '.$user->getFirstName().' '.$user->getLastName()."\n";
 }

src/BaseCodeBuilder.hack

@@ -410,7 +410,7 @@ abstract class BaseCodeBuilder {
   final public function getCode(): string {
     invariant(
       !$this->wasGetCodeCalled,
-      "You may only call getCode() once on a given HackBuilder object.",
+      'You may only call getCode() once on a given HackBuilder object.',
     );
     $this->wasGetCodeCalled = true;
     return $this->code->detach();

src/CodegenClass.hack

@@ -153,9 +153,9 @@ final class CodegenClass extends CodegenClassish {
       $this->declComment,
       $this->isAbstract ? 'abstract ' : '',
       $this->isFinal ? 'final ' : '',
-      "class ".$this->name.$generics_dec,
+      'class '.$this->name.$generics_dec,
       $this->extendsClass !== null
-        ? HackBuilder::DELIMITER."extends ".$this->extendsClass
+        ? HackBuilder::DELIMITER.'extends '.$this->extendsClass
         : '',
     );
 

src/CodegenEnum.hack

@@ -83,9 +83,9 @@ final class CodegenEnum implements ICodeBuilderRenderer {
       ->ensureNewLine()
       ->addWithSuggestedLineBreaksf(
       '%s%s%s {',
-      "enum ".$this->name,
-      HackBuilder::DELIMITER.": ".$this->enumType,
-      $this->isAs !== null ? HackBuilder::DELIMITER."as ".$this->isAs : '',
+      'enum '.$this->name,
+      HackBuilder::DELIMITER.': '.$this->enumType,
+      $this->isAs !== null ? HackBuilder::DELIMITER.'as '.$this->isAs : '',
     );
 
     if (!C\is_empty($this->members)) {

src/CodegenFactoryTrait.hack

@@ -173,7 +173,7 @@ trait CodegenFactoryTrait implements ICodegenFactory {
     string $class,
   ): CodegenGeneratedFrom {
     return
-      new CodegenGeneratedFrom($this->getConfig(), "Generated from ".$class);
+      new CodegenGeneratedFrom($this->getConfig(), 'Generated from '.$class);
   }
 
   final public function codegenGeneratedFromMethod(
@@ -182,7 +182,7 @@ trait CodegenFactoryTrait implements ICodegenFactory {
   ): CodegenGeneratedFrom {
     return new CodegenGeneratedFrom(
       $this->getConfig(),
-      "Generated from ".$class."::".$method."()",
+      'Generated from '.$class.'::'.$method.'()',
     );
   }
 
@@ -193,7 +193,7 @@ trait CodegenFactoryTrait implements ICodegenFactory {
   ): CodegenGeneratedFrom {
     return new CodegenGeneratedFrom(
       $this->getConfig(),
-      "Generated from ".$class."::".$method."()['".$key."']",
+      'Generated from '.$class.'::'.$method."()['".$key."']",
     );
   }
 
@@ -207,13 +207,13 @@ trait CodegenFactoryTrait implements ICodegenFactory {
       invariant(
         $last !== null,
         "Couldn't get the strack trace.  Please pass the script name to ".
-        "codegenGeneratedFromScript",
+        'codegenGeneratedFromScript',
       );
       $script = $this->codegenFile($last['file'])->getRelativeFileName();
     }
     return new CodegenGeneratedFrom(
       $this->getConfig(),
-      "To re-generate this file run ".$script,
+      'To re-generate this file run '.$script,
     );
   }
 

src/CodegenFile.hack

@@ -253,7 +253,7 @@ final class CodegenFile {
    *     setShebangLine('#!/usr/bin/env hhvm')
    */
   public function setShebangLine(string $shebang): this {
-    invariant(!\strpbrk($shebang, "\n"), "Expected single line");
+    invariant(!\strpbrk($shebang, "\n"), 'Expected single line');
     invariant(Str\starts_with($shebang, '#!'), 'Shebang lines start with #!');
     $this->shebang = $shebang;
     return $this;

src/CodegenFunctionish.hack

@@ -178,7 +178,7 @@ abstract class CodegenFunctionish implements ICodeBuilderRenderer {
 
       $multi_line_builder = (new HackBuilder($this->config))
         ->add($keywords)
-        ->addLine($this->name."(")
+        ->addLine($this->name.'(')
         ->indent()
         ->addLines($parameter_lines)
         ->unindent()
@@ -224,7 +224,7 @@ abstract class CodegenFunctionish implements ICodeBuilderRenderer {
     if ($this->docBlock !== null && $this->docBlock !== '') {
       if ($this->generatedFrom) {
         $builder->addDocBlock(
-          $this->docBlock."\n(".$this->generatedFrom->render().")",
+          $this->docBlock."\n(".$this->generatedFrom->render().')',
         );
       } else {
         $builder->addDocBlock($this->docBlock);

src/CodegenShapeMember.hack

@@ -19,7 +19,7 @@
    ) {
      invariant(
        $type is string || $type is CodegenShape,
-       "You must provide either a string or shape",
+       'You must provide either a string or shape',
      );
    }
 

src/CodegenType.hack

@@ -56,15 +56,15 @@ final class CodegenType implements ICodeBuilderRenderer {
   public function appendToBuilder(HackBuilder $builder): HackBuilder {
     invariant(
       $this->type !== null || $this->codegenShape !== null,
-      "You need to set either the type or the shape",
+      'You need to set either the type or the shape',
     );
     $builder->addf('%s %s = ', $this->keyword, $this->name);
     if ($this->type !== null) {
       return $builder->add($this->type)->closeStatement();
     }
     invariant(
       $this->codegenShape !== null,
-      "Somehow the type and the shape were null!",
+      'Somehow the type and the shape were null!',
     );
     return $builder->addRenderer($this->codegenShape)->closeStatement();
   }

src/CodegenUsesTrait.hack

@@ -58,7 +58,7 @@ final class CodegenUsesTrait {
   public function render(): string {
     return (new HackBuilder($this->config))
       ->addInlineComment($this->comment)
-      ->addLinef("use %s;", $this->name)
+      ->addLinef('use %s;', $this->name)
       ->getCode();
   }
 }

src/HackBuilder.hack

@@ -73,7 +73,7 @@ final class HackBuilder extends BaseCodeBuilder {
     }
 
     $this
-      ->addWithSuggestedLineBreaks($func_call_line."(")
+      ->addWithSuggestedLineBreaks($func_call_line.'(')
       ->newLine()
       ->indent()
       ->addLinesWithSuggestedLineBreaks(Vec\map($params, $line ==> $line.','))
@@ -204,19 +204,19 @@ final class HackBuilder extends BaseCodeBuilder {
       case ContainerType::DICT:
       case ContainerType::KEYSET:
       case ContainerType::VEC:
-        $container_sign = "[";
+        $container_sign = '[';
         break;
       case ContainerType::IMM_MAP:
       case ContainerType::IMM_SET:
       case ContainerType::IMM_VECTOR:
       case ContainerType::MAP:
       case ContainerType::SET:
       case ContainerType::VECTOR:
-        $container_sign = " {";
+        $container_sign = ' {';
         break;
       case ContainerType::SHAPE_TYPE:
       case ContainerType::PHP_ARRAY:
-        $container_sign = "(";
+        $container_sign = '(';
         break;
     }
     return $this->addLine(((string)$type).$container_sign)->indent();
@@ -234,19 +234,19 @@ final class HackBuilder extends BaseCodeBuilder {
       case ContainerType::DICT:
       case ContainerType::KEYSET:
       case ContainerType::VEC:
-        $container_sign = "]";
+        $container_sign = ']';
         break;
       case ContainerType::IMM_MAP:
       case ContainerType::IMM_SET:
       case ContainerType::IMM_VECTOR:
       case ContainerType::MAP:
       case ContainerType::SET:
       case ContainerType::VECTOR:
-        $container_sign = "}";
+        $container_sign = '}';
         break;
       case ContainerType::SHAPE_TYPE:
       case ContainerType::PHP_ARRAY:
-        $container_sign = ")";
+        $container_sign = ')';
         break;
     }
     return $this->unindent()->add($container_sign);
@@ -581,7 +581,7 @@ final class HackBuilder extends BaseCodeBuilder {
     Traversable<string> $params,
   ): this {
     return $this
-      ->addLine($name."(")
+      ->addLine($name.'(')
       ->indent()
       ->addLines(Vec\map($params, $line ==> $line.','))
       ->unindent()