diff --git a/phpunit/src/TranslatorInstanceTest.php b/phpunit/src/TranslatorInstanceTest.php new file mode 100644 index 00000000..c4ede3f5 --- /dev/null +++ b/phpunit/src/TranslatorInstanceTest.php @@ -0,0 +1,19 @@ +detectPlatform(); + self::$instance = $this; + } + + public static function getInstance(): Translator + { + if (self::$instance === null) { + self::$instance = new self(TYPEPHP_ROOT_PATH); + } + return self::$instance; } protected function loadInternalConstants(): array diff --git a/src/compiler.php b/src/compiler.php index c03e2fce..6629841f 100644 --- a/src/compiler.php +++ b/src/compiler.php @@ -53,9 +53,7 @@ function main(int $argc, array $argv): void return; } - global $translator; - - $translator = new Translator(TYPEPHP_ROOT_PATH); + $translator = Translator::getInstance(); $translator->setIndent(' '); // Scan all PHP files and preprocess them. $files = $translator->prepare($translator->parseArgv($argv)); diff --git a/src/gen_stub.php b/src/gen_stub.php index 1aa274a3..97aeb91d 100755 --- a/src/gen_stub.php +++ b/src/gen_stub.php @@ -120,8 +120,7 @@ function processStubFile(string $stubFile, Context $context, bool $includeOnly = } if (!$includeOnly) { - global $translator; - $stubFilenameWithoutExtension = $translator->getArgInfoStubFilename($stubFile); + $stubFilenameWithoutExtension = getTranslator()->getArgInfoStubFilename($stubFile); $arginfoFile = $context->objectFile; $legacyFile = "{$stubFilenameWithoutExtension}_legacy_arginfo.h"; @@ -6817,8 +6816,7 @@ function normalizeConstExprValue(mixed $constValue): mixed function getTranslator(): Translator { - global $translator; - return $translator; + return Translator::getInstance(); } /**