Skip to content

Commit 38ad5d8

Browse files
Merge branch '5.3' into 5.4
* 5.3: [VarExporter] fix exporting declared but unset properties when __sleep() is implemented Default ansi option to null
2 parents bea7632 + 3e7ab8f commit 38ad5d8

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ protected function getDefaultInputDefinition()
10671067
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
10681068
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
10691069
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
1070-
new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', false),
1070+
new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', null),
10711071
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
10721072
]);
10731073
}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CHANGELOG
1818
* Add support for bright colors
1919
* Add `#[AsCommand]` attribute for declaring commands on PHP 8
2020
* Add `Helper::width()` and `Helper::length()`
21+
* The `--ansi` and `--no-ansi` options now default to `null`.
2122

2223
5.2.0
2324
-----

Tests/Fixtures/application_1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Force (or disable --no-ansi) ANSI output
222222
* Is value required: no
223223
* Is multiple: no
224224
* Is negatable: yes
225-
* Default: `false`
225+
* Default: `NULL`
226226

227227
#### `--no-interaction|-n`
228228

@@ -349,7 +349,7 @@ Force (or disable --no-ansi) ANSI output
349349
* Is value required: no
350350
* Is multiple: no
351351
* Is negatable: yes
352-
* Default: `false`
352+
* Default: `NULL`
353353

354354
#### `--no-interaction|-n`
355355

Tests/Fixtures/application_2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ Force (or disable --no-ansi) ANSI output
235235
* Is value required: no
236236
* Is multiple: no
237237
* Is negatable: yes
238-
* Default: `false`
238+
* Default: `NULL`
239239

240240
#### `--no-interaction|-n`
241241

@@ -362,7 +362,7 @@ Force (or disable --no-ansi) ANSI output
362362
* Is value required: no
363363
* Is multiple: no
364364
* Is negatable: yes
365-
* Default: `false`
365+
* Default: `NULL`
366366

367367
#### `--no-interaction|-n`
368368

@@ -437,7 +437,7 @@ Force (or disable --no-ansi) ANSI output
437437
* Is value required: no
438438
* Is multiple: no
439439
* Is negatable: yes
440-
* Default: `false`
440+
* Default: `NULL`
441441

442442
#### `--no-interaction|-n`
443443

@@ -528,7 +528,7 @@ Force (or disable --no-ansi) ANSI output
528528
* Is value required: no
529529
* Is multiple: no
530530
* Is negatable: yes
531-
* Default: `false`
531+
* Default: `NULL`
532532

533533
#### `--no-interaction|-n`
534534

@@ -600,7 +600,7 @@ Force (or disable --no-ansi) ANSI output
600600
* Is value required: no
601601
* Is multiple: no
602602
* Is negatable: yes
603-
* Default: `false`
603+
* Default: `NULL`
604604

605605
#### `--no-interaction|-n`
606606

Tests/Fixtures/application_mbstring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Force (or disable --no-ansi) ANSI output
226226
* Is value required: no
227227
* Is multiple: no
228228
* Is negatable: yes
229-
* Default: `false`
229+
* Default: `NULL`
230230

231231
#### `--no-interaction|-n`
232232

@@ -353,7 +353,7 @@ Force (or disable --no-ansi) ANSI output
353353
* Is value required: no
354354
* Is multiple: no
355355
* Is negatable: yes
356-
* Default: `false`
356+
* Default: `NULL`
357357

358358
#### `--no-interaction|-n`
359359

@@ -444,7 +444,7 @@ Force (or disable --no-ansi) ANSI output
444444
* Is value required: no
445445
* Is multiple: no
446446
* Is negatable: yes
447-
* Default: `false`
447+
* Default: `NULL`
448448

449449
#### `--no-interaction|-n`
450450

0 commit comments

Comments
 (0)