Typecheck with enable_strict_string_concat_interp (#139)

* Typecheck with enable_strict_string_concat_interp
Dependencies not ready yet, so CI will fail.

* Make CI green for merging

* Fix manual edit to codegenned file

Author: lexidor

.hhconfig

@@ -13,3 +13,4 @@ disallow_array_literal = true
 disallow_silence = true
 allowed_decl_fixme_codes=2053,4045
 allowed_fixme_codes_strict=2011,2049,2050,2053,4027,4045,4106,4107,4108,4110,4128,4135,4188,4240,4323,4390,4401
+; enable_strict_string_concat_interp = true

examples/dorm/CodegenMutator.php

@@ -179,7 +179,7 @@ private function getSaveMethod(): CodegenMethod {
         HackBuilderValues::literal(),
       )
       ->addLinef(
-        '$st = \'update %s set \'.implode(\',\', $pairs).\' where %s=\'.$this->id;',
+        '$st = \'update %s set \'.implode(\',\', $pairs).\' where %s=\'.$id;',
         $this->schema->getTableName(),
         $this->schema->getIdField(),
       )

examples/dorm/demo/DormUser.php

@@ -53,8 +53,7 @@ public function getBirthday(): ?DateTime {
   public function getCountryId(): ?int {
     /* BEGIN MANUAL SECTION CountryId */
     // You may manually change this section of code
-    $value = $this->data['country_id'] ?? null;
-    return $value;
+    return $this->data['country_id'] ?? null;
     /* END MANUAL SECTION */
   }
 

examples/dorm/demo/DormUserMutator.php

@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.php DormUserSchema
  *
  *
- * @partially-generated SignedSource<<cdbb99cace41afb39438c6b6a0ed401f>>
+ * @partially-generated SignedSource<<cfcc245af5ac1dc449999b80c6e0ecef>>
  */
 
 final class DormUserMutator {
@@ -47,7 +47,7 @@ public function save(): int {
       return (int) $conn->lastInsertId();
     } else {
       $pairs = $quoted->mapWithKey(($field, $value) ==>  $field.'='.$value);
-      $st = 'update user set '.implode(',', $pairs).' where user_id='.$this->id;
+      $st = 'update user set '.implode(',', $pairs).' where user_id='.$id;
       $conn->exec($st);
       return $id;
     }

src/CodegenClassConstant.hack

@@ -71,9 +71,9 @@ final class CodegenClassConstant extends CodegenConstantish {
       ->ensureNewLine()
       ->addIf($abstract, 'abstract ')
       ->add('const ')
-      ->addIf($type !== null, $type.' ')
+      ->addIf($type !== null, ($type ?? '').' ')
       ->add($this->getName())
-      ->addIf($value !== null, ' = '.$value)
+      ->addIf($value !== null, ' = '.($value ?? ''))
       ->addLine(';');
   }
 }

src/CodegenConstant.hack

@@ -57,7 +57,7 @@ final class CodegenConstant
 			->addDocBlock($this->getDocBlock())
 			->ensureNewLine()
 			->add('const ')
-			->addIf($type !== null, $type.' ')
+			->addIf($type !== null, ($type ?? '').' ')
 			->add($this->getName())
 			->add(' = '.$value)
 			->addLine(';');

src/CodegenFile.hack

@@ -336,7 +336,7 @@ final class CodegenFile {
       if ($doc_block !== null && !Str\ends_with($doc_block, "\n")) {
         $doc_block .= "\n";
       }
-      $doc_block = $doc_block.$gen_from->render()."\n";
+      $doc_block = ($doc_block ?? '').$gen_from->render()."\n";
     }
 
     $formatter = $this->config->getFormatter();

src/CodegenFunctionish.hack

@@ -151,7 +151,7 @@ abstract class CodegenFunctionish implements ICodeBuilderRenderer {
     $builder = (new HackBuilder($this->config))
       ->add($keywords)
       ->addf('%s(%s)', $this->name, Str\join($this->parameters, ', '))
-      ->addIf($this->returnType !== null, ': '.$this->returnType);
+      ->addIf($this->returnType !== null, ': '.($this->returnType ?? ''));
 
     $code = $builder->getCode();
 
@@ -183,7 +183,7 @@ abstract class CodegenFunctionish implements ICodeBuilderRenderer {
         ->addLines($parameter_lines)
         ->unindent()
         ->add(')')
-        ->addIf($this->returnType !== null, ': '.$this->returnType);
+        ->addIf($this->returnType !== null, ': '.($this->returnType ?? ''));
 
       return $multi_line_builder->getCode();
     }

src/CodegenProperty.hack

@@ -96,9 +96,9 @@ final class CodegenProperty implements ICodeBuilderRenderer {
       ->addInlineComment($this->comment)
       ->add($this->getVisibility().' ')
       ->addIf($this->isStatic, 'static ')
-      ->addIf($this->type !== null, $this->type.' ')
+      ->addIf($this->type !== null, ($this->type ?? '').' ')
       ->add('$'.$this->name)
-      ->addIf($this->value !== null, ' = '.$value)
+      ->addIf($this->value !== null, ' = '.($value ?? ''))
       ->addLine(';');
   }
 

src/CodegenTypeConstant.hack

@@ -72,8 +72,8 @@ final class CodegenTypeConstant
       ->addIf($abstract, 'abstract ')
       ->add('const type ')
       ->add($this->getName())
-      ->addIf($constraint !== null, ' '.$constraint)
-      ->addIf($value !== null, ' = '.$value)
+      ->addIf($constraint !== null, ' '.($constraint ?? ''))
+      ->addIf($value !== null, ' = '.($value ?? ''))
       ->addLine(';');
   }
 }