Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 5.3:
  [VarExporter] fix exporting declared but unset properties when __sleep() is implemented
  Default ansi option to null
  • Loading branch information
nicolas-grekas committed Nov 22, 2021
2 parents bea7632 + 3e7ab8f commit 38ad5d8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ protected function getDefaultInputDefinition()
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
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'),
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', false),
new InputOption('--ansi', '', InputOption::VALUE_NEGATABLE, 'Force (or disable --no-ansi) ANSI output', null),
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
]);
}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CHANGELOG
* Add support for bright colors
* Add `#[AsCommand]` attribute for declaring commands on PHP 8
* Add `Helper::width()` and `Helper::length()`
* The `--ansi` and `--no-ansi` options now default to `null`.

5.2.0
-----
Expand Down
4 changes: 2 additions & 2 deletions Tests/Fixtures/application_1.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -349,7 +349,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down
10 changes: 5 additions & 5 deletions Tests/Fixtures/application_2.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -362,7 +362,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -437,7 +437,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -528,7 +528,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -600,7 +600,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down
6 changes: 3 additions & 3 deletions Tests/Fixtures/application_mbstring.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -353,7 +353,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down Expand Up @@ -444,7 +444,7 @@ Force (or disable --no-ansi) ANSI output
* Is value required: no
* Is multiple: no
* Is negatable: yes
* Default: `false`
* Default: `NULL`

#### `--no-interaction|-n`

Expand Down

0 comments on commit 38ad5d8

Please sign in to comment.