Stop depending on namespace fallback for functions and constants

These changes generated by HHAST.

Author: fredemmott

.hhconfig

@@ -1,5 +1,7 @@
 assume_php=false
-enable_experimental_tc_features = safe_pass_by_ref, safe_array, safe_vector_array, contextual_inference
+enable_experimental_tc_features = no_fallback_in_namespaces
+safe_array = true
+safe_vector_array = true
 
 # ignore HHAST as:
 # - otherwise, we get a circular dependency

examples/dorm/CodegenDorm.php

@@ -50,10 +50,10 @@ public function generate(): void {
       ->addMethods($this->getGetters())
       ->addTypeConst('TData', $this->getDatabaseRowShape()->render());
 
-    $rc = new \ReflectionClass(get_class($this->schema));
+    $rc = new \ReflectionClass(\get_class($this->schema));
     $path = $rc->getFileName();
-    $pos = strrpos($path, '/');
-    $dir = substr($path, 0, $pos + 1);
+    $pos = \strrpos($path, '/');
+    $dir = \substr($path, 0, $pos + 1);
     $gen_from = 'codegen.php '.$this->getSchemaName().'Schema';
 
     // This generates a file (we pass the file name) that contains the

examples/dorm/CodegenMutator.php

@@ -54,10 +54,10 @@ public function generate(): void {
       ->addMethod($this->getCheckRequiredFieldsMethod())
       ->addMethods($this->getSetters());
 
-    $rc = new \ReflectionClass(get_class($this->schema));
+    $rc = new \ReflectionClass(\get_class($this->schema));
     $path = $rc->getFileName();
-    $pos = strrpos($path, '/');
-    $dir = substr($path, 0, $pos + 1);
+    $pos = \strrpos($path, '/');
+    $dir = \substr($path, 0, $pos + 1);
     $gen_from = 'codegen.php '.$rc->getShortName();
 
     // This generates a file (we pass the file name) that contains the

src/BaseCodeBuilder.php

@@ -66,24 +66,24 @@ final public function addvf(string $code, array<mixed> $args): this {
     if ($code === null) {
       return $this;
     }
-    $code = vsprintf($code, $args);
+    $code = \vsprintf($code, $args);
 
     // break into lines and add one by one to handle indentation
     $lines = Str\split($code, "\n");
-    $last_line = array_pop(&$lines);
+    $last_line = \array_pop(&$lines);
     foreach ($lines as $line) {
       $this->addLine($line);
     }
 
-    if (trim($last_line) === '') {
+    if (\trim($last_line) === '') {
       return $this;
     }
 
     // if we're in a new line, insert indentation
     if ($this->isNewLine) {
       if ($this->indentationLevel !== 0) {
         $n = $this->config->getSpacesPerIndentation() * $this->indentationLevel;
-        $this->code->append(str_repeat(' ', $n));
+        $this->code->append(\str_repeat(' ', $n));
       }
       $this->isNewLine = false;
     }
@@ -184,7 +184,7 @@ final public function addWithSuggestedLineBreaksf(
     SprintfFormatString $code,
     mixed ...$args
   ): this {
-    return $this->addWithSuggestedLineBreaks(vsprintf($code, $args));
+    return $this->addWithSuggestedLineBreaks(\vsprintf($code, $args));
   }
 
   /**
@@ -206,8 +206,8 @@ final public function addWithSuggestedLineBreaks(?string $code): this {
       return $this;
     }
 
-    if (count(debug_backtrace()) > 30) {
-      hphpd_break();
+    if (\count(\debug_backtrace()) > 30) {
+      \hphpd_break();
     }
 
     // If there's more than 1 line, add them 1 by 1
@@ -228,7 +228,7 @@ final public function addWithSuggestedLineBreaks(?string $code): this {
       $max_length = $max_length - 2;
     }
 
-    $lines_with_sugg_breaks = explode(self::DELIMITER, $code);
+    $lines_with_sugg_breaks = \explode(self::DELIMITER, $code);
     $final_lines = vec[];
     foreach ($lines_with_sugg_breaks as $line) {
       if (!$line) {
@@ -242,7 +242,7 @@ final public function addWithSuggestedLineBreaks(?string $code): this {
         $last_line = C\lastx($final_lines);
         $final_lines = Vec\take($final_lines, C\count($final_lines) - 1);
         $composite_line = $last_line.' '.$line;
-        if (strlen($composite_line) > $max_length) {
+        if (\strlen($composite_line) > $max_length) {
           $final_lines[] = $last_line;
           $final_lines[] = $line;
         } else {
@@ -251,7 +251,7 @@ final public function addWithSuggestedLineBreaks(?string $code): this {
         }
       }
     }
-    return $this->add(implode("\n  ", $final_lines));
+    return $this->add(\implode("\n  ", $final_lines));
   }
 
   /**
@@ -276,8 +276,8 @@ final protected static function checkIfLineIsTooLong(
     int $max_length,
   ): bool {
     $line_too_long = false;
-    foreach (explode("\n", $code) as $line) {
-      if (strlen($line) > $max_length) {
+    foreach (\explode("\n", $code) as $line) {
+      if (\strlen($line) > $max_length) {
         $line_too_long = true;
         break;
       }

src/CodegenClass.php

@@ -48,7 +48,7 @@ public function setExtends(string $name): this {
   }
 
   public function setExtendsf(SprintfFormatString $name, mixed ...$args): this {
-    $this->extendsClass = vsprintf($name, $args);
+    $this->extendsClass = \vsprintf($name, $args);
     return $this;
   }
 
@@ -101,11 +101,11 @@ public function addConstructorWrapperFunc(
       $re = '/\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/';
       foreach ($param_full as $str) {
         $matches = array();
-        if (preg_match_all($re, $str, &$matches)) {
+        if (\preg_match_all($re, $str, &$matches)) {
           $param_names = Vec\concat($param_names, $matches[0]);
         }
       }
-      $params_str = implode(', ', $param_names);
+      $params_str = \implode(', ', $param_names);
       $body = 'return new '.$this->getName().'('.$params_str.');';
 
       $this->wrapperFunc = (

src/CodegenClassBase.php

@@ -69,7 +69,7 @@ public function addGenericf(
     SprintfFormatString $format,
     mixed ...$args
   ): this {
-    $this->addGenerics(vsprintf($format, $args));
+    $this->addGenerics(\vsprintf($format, $args));
     return $this;
   }
 
@@ -109,7 +109,7 @@ protected function getTraits(): vec<string> {
       $this->traits,
       $trait ==> {
         $name = $trait->getName();
-        return strstr($name, '<', true) ?: $name;
+        return \strstr($name, '<', true) ?: $name;
       },
     );
   }
@@ -146,7 +146,7 @@ public function addPartiallyAbstractTypeConst(
     ?string $comment = null,
   ): this {
     return $this->addConst(
-      sprintf('type %s as %s', $name, $constraint),
+      \sprintf('type %s as %s', $name, $constraint),
       $type,
       $comment,
       HackBuilderValues::literal(),
@@ -159,7 +159,7 @@ public function addAbstractTypeConst(
     ?string $comment = null,
   ): this {
     return $this->addAbstractConst(
-      sprintf('type %s as%s%s', $name, HackBuilder::DELIMITER, $type),
+      \sprintf('type %s as%s%s', $name, HackBuilder::DELIMITER, $type),
       $comment,
     );
   }
@@ -170,8 +170,8 @@ public function addClassNameConst(
     ?string $comment = null,
   ): this {
     return $this->addConst(
-      sprintf('classname<%s> %s', $type, $name),
-      sprintf('%s::class', $type),
+      \sprintf('classname<%s> %s', $type, $name),
+      \sprintf('%s::class', $type),
       $comment,
       HackBuilderValues::literal(),
     );
@@ -183,7 +183,7 @@ public function addAbstractClassNameConst(
     ?string $comment = null,
   ): this {
     return $this->addAbstractConst(
-      sprintf('classname<%s> %s', $type, $name),
+      \sprintf('classname<%s> %s', $type, $name),
       $comment,
     );
   }
@@ -278,7 +278,7 @@ protected function buildGenericsDeclaration(): string {
         $$,
         $decl ==> '    '.$decl.",\n",
       )
-      |> implode("", $$)
+      |> \implode("", $$)
       |> Str\strip_suffix($$, ",\n")
       |> "\n  <\n".$$."\n  >";
   }
@@ -375,10 +375,10 @@ public function appendToBuilder(HackBuilder $builder): HackBuilder {
     $generated_from =
       $this->generatedFrom ? $this->generatedFrom->render() : null;
 
-    $doc_block_parts = array_filter(array($this->docBlock, $generated_from));
+    $doc_block_parts = \array_filter(array($this->docBlock, $generated_from));
 
     if ($doc_block_parts) {
-      $builder->addDocBlock(implode("\n\n", $doc_block_parts));
+      $builder->addDocBlock(\implode("\n\n", $doc_block_parts));
     }
 
     $wrapper_func = $this->wrapperFunc;
@@ -433,7 +433,7 @@ public function getImplements(): vec<string> {
       $this->interfaces,
       $interface ==> {
         $name = $interface->getName();
-        return strstr($name, '<', true) ?: $name;
+        return \strstr($name, '<', true) ?: $name;
       },
     );
   }

src/CodegenFactoryTrait.php

@@ -27,7 +27,7 @@ final public function codegenFilef(
     SprintfFormatString $format,
     mixed ...$args
   ): CodegenFile {
-    return $this->codegenFile(vsprintf($format, $args));
+    return $this->codegenFile(\vsprintf($format, $args));
   }
 
   final public function codegenFunction(string $name): CodegenFunction {
@@ -38,7 +38,7 @@ final public function codegenFunctionf(
     SprintfFormatString $format,
     mixed ...$args
   ): CodegenFunction {
-    return $this->codegenFunction(vsprintf($format, $args));
+    return $this->codegenFunction(\vsprintf($format, $args));
   }
 
   final public function codegenClass(string $name): CodegenClass {
@@ -49,7 +49,7 @@ final public function codegenClassf(
     SprintfFormatString $format,
     mixed ...$args
   ): CodegenClass {
-    return $this->codegenClass(vsprintf($format, $args));
+    return $this->codegenClass(\vsprintf($format, $args));
   }
 
   final public function codegenEnum(
@@ -75,7 +75,7 @@ final public function codegenMethodf(
     SprintfFormatString $format,
     mixed ...$args
   ): CodegenMethod {
-    return $this->codegenMethod(vsprintf($format, $args));
+    return $this->codegenMethod(\vsprintf($format, $args));
   }
 
   final public function codegenHackBuilder(): HackBuilder {
@@ -102,7 +102,7 @@ final public function codegenPropertyf(
     SprintfFormatString $format,
     mixed ...$args
   ): CodegenProperty {
-    return $this->codegenProperty(vsprintf($format, $args));
+    return $this->codegenProperty(\vsprintf($format, $args));
   }
 
   final public function codegenUsesTrait(string $name): CodegenUsesTrait {
@@ -147,7 +147,7 @@ final public function codegenGeneratedFromScript(
     ?string $script = null,
   ): CodegenGeneratedFrom {
     if ($script === null) {
-      $trace = debug_backtrace();
+      $trace = \debug_backtrace();
       $last = C\lastx($trace);
       invariant(
         $last !== false,

src/CodegenFile.php

@@ -177,7 +177,7 @@ public function getRelativeFileName(): string {
   }
 
   public function exists(): bool {
-    return file_exists($this->fileName);
+    return \file_exists($this->fileName);
   }
 
   /**
@@ -235,7 +235,7 @@ private function getFileTypeDeclaration(): string {
    *     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;
@@ -245,7 +245,7 @@ public function setShebangLinef(
     SprintfFormatString $format,
     mixed ...$args
   ): this {
-    return $this->setShebangLine(vsprintf($format, $args));
+    return $this->setShebangLine(\vsprintf($format, $args));
   }
 
   /**
@@ -263,7 +263,7 @@ public function setPseudoMainHeaderf(
     SprintfFormatString $format,
     mixed ...$args
   ): this {
-    return $this->setPseudoMainHeader(vsprintf($format, $args));
+    return $this->setPseudoMainHeader(\vsprintf($format, $args));
   }
 
   /**
@@ -281,7 +281,7 @@ public function setPseudoMainFooterf(
     SprintfFormatString $format,
     mixed ...$args
   ): this {
-    return $this->setPseudoMainFooter(vsprintf($format, $args));
+    return $this->setPseudoMainFooter(\vsprintf($format, $args));
   }
 
   private function assertNotHackStrictForExecutable(): void {
@@ -378,7 +378,7 @@ private function getContent(): string {
       $this->fileNamespace,
     );
 
-    $get_use_statement = ($type, $ns, $as) ==> sprintf(
+    $get_use_statement = ($type, $ns, $as) ==> \sprintf(
       'use %s %s%s;',
       $type,
       $ns,
@@ -452,7 +452,7 @@ private function loadExistingFiles(): ?string {
     $file_names[] = $this->fileName;
     $all_content = array();
     foreach ($file_names as $file_name) {
-      if (file_exists($file_name)) {
+      if (\file_exists($file_name)) {
         $content = Filesystem::readFile($file_name);
         if ($content) {
           $root_dir = $this->config->getRootDir();
@@ -472,7 +472,7 @@ private function loadExistingFiles(): ?string {
         $all_content[] = $content;
       }
     }
-    return implode('', $all_content);
+    return \implode('', $all_content);
   }
 
   public function setGeneratedFrom(CodegenGeneratedFrom $from): this {
@@ -544,10 +544,10 @@ public function createOnly(): this {
    */
   public function save(): CodegenFileResult {
     Filesystem::createDirectory(
-      substr($this->fileName, 0, strrpos($this->fileName, '/')),
+      \substr($this->fileName, 0, \strrpos($this->fileName, '/')),
       0777,
     );
-    $is_creating = !file_exists($this->fileName);
+    $is_creating = !\file_exists($this->fileName);
     if (!$is_creating && $this->createOnly) {
       return CodegenFileResult::NONE;
     }
@@ -573,7 +573,7 @@ final class CodegenFileBadSignatureException
   extends CodegenFileSignatureException {
 
   public function __construct(string $file_name) {
-    $message = sprintf(
+    $message = \sprintf(
       'The signature of the existing generated file \'%s\' is invalid',
       $file_name,
     );
@@ -585,7 +585,7 @@ final class CodegenFileNoSignatureException
   extends CodegenFileSignatureException {
 
   public function __construct(string $file_name) {
-    $message = sprintf(
+    $message = \sprintf(
       'The existing generated file \'%s\' does not have a signature',
       $file_name,
     );