From ffae965741cf591e9d24effc833e48963df5edae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20Schlu=CC=88ter?= <malte.schlueter@qossmic.com>
Date: Fri, 21 May 2021 10:34:01 +0200
Subject: [PATCH] [Console] Removed deprecated code

---
 src/Symfony/Component/Console/CHANGELOG.md    |  6 +++++
 .../AddConsoleCommandPass.php                 | 20 ++++------------
 .../Component/Console/Helper/Helper.php       | 24 -------------------
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index 8808563869273..cdb17a06345c9 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+6.0
+---
+
+ * Removed `Helper::strlen`. Use `Helper::width()` or `Helper::length()` instead
+ * Removed `Helper::strlenWithoutDecoration`. Use `Helper::removeDecoration()` instead
+
 5.3
 ---
 
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
index 743e306d07b9a..84d80b892e9cf 100644
--- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -29,22 +29,10 @@
  */
 class AddConsoleCommandPass implements CompilerPassInterface
 {
-    private $commandLoaderServiceId;
-    private $commandTag;
-    private $noPreloadTag;
-    private $privateTagName;
-
-    public function __construct(string $commandLoaderServiceId = 'console.command_loader', string $commandTag = 'console.command', string $noPreloadTag = 'container.no_preload', string $privateTagName = 'container.private')
-    {
-        if (0 < \func_num_args()) {
-            trigger_deprecation('symfony/console', '5.3', 'Configuring "%s" is deprecated.', __CLASS__);
-        }
-
-        $this->commandLoaderServiceId = $commandLoaderServiceId;
-        $this->commandTag = $commandTag;
-        $this->noPreloadTag = $noPreloadTag;
-        $this->privateTagName = $privateTagName;
-    }
+    private string $commandLoaderServiceId = 'console.command_loader';
+    private string $commandTag = 'console.command';
+    private string $noPreloadTag = 'container.no_preload';
+    private string $privateTagName = 'container.private';
 
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 881b4dc4fb4a1..320a73d80952b 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -39,20 +39,6 @@ public function getHelperSet()
         return $this->helperSet;
     }
 
-    /**
-     * Returns the length of a string, using mb_strwidth if it is available.
-     *
-     * @deprecated since 5.3
-     *
-     * @return int The length of the string
-     */
-    public static function strlen(?string $string)
-    {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__);
-
-        return self::width($string);
-    }
-
     /**
      * Returns the width of a string, using mb_strwidth if it is available.
      * The width is how many characters positions the string will use.
@@ -153,16 +139,6 @@ public static function formatMemory(int $memory)
         return sprintf('%d B', $memory);
     }
 
-    /**
-     * @deprecated since 5.3
-     */
-    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
-    {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__);
-
-        return self::width(self::removeDecoration($formatter, $string));
-    }
-
     public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
     {
         $isDecorated = $formatter->isDecorated();