Skip to content

Commit ef21c55

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [VarDumper] Fix missing colors initialization in CliDumper [Process] Fix executable finder when the command starts with a dash [Validator] added reviewed Lithuanian and Dutch translations
2 parents 18fddd5 + 9e74afd commit ef21c55

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

src/Symfony/Component/Process/PhpExecutableFinder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function find(bool $includeArgs = true): string|false
3333
{
3434
if ($php = getenv('PHP_BINARY')) {
3535
if (!is_executable($php)) {
36-
$command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
36+
$command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
3737
if ($php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) {
3838
if (!is_executable($php)) {
3939
return false;

src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,11 @@
432432
</trans-unit>
433433
<trans-unit id="111">
434434
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435-
<target state="needs-review-translation">Nustatyta simbolių koduotė yra netinkama ({{ detected }}). Leidžiamos koduotės yra {{ encodings }}.</target>
435+
<target>Aptikta simbolių koduotė neteisinga ({{ detected }}). Leidžiamos koduotės {{ encodings }}.</target>
436436
</trans-unit>
437437
<trans-unit id="112">
438438
<source>This value is not a valid MAC address.</source>
439-
<target state="needs-review-translation">Ši vertė nėra galiojantis MAC adresas.</target>
439+
<target>Ši reikšmė nėra teisingas MAC adresas.</target>
440440
</trans-unit>
441441
</body>
442442
</file>

src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
</trans-unit>
433433
<trans-unit id="111">
434434
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435-
<target state="needs-review-translation">De gedetecteerde karaktercodering is ongeldig ({{ detected }}). Toegestane coderingen zijn {{ encodings }}.</target>
435+
<target>De gedetecteerde tekencodering is ongeldig ({{ detected }}). Toegestane coderingen zijn {{ encodings }}.</target>
436436
</trans-unit>
437437
<trans-unit id="112">
438438
<source>This value is not a valid MAC address.</source>

src/Symfony/Component/VarDumper/Dumper/CliDumper.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,10 @@ protected function supportsColors(): bool
576576
*/
577577
protected function dumpLine(int $depth, bool $endOfValue = false)
578578
{
579+
if (null === $this->colors) {
580+
$this->colors = $this->supportsColors();
581+
}
582+
579583
if ($this->colors) {
580584
$this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
581585
}

0 commit comments

Comments
 (0)