diff --git a/Application.php b/Application.php
index 38956d1fe..dc7c8af6b 100644
--- a/Application.php
+++ b/Application.php
@@ -648,8 +648,13 @@ public function find(string $name)
         // filter out aliases for commands which are already on the list
         if (\count($commands) > 1) {
             $commandList = $this->commandLoader ? array_merge(array_flip($this->commandLoader->getNames()), $this->commands) : $this->commands;
-            $commands = array_unique(array_filter($commands, function ($nameOrAlias) use ($commandList, $commands, &$aliases) {
-                $commandName = $commandList[$nameOrAlias] instanceof Command ? $commandList[$nameOrAlias]->getName() : $nameOrAlias;
+            $commands = array_unique(array_filter($commands, function ($nameOrAlias) use (&$commandList, $commands, &$aliases) {
+                if (!$commandList[$nameOrAlias] instanceof Command) {
+                    $commandList[$nameOrAlias] = $this->commandLoader->get($nameOrAlias);
+                }
+
+                $commandName = $commandList[$nameOrAlias]->getName();
+
                 $aliases[$nameOrAlias] = $commandName;
 
                 return $commandName === $nameOrAlias || !\in_array($commandName, $commands);
@@ -664,10 +669,6 @@ public function find(string $name)
                 $maxLen = max(Helper::strlen($abbrev), $maxLen);
             }
             $abbrevs = array_map(function ($cmd) use ($commandList, $usableWidth, $maxLen, &$commands) {
-                if (!$commandList[$cmd] instanceof Command) {
-                    $commandList[$cmd] = $this->commandLoader->get($cmd);
-                }
-
                 if ($commandList[$cmd]->isHidden()) {
                     unset($commands[array_search($cmd, $commands)]);
 
diff --git a/Helper/FormatterHelper.php b/Helper/FormatterHelper.php
index 75c9b613f..a505415cf 100644
--- a/Helper/FormatterHelper.php
+++ b/Helper/FormatterHelper.php
@@ -48,12 +48,12 @@ public function formatBlock($messages, string $style, bool $large = false)
         foreach ($messages as $message) {
             $message = OutputFormatter::escape($message);
             $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
+            $len = max(self::strlen($message) + ($large ? 4 : 2), $len);
         }
 
         $messages = $large ? [str_repeat(' ', $len)] : [];
         for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
+            $messages[] = $lines[$i].str_repeat(' ', $len - self::strlen($lines[$i]));
         }
         if ($large) {
             $messages[] = str_repeat(' ', $len);
@@ -73,17 +73,13 @@ public function formatBlock($messages, string $style, bool $large = false)
      */
     public function truncate(string $message, int $length, string $suffix = '...')
     {
-        $computedLength = $length - $this->strlen($suffix);
+        $computedLength = $length - self::strlen($suffix);
 
-        if ($computedLength > $this->strlen($message)) {
+        if ($computedLength > self::strlen($message)) {
             return $message;
         }
 
-        if (false === $encoding = mb_detect_encoding($message, null, true)) {
-            return substr($message, 0, $length).$suffix;
-        }
-
-        return mb_substr($message, 0, $length, $encoding).$suffix;
+        return self::substr($message, 0, $length).$suffix;
     }
 
     /**
diff --git a/Input/Input.php b/Input/Input.php
index 8c7905db7..ff5d3170f 100644
--- a/Input/Input.php
+++ b/Input/Input.php
@@ -104,7 +104,7 @@ public function getArguments()
     /**
      * {@inheritdoc}
      */
-    public function getArgument($name)
+    public function getArgument(string $name)
     {
         if (!$this->definition->hasArgument($name)) {
             throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
@@ -116,7 +116,7 @@ public function getArgument($name)
     /**
      * {@inheritdoc}
      */
-    public function setArgument($name, $value)
+    public function setArgument(string $name, $value)
     {
         if (!$this->definition->hasArgument($name)) {
             throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
diff --git a/LICENSE b/LICENSE
index a677f4376..9e936ec04 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 664a37c0e..3e2fc605e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ interfaces.
 Resources
 ---------
 
-  * [Documentation](https://symfony.com/doc/current/components/console/index.html)
+  * [Documentation](https://symfony.com/doc/current/components/console.html)
   * [Contributing](https://symfony.com/doc/current/contributing/index.html)
   * [Report issues](https://github.com/symfony/symfony/issues) and
     [send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 4bfbc71c5..0081504b7 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -626,6 +626,9 @@ public function testFindAlternativeCommandsWithAnAlias()
         $fooCommand->setAliases(['foo2']);
 
         $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader([
+            'foo3' => static function () use ($fooCommand) { return $fooCommand; },
+        ]));
         $application->add($fooCommand);
 
         $result = $application->find('foo');
diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
index b7a26f950..467f38b6d 100644
--- a/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -145,13 +145,13 @@ public function testChoiceQuestionPadding()
         );
 
         $this->assertOutputContains(<<<EOT
-qqq:
+ qqq:
   [foo   ] foo
   [żółw  ] bar
   [łabądź] baz
  > 
 EOT
-        , $output);
+        , $output, true);
     }
 
     public function testChoiceQuestionCustomPrompt()
@@ -168,9 +168,9 @@ public function testChoiceQuestionCustomPrompt()
         $this->assertOutputContains(<<<EOT
  qqq:
   [0] foo
- >ccc>
+ >ccc> 
 EOT
-        , $output);
+        , $output, true);
     }
 
     protected function getInputStream($input)
@@ -200,10 +200,15 @@ protected function createInputInterfaceMock($interactive = true)
         return $mock;
     }
 
-    private function assertOutputContains($expected, StreamOutput $output)
+    private function assertOutputContains($expected, StreamOutput $output, $normalize = false)
     {
         rewind($output->getStream());
         $stream = stream_get_contents($output->getStream());
+
+        if ($normalize) {
+            $stream = str_replace(PHP_EOL, "\n", $stream);
+        }
+
         $this->assertStringContainsString($expected, $stream);
     }
 }