Merge branch '3.3' into 3.4

* 3.3:
  [2.8] Fix some docblocks
  Escape trailing \ in QuestionHelper autocompletion
  [FrameworkBundle][Serializer] Remove outdated condition
  Add "doctrine/annotations" to top-level composer.json
  Fix phpdoc inconsistencies, simplify no-op sprintf.
  Remove inapplicable phpdoc comment
  nit: Fix phpdoc inconsistency and unreachable statement
  Prefer line formatter on missing cli dumper
  [DI] Enhance service locator error message

Author: nicolas-grekas

Console/Descriptor/TextDescriptor.php

@@ -418,9 +418,6 @@ protected function describeCallable($callable, array $options = array())
         $this->writeText($this->formatCallable($callable), $options);
     }
 
-    /**
-     * @param array $array
-     */
     private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, $event, array $eventListeners, SymfonyStyle $io)
     {
         $tableHeaders = array('Order', 'Callable', 'Priority');

Tests/Functional/SerializerTest.php

@@ -11,19 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
-
 /**
  * @author Kévin Dunglas <[email protected]>
  */
 class SerializerTest extends WebTestCase
 {
     public function testDeserializeArrayOfObject()
     {
-        if (!class_exists(DataUriNormalizer::class)) {
-            $this->markTestSkipped('This test is only applicable when using the Symfony Serializer Component version 3.1 or superior.');
-        }
-
         static::bootKernel(array('test_case' => 'Serializer'));
         $container = static::$kernel->getContainer();