Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit faaaa5e4ac27 · 2024-02-07T15:00:01.000+01:00
* 5.4:
  Skip Twig v3.9-dev for now
  [Validator] Update Dutch (nl) translation
  Update Albanian translations
  [Validator] Update translation
  [FrameworkBundle] Prevent silenced warning by checking if /proc/mount exists
  [VarDumper][PhpUnitBridge] Fix color detection
  prevent throwing NOT_FOUND error when tube is empty
  [Validator] Update missing validator translation for Swedish
  [FrameworkBundle] Fix eager-loading of env vars in ConfigBuilderCacheWarmer
  [Messenger] Fix failing Redis test
  [Validator] Update Italian (it) translations
  [Validator] Missing translations for Hungarian (hu) #53769
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
@@ -501,19 +501,7 @@ private function isInteractiveInput($inputStream): bool
             return self::$stdinIsInteractive;
         }
 
-        if (\function_exists('stream_isatty')) {
-            return self::$stdinIsInteractive = @stream_isatty(fopen('php://stdin', 'r'));
-        }
-
-        if (\function_exists('posix_isatty')) {
-            return self::$stdinIsInteractive = @posix_isatty(fopen('php://stdin', 'r'));
-        }
-
-        if (!\function_exists('shell_exec')) {
-            return self::$stdinIsInteractive = true;
-        }
-
-        return self::$stdinIsInteractive = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));
+        return self::$stdinIsInteractive = @stream_isatty(fopen('php://stdin', 'r'));
     }
 
     /**
diff --git a/Output/StreamOutput.php b/Output/StreamOutput.php
@@ -101,10 +101,7 @@ protected function hasColorSupport(): bool
             return false;
         }
 
-        if (\DIRECTORY_SEPARATOR === '\\'
-            && \function_exists('sapi_windows_vt100_support')
-            && @sapi_windows_vt100_support($this->stream)
-        ) {
+        if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($this->stream)) {
             return true;
         }
 
@@ -116,14 +113,12 @@ protected function hasColorSupport(): bool
             return true;
         }
 
-        $term = (string) getenv('TERM');
-
-        if ('dumb' === $term) {
+        if ('dumb' === $term = (string) getenv('TERM')) {
             return false;
         }
 
         // See https://github.com/chalk/supports-color/blob/d4f413efaf8da045c5ab440ed418ef02dbb28bf1/index.js#L157
-        return 1 === @preg_match('/^((screen|xterm|vt100|vt220|putty|rxvt|ansi|cygwin|linux).*)|(.*-256(color)?(-bce)?)$/', $term);
+        return preg_match('/^((screen|xterm|vt100|vt220|putty|rxvt|ansi|cygwin|linux).*)|(.*-256(color)?(-bce)?)$/', $term);
     }
 
     /**
@@ -140,19 +135,6 @@ private function isTty(): bool
             return true;
         }
 
-        // Modern cross-platform function, includes the fstat fallback so if it is present we trust it
-        if (\function_exists('stream_isatty')) {
-            return stream_isatty($this->stream);
-        }
-
-        // Only trusting this if it is positive, otherwise prefer fstat fallback.
-        if (\function_exists('posix_isatty') && posix_isatty($this->stream)) {
-            return true;
-        }
-
-        $stat = @fstat($this->stream);
-
-        // Check if formatted mode is S_IFCHR
-        return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+        return @stream_isatty($this->stream);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,7 @@ protected function hasColorSupport(): bool`
`101`	`101`	`return false;`
`102`	`102`	`}`
`103`	`103`
`104`		`- if (\DIRECTORY_SEPARATOR === '\\'`
`105`		`- && \function_exists('sapi_windows_vt100_support')`
`106`		`- && @sapi_windows_vt100_support($this->stream)`
`107`		`- ) {`
	`104`	`+ if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($this->stream)) {`
`108`	`105`	`return true;`
`109`	`106`	`}`
`110`	`107`
`@@ -116,14 +113,12 @@ protected function hasColorSupport(): bool`
`116`	`113`	`return true;`
`117`	`114`	`}`
`118`	`115`
`119`		`- $term = (string) getenv('TERM');`
`120`		`-`
`121`		`- if ('dumb' === $term) {`
	`116`	`+ if ('dumb' === $term = (string) getenv('TERM')) {`
`122`	`117`	`return false;`
`123`	`118`	`}`
`124`	`119`
`125`	`120`	`// See https://github.com/chalk/supports-color/blob/d4f413efaf8da045c5ab440ed418ef02dbb28bf1/index.js#L157`
`126`		`- return 1 === @preg_match('/^((screen\|xterm\|vt100\|vt220\|putty\|rxvt\|ansi\|cygwin\|linux).)\|(.-256(color)?(-bce)?)$/', $term);`
	`121`	`+ return preg_match('/^((screen\|xterm\|vt100\|vt220\|putty\|rxvt\|ansi\|cygwin\|linux).)\|(.-256(color)?(-bce)?)$/', $term);`
`127`	`122`	`}`
`128`	`123`
`129`	`124`	`/**`
`@@ -140,19 +135,6 @@ private function isTty(): bool`
`140`	`135`	`return true;`
`141`	`136`	`}`
`142`	`137`
`143`		`- // Modern cross-platform function, includes the fstat fallback so if it is present we trust it`
`144`		`- if (\function_exists('stream_isatty')) {`
`145`		`- return stream_isatty($this->stream);`
`146`		`- }`
`147`		`-`
`148`		`- // Only trusting this if it is positive, otherwise prefer fstat fallback.`
`149`		`- if (\function_exists('posix_isatty') && posix_isatty($this->stream)) {`
`150`		`- return true;`
`151`		`- }`
`152`		`-`
`153`		`- $stat = @fstat($this->stream);`
`154`		`-`
`155`		`- // Check if formatted mode is S_IFCHR`
`156`		`- return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;`
	`138`	`+ return @stream_isatty($this->stream);`
`157`	`139`	`}`
`158`	`140`	`}`