bug symfony#44538 [Process] fixed uppercase ARGC and ARGV should also be skipped (rbaarsma)

fabpot · fabpot · commit ac3631a9a286 · 2021-12-11T15:36:44.000+01:00
This PR was submitted for the 5.4 branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- [Process] fixed uppercase ARGC and ARGV should also be skipped | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#44534 | License | MIT | Doc PR | no uppercase env ARGC and ARGV were showing a warning: ``` [09-Dec-2021 17:17:05 Europe/Amsterdam] PHP Warning: Array to string conversion in /var/www/app/vendor/symfony/process/Process.php on line 344 ``` This PR fixes that by adding upon the existing functionality blocking argv and argc env vars to become part of the eventual env vars. Commits ------- 0ced90c [Process] fixed uppercase ARGC and ARGV should also be skipped
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -340,7 +340,7 @@ public function start(callable $callback = null, array $env = [])
 
         $envPairs = [];
         foreach ($env as $k => $v) {
-            if (false !== $v && 'argc' !== $k && 'argv' !== $k) {
+            if (false !== $v && false === \in_array($k, ['argc', 'argv', 'ARGC', 'ARGV'], true)) {
                 $envPairs[] = $k.'='.$v;
             }
         }
@@ -973,8 +973,6 @@ public function addErrorOutput(string $line)
 
     /**
      * Gets the last output time in seconds.
-     *
-     * @return float|null The last output time in seconds or null if it isn't started
      */
     public function getLastOutputTime(): ?float
     {
@@ -1503,8 +1501,6 @@ private function resetProcessData()
      * @param int  $signal         A valid POSIX signal (see https://php.net/pcntl.constants)
      * @param bool $throwException Whether to throw exception in case signal failed
      *
-     * @return bool True if the signal was sent successfully, false otherwise
-     *
      * @throws LogicException   In case the process is not running
      * @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
      * @throws RuntimeException In case of failure

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ public function start(callable $callback = null, array $env = [])`
`340`	`340`
`341`	`341`	`$envPairs = [];`
`342`	`342`	`foreach ($env as $k => $v) {`
`343`		`- if (false !== $v && 'argc' !== $k && 'argv' !== $k) {`
	`343`	`+ if (false !== $v && false === \in_array($k, ['argc', 'argv', 'ARGC', 'ARGV'], true)) {`
`344`	`344`	`$envPairs[] = $k.'='.$v;`
`345`	`345`	`}`
`346`	`346`	`}`
`@@ -973,8 +973,6 @@ public function addErrorOutput(string $line)`
`973`	`973`
`974`	`974`	`/**`
`975`	`975`	`* Gets the last output time in seconds.`
`976`		`- *`
`977`		`- * @return float\|null The last output time in seconds or null if it isn't started`
`978`	`976`	`*/`
`979`	`977`	`public function getLastOutputTime(): ?float`
`980`	`978`	`{`
`@@ -1503,8 +1501,6 @@ private function resetProcessData()`
`1503`	`1501`	`* @param int $signal A valid POSIX signal (see https://php.net/pcntl.constants)`
`1504`	`1502`	`* @param bool $throwException Whether to throw exception in case signal failed`
`1505`	`1503`	`*`
`1506`		`- * @return bool True if the signal was sent successfully, false otherwise`
`1507`		`- *`
`1508`	`1504`	`* @throws LogicException In case the process is not running`
`1509`	`1505`	`* @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed`
`1510`	`1506`	`* @throws RuntimeException In case of failure`