Skip to content

Commit 1f4e205

Browse files
Merge branch '2.8' into 3.1
* 2.8: Disable CLI color for Windows 10 greater than 10.0.10586 Exception details break the layout [HttpKernel] Remove wrong docblock [HttpKernel] Fix HttpCache validation HTTP method Move space from the before 'if' to the after 'if' [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')
2 parents eeb3bf9 + fc69aad commit 1f4e205

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DeprecationErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private static function hasColorSupport()
195195
{
196196
if ('\\' === DIRECTORY_SEPARATOR) {
197197
return
198-
0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)
198+
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
199199
|| false !== getenv('ANSICON')
200200
|| 'ON' === getenv('ConEmuANSI')
201201
|| 'xterm' === getenv('TERM');

0 commit comments

Comments
 (0)