Merge branch '6.4' into 7.0

* 6.4:
  [FrameworkBundle] Fix changelog
  [Validator] Un-deprecate passing an annotation reader to AnnotationLoader

Author: derrabus

CHANGELOG.md

@@ -22,7 +22,6 @@ CHANGELOG
  * Allow single integer for the `versions` option of the `Uuid` constraint
  * Allow single constraint to be passed to the `constraints` option of the `When` constraint
  * Deprecate Doctrine annotations support in favor of native attributes
- * Deprecate passing an annotation reader to the constructor signature of `AnnotationLoader`
  * Deprecate `ValidatorBuilder::setDoctrineAnnotationReader()`
  * Deprecate `ValidatorBuilder::addDefaultDoctrineAnnotationReader()`
  * Add `number`, `finite-number` and `finite-float` types to `Type` constraint

Tests/Mapping/Loader/AnnotationLoaderTest.php renamed to Tests/Mapping/Loader/AttributeLoaderTest.php

@@ -30,9 +30,10 @@
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 
-class AnnotationLoaderTest extends TestCase
+class AttributeLoaderTest extends TestCase
 {
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
@@ -212,7 +213,7 @@ public function testLoadGroupSequenceProviderAnnotation()
 
     protected function createAnnotationLoader(): AnnotationLoader
     {
-        return new AnnotationLoader();
+        return new AttributeLoader();
     }
 
     protected function getFixtureNamespace(): string