Merge branch '5.4' into 6.0

* 5.4:
  [Cache] fix connecting to local Redis sockets
  Fix appveyor config for deprecations
  Skip deprecation coming from DBAL 3.2
  Add Suggestion class for more advanced completion suggestion
  [HttpClient] Add Klaxoon as a backer to the README
  [Translation] Add Lokalise as a backer to the READMEs
  [Translation] Add Crowdin as a backer to the READMEs
  [Security] Add SymfonyCasts as a backer to the READMEs
  [Notifier] Add Mercure.rocks as a backer to the README
  [Messenger][Process] Add SensioLabs as a backer to the README
  [HttpKernel][Console] Add Les-Tilleuls.coop as a backer to the README
  [HttpFoundation] Add Laravel as a backer to the README
  Allow v3 contracts where possible

Author: nicolas-grekas

Completion/CompletionSuggestions.php

@@ -18,7 +18,7 @@
  *
  * @author Wouter de Jong <[email protected]>
  */
-class CompletionSuggestions
+final class CompletionSuggestions
 {
     private $valueSuggestions = [];
     private $optionSuggestions = [];
@@ -28,23 +28,25 @@ class CompletionSuggestions
      *
      * @return $this
      */
-    public function suggestValue(string $value): static
+    public function suggestValue(string|Suggestion $value): static
     {
-        $this->valueSuggestions[] = $value;
+        $this->valueSuggestions[] = !$value instanceof Suggestion ? new Suggestion($value) : $value;
 
         return $this;
     }
 
     /**
      * Add multiple suggested values at once for an input option or argument.
      *
-     * @param string[] $values
+     * @param list<string|Suggestion> $values
      *
      * @return $this
      */
     public function suggestValues(array $values): static
     {
-        $this->valueSuggestions = array_merge($this->valueSuggestions, $values);
+        foreach ($values as $value) {
+            $this->suggestValue($value);
+        }
 
         return $this;
     }
@@ -86,7 +88,7 @@ public function getOptionSuggestions(): array
     }
 
     /**
-     * @return string[]
+     * @return Suggestion[]
      */
     public function getValueSuggestions(): array
     {

Completion/Output/BashCompletionOutput.php

@@ -21,10 +21,10 @@ class BashCompletionOutput implements CompletionOutputInterface
 {
     public function write(CompletionSuggestions $suggestions, OutputInterface $output): void
     {
-        $options = $suggestions->getValueSuggestions();
+        $values = $suggestions->getValueSuggestions();
         foreach ($suggestions->getOptionSuggestions() as $option) {
-            $options[] = '--'.$option->getName();
+            $values[] = '--'.$option->getName();
         }
-        $output->writeln(implode("\n", $options));
+        $output->writeln(implode("\n", $values));
     }
 }

Completion/Suggestion.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Completion;
+
+/**
+ * Represents a single suggested value.
+ *
+ * @author Wouter de Jong <[email protected]>
+ */
+class Suggestion
+{
+    private string $value;
+
+    public function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function __toString(): string
+    {
+        return $this->getValue();
+    }
+}

README.md

@@ -4,6 +4,18 @@ Console Component
 The Console component eases the creation of beautiful and testable command line
 interfaces.
 
+Sponsor
+-------
+
+The Console component for Symfony 5.4/6.0 is [backed][1] by [Les-Tilleuls.coop][2].
+
+Les-Tilleuls.coop is a team of 50+ Symfony experts who can help you design, develop and
+fix your projects. We provide a wide range of professional services including development,
+consulting, coaching, training and audits. We also are highly skilled in JS, Go and DevOps.
+We are a worker cooperative!
+
+Help Symfony by [sponsoring][3] its development!
+
 Resources
 ---------
 
@@ -18,3 +30,7 @@ Credits
 
 `Resources/bin/hiddeninput.exe` is a third party binary provided within this
 component. Find sources and license at https://github.com/Seldaek/hidden-input.
+
+[1]: https://symfony.com/backers
+[2]: https://les-tilleuls.coop
+[3]: https://symfony.com/sponsor

Tester/CommandCompletionTester.php

@@ -51,6 +51,6 @@ public function complete(array $input): array
             $options[] = '--'.$option->getName();
         }
 
-        return array_merge($options, $suggestions->getValueSuggestions());
+        return array_map('strval', array_merge($options, $suggestions->getValueSuggestions()));
     }
 }

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.0.2",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/service-contracts": "^1.1|^2.0|^3.0",
+        "symfony/service-contracts": "^1.1|^2|^3",
         "symfony/string": "^5.4|^6.0"
     },
     "require-dev": {