From 6e8e8b9c2bc60dffda4b36bcc4858a9fac943588 Mon Sep 17 00:00:00 2001 From: David Refoua Date: Tue, 24 Sep 2024 14:17:54 +0330 Subject: [PATCH 1/3] Support tput cols on Windows --- .gitignore | 1 + build/kint.phar | Bin 513633 -> 513659 bytes src/Renderer/CliRenderer.php | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9db4b24..1ad0ec6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ /.php-cs-fixer.cache /.phpunit.result.cache /.idea +/.vscode npm-debug.log /tests/phpunit.tmp diff --git a/build/kint.phar b/build/kint.phar index be63524a12f44fea84e4f50765bd20100a332957..a542c8891e778e69de0daa6cc276325d7ca88e02 100644 GIT binary patch delta 284 zcmV+%0ptGRtRMTVAF!1W5XTe%0D!(M9LE#@0J~3xe3PXR%ah3#N|S&S1+#_`R0We9 z8Yr^@7YPG{L>h-g8Ucqy8Ulwz8UwdP8U(>+mwucD2bURv1VRfTOG!>tUsp*^AU~H{ zfdn5KAUYsiWq4&{C?|Aqb#x$OZ)|fQGCodKOedECk^&Q#z(oNBmw*ig1-F!e1ZFdr z?j{Bslm0FVmmu#11h=An1qDZ!Anybaw+podipaMKCk87kmtg4yBe%fB1tnsaD{lb| zhd@#Ww?I+{*@H+`qy#7Iq0Ncen*xT|W-v1K@U4J_5sk{7kCrPb^-;|lTOj*AIN330 i>`QX6%IF4Qg7B~|QpXB4S^ZX>E(`_)0000-LQO*N_+}#j delta 215 zcmV;|04V?atRLa5AF!1W5Umsd0D!(M9IX@p0Mf9Q^pm9!%d@EwY6X*l5jm3&7zMLY z7xMy>0v9=hL>h-g8Ucqy8Ulwz8UwdP8U(>+4IxWOPE=o4NlqXpCLosufdomHT7d)} zx08Vcfit&2`~;iGw=cB>5=XZX@C80%mta5!3Aez+1x71}PErQ9PErTugGj%Zk6OT} z@1YalC9y-Bws2Y-ZcEnf&e~D1b9R`86WT6G|CQ*aK4oPB?yj9PJ~CwLmg9%RHY?;* R7}D8~ti%KW002iqO+o`BRrde@ diff --git a/src/Renderer/CliRenderer.php b/src/Renderer/CliRenderer.php index 056f507f1..4577dfec0 100644 --- a/src/Renderer/CliRenderer.php +++ b/src/Renderer/CliRenderer.php @@ -92,9 +92,9 @@ public function __construct() } if (null === self::$terminal_width) { - if (!KINT_WIN && self::$detect_width) { + if (self::$detect_width) { try { - $tput = \exec('tput cols 2>/dev/null'); + $tput = KINT_WIN ? \exec('tput cols 2>nul') : \exec('tput cols 2>/dev/null'); if ((bool) $tput) { /** * @psalm-suppress InvalidCast From 829026f66293e447bfefb8931afc90380dd32dd0 Mon Sep 17 00:00:00 2001 From: Jonathan Vollebregt Date: Tue, 24 Sep 2024 14:01:43 +0200 Subject: [PATCH 2/3] Rebuild --- build/kint.phar | Bin 513659 -> 513658 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/build/kint.phar b/build/kint.phar index a542c8891e778e69de0daa6cc276325d7ca88e02..e48426a09a2f6878e55344b71ff2c3e0a478e055 100644 GIT binary patch delta 209 zcmV;?051RgtRMQUAF!1W5XKY$0D!(M9L5v?0G~RegOjBY%d@EwY6X*l5jm3&7zMLY z7xMy>0v9=hL>h-g8Ucqy8Ulwz8UwdP8UzYwmrsEN9tUo9Y$quoI+t021RuAPfdqjw zw?O;^o5;5>wFDAJw-E3JK4O<(Kn4l7z{CYcD~C=}2DeU92jzoEm~|5wVbv47rFSxf zwYIx~qfB47rj+CGkzJO5vw!$e1()h>?T1^S>9U|}3>pUbf@3W1NUUSWWv&|sH?17D L1ONa4M?y_Pr delta 236 zcmVh-g8Ucqy8Ulwz8UwdP8UzYw0U?)8fdn21FJxtQFK%^gmu`Us83RsL zOt+AM1cNh|2PXy_x2}B!5=WPxP6aTR@WcfLm;X)zB)4s~1VPBRA}0nbE0+)z1{$}} z#04&5hfPujw@p$9<%397qy#7Iq0Ncen*xT|W-v1K@U4J_5sk{7kCrPb^-;|lTOj*A mIN330>`QX6%IF4Qg7B~|QpXB4S^ZX>E(`_)0000-LQO(T+E(WP From 23caa3cf520f7784fc528294b9b723d77475c2a2 Mon Sep 17 00:00:00 2001 From: Jonathan Vollebregt Date: Tue, 24 Sep 2024 14:05:26 +0200 Subject: [PATCH 3/3] Update psalm-baseline --- psalm-baseline.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 0600d6089..2d7fad961 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -75,11 +75,9 @@ - - - +