minor symfony#58188 Don't use is_resource() on non-streams (nicolas-grekas)

fabpot · fabpot · commit d7000e6595b6 · 2024-09-06T08:39:50.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- Don't use is_resource() on non-streams | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Prepares for https://wiki.php.net/rfc/resource_to_object_conversion Commits ------- b12b7a0 Don't use is_resource() on non-streams
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -158,8 +158,7 @@ private static function readFromProcess(string $command): ?string
 
         $cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;
 
-        $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (!\is_resource($process)) {
+        if (!$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {
             return null;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -67,7 +67,7 @@ public function __construct(?string $minLevel = null, $output = null, ?callable
 
         $this->minLevelIndex = self::LEVELS[$minLevel];
         $this->formatter = $formatter ?: [$this, 'format'];
-        if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
+        if ($output && false === $this->handle = \is_string($output) ? @fopen($output, 'a') : $output) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
     }
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -352,7 +352,7 @@ public function start(?callable $callback = null, array $env = [])
 
         $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
 
-        if (!\is_resource($this->process)) {
+        if (!$this->process) {
             throw new RuntimeException('Unable to launch a new process.');
         }
         $this->status = self::STATUS_STARTED;
@@ -1456,8 +1456,9 @@ private function readPipes(bool $blocking, bool $close)
     private function close(): int
     {
         $this->processPipes->close();
-        if (\is_resource($this->process)) {
+        if ($this->process) {
             proc_close($this->process);
+            $this->process = null;
         }
         $this->exitcode = $this->processInformation['exitcode'];
         $this->status = self::STATUS_TERMINATED;

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,7 @@ private static function readFromProcess(string $command): ?string`
`158`	`158`
`159`	`159`	`$cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;`
`160`	`160`
`161`		`- $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);`
`162`		`- if (!\is_resource($process)) {`
	`161`	`+ if (!$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {`
`163`	`162`	`return null;`
`164`	`163`	`}`
`165`	`164`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function __construct(?string $minLevel = null, $output = null, ?callable`
`67`	`67`
`68`	`68`	`$this->minLevelIndex = self::LEVELS[$minLevel];`
`69`	`69`	`$this->formatter = $formatter ?: [$this, 'format'];`
`70`		`- if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {`
	`70`	`+ if ($output && false === $this->handle = \is_string($output) ? @fopen($output, 'a') : $output) {`
`71`	`71`	`throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public function start(?callable $callback = null, array $env = [])`
`352`	`352`
`353`	`353`	`$this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);`
`354`	`354`
`355`		`- if (!\is_resource($this->process)) {`
	`355`	`+ if (!$this->process) {`
`356`	`356`	`throw new RuntimeException('Unable to launch a new process.');`
`357`	`357`	`}`
`358`	`358`	`$this->status = self::STATUS_STARTED;`
`@@ -1456,8 +1456,9 @@ private function readPipes(bool $blocking, bool $close)`
`1456`	`1456`	`private function close(): int`
`1457`	`1457`	`{`
`1458`	`1458`	`$this->processPipes->close();`
`1459`		`- if (\is_resource($this->process)) {`
	`1459`	`+ if ($this->process) {`
`1460`	`1460`	`proc_close($this->process);`
	`1461`	`+ $this->process = null;`
`1461`	`1462`	`}`
`1462`	`1463`	`$this->exitcode = $this->processInformation['exitcode'];`
`1463`	`1464`	`$this->status = self::STATUS_TERMINATED;`