Merge branch '2.8' into 3.3

* 2.8:
  [2.8] Fix some docblocks
  Escape trailing \ in QuestionHelper autocompletion
  Add "doctrine/annotations" to top-level composer.json
  Remove inapplicable phpdoc comment
  nit: Fix phpdoc inconsistency and unreachable statement

Author: nicolas-grekas

Tests/Encoder/ChainEncoderTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Encoder\ChainEncoder;
+use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
 
 class ChainEncoderTest extends TestCase
@@ -123,10 +124,14 @@ class ChainNormalizationAwareEncoder extends ChainEncoder implements Normalizati
 {
 }
 
-class NormalizationAwareEncoder implements NormalizationAwareInterface
+class NormalizationAwareEncoder implements EncoderInterface, NormalizationAwareInterface
 {
     public function supportsEncoding($format)
     {
         return true;
     }
+
+    public function encode($data, $format, array $context = array())
+    {
+    }
 }