Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/console
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.4.10
Choose a base ref
...
head repository: symfony/console
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.4.11
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on Aug 9, 2024

  1. Copy the full SHA
    74d6d39 View commit details

Commits on Aug 13, 2024

  1. Copy the full SHA
    f96ee2a View commit details
  2. Merge branch '5.4' into 6.4

    * 5.4:
      Replace external FTP server by a local docker instance
      [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
    nicolas-grekas committed Aug 13, 2024
    Copy the full SHA
    b406d22 View commit details
  3. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    c24bcd0 View commit details
  4. bug #57853 [Console] Fix side-effects from running bash completions (…

    …Seldaek)
    
    This PR was merged into the 5.4 branch.
    
    Discussion
    ----------
    
    [Console] Fix side-effects from running bash completions
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 5.4
    | Bug fix?      | yes
    | New feature?  | no
    | Deprecations? | no
    | Issues        | Fix composer/composer#12015
    | License       | MIT
    
    Fixes issues in symfony bash completions having side-effects for other completions. See composer/composer#12015 for details.
    
    I identified this IFS line as causing the issue.. But it was introduced here
    symfony/symfony@e9e0c07 (cc `@GromNaN`) probably for a good reason. So I don't think this is mergeable as is, but we should see what can be done to set IFS where needed per process call and not change it globally like that.
    
    Commits
    -------
    
    5456645628 [Console] Fix side-effects from running bash completions
    nicolas-grekas committed Aug 13, 2024
    Copy the full SHA
    e86f855 View commit details

Commits on Aug 15, 2024

  1. Merge branch '5.4' into 6.4

    * 5.4:
      [Validator] added Polish translation for units 116-119
      Revert stateless check
      [Console] Fix side-effects from running bash completions
      skip transient Redis integration tests on AppVeyor
    chalasr committed Aug 15, 2024
    Copy the full SHA
    4268688 View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 Output/StreamOutput.php
  2. +4 −4 Question/ChoiceQuestion.php
  3. +1 −1 Resources/completion.bash
2 changes: 1 addition & 1 deletion Output/StreamOutput.php
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ protected function doWrite(string $message, bool $newline)
protected function hasColorSupport(): bool
{
// Follow https://no-color.org/
if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
return false;
}

8 changes: 4 additions & 4 deletions Question/ChoiceQuestion.php
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ class ChoiceQuestion extends Question
private string $errorMessage = 'Value "%s" is invalid';

/**
* @param string $question The question to ask to the user
* @param array $choices The list of available choices
* @param mixed $default The default answer to return
* @param string $question The question to ask to the user
* @param array $choices The list of available choices
* @param string|bool|int|float|null $default The default answer to return
*/
public function __construct(string $question, array $choices, mixed $default = null)
public function __construct(string $question, array $choices, string|bool|int|float|null $default = null)
{
if (!$choices) {
throw new \LogicException('Choice question must have at least 1 choice available.');
2 changes: 1 addition & 1 deletion Resources/completion.bash
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ _sf_{{ COMMAND_NAME }}() {
done

# Use newline as only separator to allow space in completion values
IFS=$'\n'
local IFS=$'\n'
local sf_cmd="${COMP_WORDS[0]}"

# for an alias, get the real script behind it