Use optimized sprintf (#46)

Jean-Beru · web-flow · commit ba2e329f78d6 · 2024-08-05T10:34:54.000+02:00
diff --git a/src/AssetMapper/TypeScriptCompiler.php b/src/AssetMapper/TypeScriptCompiler.php
@@ -34,7 +34,7 @@ public function supports(MappedAsset $asset): bool
         foreach ($this->typeScriptFilesPaths as $path) {
             $realTypeScriptPath = realpath($path);
             if (false === $realTypeScriptPath) {
-                throw new \Exception(sprintf('The TypeScript directory "%s" does not exist', $path));
+                throw new \Exception(\sprintf('The TypeScript directory "%s" does not exist', $path));
             }
             // If the asset matches one of the TypeScript files source paths
             if ($realSourcePath === $realTypeScriptPath) {
@@ -46,19 +46,19 @@ public function supports(MappedAsset $asset): bool
             }
         }
 
-        throw new \Exception(sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $realSourcePath));
+        throw new \Exception(\sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $realSourcePath));
     }
 
     public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
     {
         $realSourcePath = realpath($asset->sourcePath);
         if (false === $realSourcePath) {
-            throw new \Exception(sprintf('The TypeScript file "%s" does not exist', $asset->sourcePath));
+            throw new \Exception(\sprintf('The TypeScript file "%s" does not exist', $asset->sourcePath));
         }
         foreach ($this->typeScriptFilesPaths as $typeScriptFilesPath) {
             $realTypeScriptPath = realpath($typeScriptFilesPath);
             if (false === $realTypeScriptPath) {
-                throw new \Exception(sprintf('The TypeScript directory "%s" does not exist', $typeScriptFilesPath));
+                throw new \Exception(\sprintf('The TypeScript directory "%s" does not exist', $typeScriptFilesPath));
             }
             if (str_starts_with($realSourcePath, $realTypeScriptPath)) {
                 $fileName = basename($realSourcePath, '.ts');
@@ -69,7 +69,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
         }
 
         if (!isset($jsFile)) {
-            throw new \Exception(sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $asset->sourcePath));
+            throw new \Exception(\sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $asset->sourcePath));
         }
         $asset->addFileDependency($jsFile);
 
diff --git a/src/Tools/TypeScriptBinary.php b/src/Tools/TypeScriptBinary.php
@@ -10,7 +10,7 @@ public function __construct(
         private readonly string $pathToExecutable,
     ) {
         if (!file_exists($this->pathToExecutable)) {
-            throw new \Exception(sprintf('The Typescript binary could not be found at the provided path : "%s"', $this->pathToExecutable));
+            throw new \Exception(\sprintf('The Typescript binary could not be found at the provided path : "%s"', $this->pathToExecutable));
         }
     }
 
diff --git a/src/Tools/TypeScriptBinaryFactory.php b/src/Tools/TypeScriptBinaryFactory.php
@@ -64,7 +64,7 @@ public static function getBinaryNameFromServerSpecs(
                 return 'swc-darwin-x64';
             }
 
-            throw new \Exception(sprintf('No matching machine found for Darwin platform (Machine: %s).', $machine));
+            throw new \Exception(\sprintf('No matching machine found for Darwin platform (Machine: %s).', $machine));
         }
 
         if (str_contains($os, 'linux')) {
@@ -76,7 +76,7 @@ public static function getBinaryNameFromServerSpecs(
                 return 'swc-linux-x64-'.$kernelVersion;
             }
 
-            throw new \Exception(sprintf('No matching machine found for Linux platform (Machine: %s).', $machine));
+            throw new \Exception(\sprintf('No matching machine found for Linux platform (Machine: %s).', $machine));
         }
 
         if (str_contains($os, 'win')) {
@@ -90,10 +90,10 @@ public static function getBinaryNameFromServerSpecs(
                 return 'swc-win32-ia32-msvc.exe';
             }
 
-            throw new \Exception(sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));
+            throw new \Exception(\sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));
         }
 
-        throw new \Exception(sprintf('Unknown platform or architecture (OS: %s, Machine: %s).', $os, $machine));
+        throw new \Exception(\sprintf('Unknown platform or architecture (OS: %s, Machine: %s).', $os, $machine));
     }
 
     private function downloadAndExtract(string $binaryName): void
@@ -105,10 +105,10 @@ private function downloadAndExtract(string $binaryName): void
         if (file_exists($targetPath)) {
             return;
         }
-        $url = sprintf(self::SWC_RELEASE_URL_PATTERN, self::VERSION, $binaryName);
+        $url = \sprintf(self::SWC_RELEASE_URL_PATTERN, self::VERSION, $binaryName);
 
         if ($this->output->isVerbose()) {
-            $this->output->note(sprintf('Downloading SWC binary from "%s" to "%s"...', $url, $targetPath));
+            $this->output->note(\sprintf('Downloading SWC binary from "%s" to "%s"...', $url, $targetPath));
         } else {
             $this->output->note('Downloading SWC binary ...');
         }
@@ -128,7 +128,7 @@ private function downloadAndExtract(string $binaryName): void
         ]);
         $fileHandler = fopen($targetPath, 'w');
         if (false === $fileHandler) {
-            throw new \Exception(sprintf('Could not open file "%s" for writing.', $targetPath));
+            throw new \Exception(\sprintf('Could not open file "%s" for writing.', $targetPath));
         }
         foreach ($this->httpClient->stream($response) as $chunk) {
             fwrite($fileHandler, $chunk->getContent());
diff --git a/src/Tools/WatcherBinaryFactory.php b/src/Tools/WatcherBinaryFactory.php
@@ -9,7 +9,7 @@ public function getBinaryFromServerSpecs(string $os): WatcherBinary
         $binaryName = self::getBinaryNameFromServerSpecs($os);
         $binaryPath = __DIR__.'/watcher/'.$binaryName;
         if (!file_exists($binaryPath)) {
-            throw new \Exception(sprintf('The watcher binary could not be found at the provided path : "%s"', $binaryPath));
+            throw new \Exception(\sprintf('The watcher binary could not be found at the provided path : "%s"', $binaryPath));
         }
 
         return new WatcherBinary($binaryPath);
@@ -28,6 +28,6 @@ public static function getBinaryNameFromServerSpecs(string $os): string
             return 'watcher-windows.exe';
         }
 
-        throw new \Exception(sprintf('Unknown platform or architecture (OS: %s).', $os));
+        throw new \Exception(\sprintf('Unknown platform or architecture (OS: %s).', $os));
     }
 }
diff --git a/src/TypeScriptBuilder.php b/src/TypeScriptBuilder.php
@@ -42,15 +42,15 @@ private function createBuildProcess(string $path, bool $watch = false): Process
         $fs = new Filesystem();
         $relativePath = rtrim($fs->makePathRelative($path, $this->projectRootDir), '/');
         if (str_starts_with($relativePath, '..')) {
-            throw new \Exception(sprintf('The TypeScript file "%s" is not in the project directory "%s".', $path, $this->projectRootDir));
+            throw new \Exception(\sprintf('The TypeScript file "%s" is not in the project directory "%s".', $path, $this->projectRootDir));
         }
         if ($this->configFile && file_exists($this->configFile)) {
             $args = array_merge($args, ['--config-file', trim($fs->makePathRelative($this->configFile, $this->projectRootDir), '/')]);
         }
         $buildProcess = $this->getBuildBinary()->createProcess(array_merge(['compile', $relativePath], $args));
         $buildProcess->setWorkingDirectory($this->projectRootDir);
 
-        $this->output->note(sprintf('Executing SWC compile on %s.', $relativePath));
+        $this->output->note(\sprintf('Executing SWC compile on %s.', $relativePath));
         if ($this->output->isVerbose()) {
             $this->output->writeln([
                 '  Command:',

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function supports(MappedAsset $asset): bool`
`34`	`34`	`foreach ($this->typeScriptFilesPaths as $path) {`
`35`	`35`	`$realTypeScriptPath = realpath($path);`
`36`	`36`	`if (false === $realTypeScriptPath) {`
`37`		`- throw new \Exception(sprintf('The TypeScript directory "%s" does not exist', $path));`
	`37`	`+ throw new \Exception(\sprintf('The TypeScript directory "%s" does not exist', $path));`
`38`	`38`	`}`
`39`	`39`	`// If the asset matches one of the TypeScript files source paths`
`40`	`40`	`if ($realSourcePath === $realTypeScriptPath) {`
`@@ -46,19 +46,19 @@ public function supports(MappedAsset $asset): bool`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- throw new \Exception(sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $realSourcePath));`
	`49`	`+ throw new \Exception(\sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $realSourcePath));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string`
`53`	`53`	`{`
`54`	`54`	`$realSourcePath = realpath($asset->sourcePath);`
`55`	`55`	`if (false === $realSourcePath) {`
`56`		`- throw new \Exception(sprintf('The TypeScript file "%s" does not exist', $asset->sourcePath));`
	`56`	`+ throw new \Exception(\sprintf('The TypeScript file "%s" does not exist', $asset->sourcePath));`
`57`	`57`	`}`
`58`	`58`	`foreach ($this->typeScriptFilesPaths as $typeScriptFilesPath) {`
`59`	`59`	`$realTypeScriptPath = realpath($typeScriptFilesPath);`
`60`	`60`	`if (false === $realTypeScriptPath) {`
`61`		`- throw new \Exception(sprintf('The TypeScript directory "%s" does not exist', $typeScriptFilesPath));`
	`61`	`+ throw new \Exception(\sprintf('The TypeScript directory "%s" does not exist', $typeScriptFilesPath));`
`62`	`62`	`}`
`63`	`63`	`if (str_starts_with($realSourcePath, $realTypeScriptPath)) {`
`64`	`64`	`$fileName = basename($realSourcePath, '.ts');`
`@@ -69,7 +69,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (!isset($jsFile)) {`
`72`		`- throw new \Exception(sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $asset->sourcePath));`
	`72`	`+ throw new \Exception(\sprintf('The TypeScript file "%s" is not in the TypeScript files paths. Check the asset path or your "sensiolabs_typescript.source_dir" in your config', $asset->sourcePath));`
`73`	`73`	`}`
`74`	`74`	`$asset->addFileDependency($jsFile);`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public function __construct(`
`10`	`10`	`private readonly string $pathToExecutable,`
`11`	`11`	`) {`
`12`	`12`	`if (!file_exists($this->pathToExecutable)) {`
`13`		`- throw new \Exception(sprintf('The Typescript binary could not be found at the provided path : "%s"', $this->pathToExecutable));`
	`13`	`+ throw new \Exception(\sprintf('The Typescript binary could not be found at the provided path : "%s"', $this->pathToExecutable));`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function getBinaryNameFromServerSpecs(`
`64`	`64`	`return 'swc-darwin-x64';`
`65`	`65`	`}`
`66`	`66`
`67`		`- throw new \Exception(sprintf('No matching machine found for Darwin platform (Machine: %s).', $machine));`
	`67`	`+ throw new \Exception(\sprintf('No matching machine found for Darwin platform (Machine: %s).', $machine));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if (str_contains($os, 'linux')) {`
`@@ -76,7 +76,7 @@ public static function getBinaryNameFromServerSpecs(`
`76`	`76`	`return 'swc-linux-x64-'.$kernelVersion;`
`77`	`77`	`}`
`78`	`78`
`79`		`- throw new \Exception(sprintf('No matching machine found for Linux platform (Machine: %s).', $machine));`
	`79`	`+ throw new \Exception(\sprintf('No matching machine found for Linux platform (Machine: %s).', $machine));`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (str_contains($os, 'win')) {`
`@@ -90,10 +90,10 @@ public static function getBinaryNameFromServerSpecs(`
`90`	`90`	`return 'swc-win32-ia32-msvc.exe';`
`91`	`91`	`}`
`92`	`92`
`93`		`- throw new \Exception(sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));`
	`93`	`+ throw new \Exception(\sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));`
`94`	`94`	`}`
`95`	`95`
`96`		`- throw new \Exception(sprintf('Unknown platform or architecture (OS: %s, Machine: %s).', $os, $machine));`
	`96`	`+ throw new \Exception(\sprintf('Unknown platform or architecture (OS: %s, Machine: %s).', $os, $machine));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private function downloadAndExtract(string $binaryName): void`
`@@ -105,10 +105,10 @@ private function downloadAndExtract(string $binaryName): void`
`105`	`105`	`if (file_exists($targetPath)) {`
`106`	`106`	`return;`
`107`	`107`	`}`
`108`		`- $url = sprintf(self::SWC_RELEASE_URL_PATTERN, self::VERSION, $binaryName);`
	`108`	`+ $url = \sprintf(self::SWC_RELEASE_URL_PATTERN, self::VERSION, $binaryName);`
`109`	`109`
`110`	`110`	`if ($this->output->isVerbose()) {`
`111`		`- $this->output->note(sprintf('Downloading SWC binary from "%s" to "%s"...', $url, $targetPath));`
	`111`	`+ $this->output->note(\sprintf('Downloading SWC binary from "%s" to "%s"...', $url, $targetPath));`
`112`	`112`	`} else {`
`113`	`113`	`$this->output->note('Downloading SWC binary ...');`
`114`	`114`	`}`
`@@ -128,7 +128,7 @@ private function downloadAndExtract(string $binaryName): void`
`128`	`128`	`]);`
`129`	`129`	`$fileHandler = fopen($targetPath, 'w');`
`130`	`130`	`if (false === $fileHandler) {`
`131`		`- throw new \Exception(sprintf('Could not open file "%s" for writing.', $targetPath));`
	`131`	`+ throw new \Exception(\sprintf('Could not open file "%s" for writing.', $targetPath));`
`132`	`132`	`}`
`133`	`133`	`foreach ($this->httpClient->stream($response) as $chunk) {`
`134`	`134`	`fwrite($fileHandler, $chunk->getContent());`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public function getBinaryFromServerSpecs(string $os): WatcherBinary`
`9`	`9`	`$binaryName = self::getBinaryNameFromServerSpecs($os);`
`10`	`10`	`$binaryPath = __DIR__.'/watcher/'.$binaryName;`
`11`	`11`	`if (!file_exists($binaryPath)) {`
`12`		`- throw new \Exception(sprintf('The watcher binary could not be found at the provided path : "%s"', $binaryPath));`
	`12`	`+ throw new \Exception(\sprintf('The watcher binary could not be found at the provided path : "%s"', $binaryPath));`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`return new WatcherBinary($binaryPath);`
`@@ -28,6 +28,6 @@ public static function getBinaryNameFromServerSpecs(string $os): string`
`28`	`28`	`return 'watcher-windows.exe';`
`29`	`29`	`}`
`30`	`30`
`31`		`- throw new \Exception(sprintf('Unknown platform or architecture (OS: %s).', $os));`
	`31`	`+ throw new \Exception(\sprintf('Unknown platform or architecture (OS: %s).', $os));`
`32`	`32`	`}`
`33`	`33`	`}`