minor #46971 [Console] Refactor isTtySupported() (Yurunsoft)

fabpot · fabpot · commit ab3d9fc40a54 · 2022-07-21T10:02:15.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Console] Refactor isTtySupported() | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | - | License | MIT | Doc PR | -  `stream_isatty()`: <https://www.php.net/manual/en/function.stream-isatty.php> (PHP 7 >= 7.2.0, PHP 8) Commits ------- 007fa61 Refactor isTtySupported()
diff --git a/src/Symfony/Component/Console/Cursor.php b/src/Symfony/Component/Console/Cursor.php
@@ -183,8 +183,8 @@ public function getCurrentPosition(): array
     {
         static $isTtySupported;
 
-        if (null === $isTtySupported && \function_exists('proc_open')) {
-            $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', [['file', '/dev/tty', 'r'], ['file', '/dev/tty', 'w'], ['file', '/dev/tty', 'w']], $pipes);
+        if (null === $isTtySupported) {
+            $isTtySupported = ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));
         }
 
         if (!$isTtySupported) {
diff --git a/src/Symfony/Component/Console/Tests/CursorTest.php b/src/Symfony/Component/Console/Tests/CursorTest.php
@@ -184,6 +184,7 @@ public function testGetCurrentPosition()
         $this->assertEquals("\x1b[11;10H", $this->getOutputContent($output));
 
         $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', [['file', '/dev/tty', 'r'], ['file', '/dev/tty', 'w'], ['file', '/dev/tty', 'w']], $pipes);
+        $this->assertEquals($isTtySupported, '/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));
 
         if ($isTtySupported) {
             // When tty is supported, we can't validate the exact cursor position since it depends where the cursor is when the test runs.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1205,7 +1205,7 @@ public static function isTtySupported(): bool
         static $isTtySupported;
 
         if (null === $isTtySupported) {
-            $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', [['file', '/dev/tty', 'r'], ['file', '/dev/tty', 'w'], ['file', '/dev/tty', 'w']], $pipes);
+            $isTtySupported = ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));
         }
 
         return $isTtySupported;

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ public function getCurrentPosition(): array`
`183`	`183`	`{`
`184`	`184`	`static $isTtySupported;`
`185`	`185`
`186`		`- if (null === $isTtySupported && \function_exists('proc_open')) {`
`187`		`- $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', [['file', '/dev/tty', 'r'], ['file', '/dev/tty', 'w'], ['file', '/dev/tty', 'w']], $pipes);`
	`186`	`+ if (null === $isTtySupported) {`
	`187`	`+ $isTtySupported = ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if (!$isTtySupported) {`
Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,7 @@ public static function isTtySupported(): bool`
`1205`	`1205`	`static $isTtySupported;`
`1206`	`1206`
`1207`	`1207`	`if (null === $isTtySupported) {`
`1208`		`- $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', [['file', '/dev/tty', 'r'], ['file', '/dev/tty', 'w'], ['file', '/dev/tty', 'w']], $pipes);`
	`1208`	`+ $isTtySupported = ('/' === \DIRECTORY_SEPARATOR && stream_isatty(\STDOUT));`
`1209`	`1209`	`}`
`1210`	`1210`
`1211`	`1211`	`return $isTtySupported;`