Merge branch '3.1'

* 3.1:
  fixed expected exception annotations

Author: fabpot

Tests/Normalizer/ObjectNormalizerTest.php

@@ -15,7 +15,6 @@
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
@@ -590,7 +589,7 @@ public function testDenomalizeRecursive()
     }
 
     /**
-     * @expectedException UnexpectedValueException
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      * @expectedExceptionMessage The type of the "date" attribute for class "Symfony\Component\Serializer\Tests\Normalizer\ObjectOuter" must be one of "DateTimeInterface" ("string" given).
      */
     public function testRejectInvalidType()
@@ -602,7 +601,7 @@ public function testRejectInvalidType()
     }
 
     /**
-     * @expectedException UnexpectedValueException
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      * @expectedExceptionMessage The type of the key "a" must be "int" ("string" given).
      */
     public function testRejectInvalidKey()