bug #58704 [HttpClient] fix for HttpClientDataCollector fails if proc_open is disabled via php.ini (ZaneCEO)

nicolas-grekas · nicolas-grekas · commit 224124ddaabd · 2024-10-30T22:36:33.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [HttpClient] fix for HttpClientDataCollector fails if proc_open is disabled via php.ini | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #58700 | License | MIT [HttpClientDataCollector::escapePayload](https://github.com/symfony/symfony/blob/7.1/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php#L256) creates a `new Process()` -> it fails if `proc_open` is disabled: > The Process class relies on proc_open, which is not available on your PHP installation. symfony/symfony#58700 Commits ------- e28af345004 [HttpClient] Fix Process-based escaping in HttpClientDataCollector 48980a2f05a fix for HttpClientDataCollector fails if proc_open is disabled via php.ini . Closes #58700
diff --git a/DataCollector/HttpClientDataCollector.php b/DataCollector/HttpClientDataCollector.php
@@ -252,8 +252,8 @@ private function escapePayload(string $payload): string
     {
         static $useProcess;
 
-        if ($useProcess ??= class_exists(Process::class)) {
-            return (new Process([$payload]))->getCommandLine();
+        if ($useProcess ??= function_exists('proc_open') && class_exists(Process::class)) {
+            return substr((new Process(['', $payload]))->getCommandLine(), 3);
         }
 
         if ('\\' === \DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -252,8 +252,8 @@ private function escapePayload(string $payload): string`
`252`	`252`	`{`
`253`	`253`	`static $useProcess;`
`254`	`254`
`255`		`- if ($useProcess ??= class_exists(Process::class)) {`
`256`		`- return (new Process([$payload]))->getCommandLine();`
	`255`	`+ if ($useProcess ??= function_exists('proc_open') && class_exists(Process::class)) {`
	`256`	`+ return substr((new Process(['', $payload]))->getCommandLine(), 3);`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`if ('\\' === \DIRECTORY_SEPARATOR) {`