From cb18660bbf2ce214cf46c0a9ba13bba3a0c737d3 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 5 Dec 2021 16:41:54 +0100
Subject: [PATCH 1/3] Fix parameter types for ProcessHelper::mustRun()

---
 Helper/ProcessHelper.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Helper/ProcessHelper.php b/Helper/ProcessHelper.php
index d580357b9..862d09f21 100644
--- a/Helper/ProcessHelper.php
+++ b/Helper/ProcessHelper.php
@@ -95,10 +95,10 @@ public function run(OutputInterface $output, $cmd, $error = null, callable $call
      * This is identical to run() except that an exception is thrown if the process
      * exits with a non-zero exit code.
      *
-     * @param string|Process $cmd      An instance of Process or a command to run
-     * @param string|null    $error    An error message that must be displayed if something went wrong
-     * @param callable|null  $callback A PHP callback to run whenever there is some
-     *                                 output available on STDOUT or STDERR
+     * @param array|Process $cmd      An instance of Process or a command to run
+     * @param string|null   $error    An error message that must be displayed if something went wrong
+     * @param callable|null $callback A PHP callback to run whenever there is some
+     *                                output available on STDOUT or STDERR
      *
      * @return Process The process that ran
      *

From 829274f302eaa7b4469ae51278d048ad0c0964fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TAMARELLE?= <jerome@tamarelle.net>
Date: Mon, 6 Dec 2021 17:23:18 +0100
Subject: [PATCH 2/3] Handle alias in completion script

---
 Resources/completion.bash | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/completion.bash b/Resources/completion.bash
index 971af088b..c5e89c3c2 100644
--- a/Resources/completion.bash
+++ b/Resources/completion.bash
@@ -9,6 +9,12 @@ _sf_{{ COMMAND_NAME }}() {
     # Use newline as only separator to allow space in completion values
     IFS=$'\n'
     local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    if [[ $(type -t $sf_cmd) == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    fi
+
     if [ ! -f "$sf_cmd" ]; then
         return 1
     fi

From 9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 9 Dec 2021 12:22:43 +0100
Subject: [PATCH 3/3] Fix polyfill-php73 requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2a7b429ac..9a565068c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php73": "^1.8",
+        "symfony/polyfill-php73": "^1.9",
         "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2|^3",
         "symfony/string": "^5.1|^6.0"