Code fixes for 4.0 compatibiltiy

Author: fredemmott

examples/dorm/CodegenDorm.php

@@ -57,8 +57,8 @@ public function generate(): void {
       );
 
     $rc = new \ReflectionClass(\get_class($this->schema));
-    $path = $rc->getFileName();
-    $pos = \strrpos($path, '/');
+    $path = $rc->getFileName() as string;
+    $pos = \strrpos((string) $path, '/');
     $dir = \substr($path, 0, $pos + 1);
     $gen_from = 'codegen.php '.$this->getSchemaName().'Schema';
 

examples/dorm/CodegenMutator.php

@@ -55,7 +55,7 @@ public function generate(): void {
       ->addMethods($this->getSetters());
 
     $rc = new \ReflectionClass(\get_class($this->schema));
-    $path = $rc->getFileName();
+    $path = $rc->getFileName() as string;
     $pos = \strrpos($path, '/');
     $dir = \substr($path, 0, $pos + 1);
     $gen_from = 'codegen.php '.$rc->getShortName();

src/CodegenFile.php

@@ -444,7 +444,7 @@ private function loadExistingFiles(): ?string {
     foreach ($file_names as $file_name) {
       if (\file_exists($file_name)) {
         $content = Filesystem::readFile($file_name);
-        if ($content) {
+        if ($content !== '') {
           $root_dir = $this->config->getRootDir();
           $relative_path = Str\starts_with($file_name, $root_dir)
             ? Str\slice($file_name, Str\length($root_dir) + 1)

src/HackfmtFormatter.php

@@ -54,9 +54,9 @@ public function format(
   private function getFormattedOptions(): string {
     $options = vec[
       '--indent-width',
-      $this->config->getSpacesPerIndentation(),
+      (string) $this->config->getSpacesPerIndentation(),
       '--line-width',
-      $this->config->getMaxLineLength(),
+      (string) $this->config->getMaxLineLength(),
     ];
 
     if ($this->config->shouldUseTabs()) {

src/PartiallyGeneratedCode.php

@@ -189,7 +189,7 @@ private function iterateCodeSections(
         "The manual section ".$current_id." was not closed at the end of code",
       );
     }
-    if ($code) {
+    if ($code !== '') {
       yield tuple(null, \implode("\n", $chunk));
     }
   }

src/_Private/strip_hh_prefix.php

@@ -47,7 +47,7 @@ function strip_hh_prefix(
   for ($i = 0; $i < $len; ++$i) {
     $prev = $c;
     $c = $str[$i];
-    if ($in_literal) {
+    if ($in_literal !== '') {
       if ($c === '\\') {
         $out .= $c;
         ++$i;

tests/CodegenExpectedFile.php

@@ -38,7 +38,7 @@ final class CodegenExpectedFile {
    */
   public static function getPath(string $class_name): string {
     $ref = new \ReflectionClass($class_name);
-    $source_file = $ref->getFileName();
+    $source_file = (string) $ref->getFileName();
     // Get classname without namespace
     $class_name = $ref->getShortName();
     return \dirname($source_file).'/'.$class_name.self::EXTENSION;