Merge branch '6.4' into 7.0

derrabus · derrabus · commit ca6a07d721e4 · 2023-08-23T13:31:16.000+02:00
* 6.4:
  [FrameworkBundle] Fix changelog
  [Validator] Un-deprecate passing an annotation reader to AnnotationLoader
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -41,8 +41,6 @@ CHANGELOG
  * Deprecate not setting the `framework.session.cookie_samesite` config option; it will default to `lax` in 7.0
  * Deprecate not setting either `framework.session.handler_id` or `save_path` config options; `handler_id` will
    default to null in 7.0 if `save_path` is not set and to `session.handler.native_file` otherwise
- * Deprecate not setting the `framework.session.handler_id` config option; it will default to null,
-   unless `save_path` is set, which will make it default to `session.handler.native_file` in 7.0
  * Deprecate not setting the `framework.uid.default_uuid_version` config option; it will default to `7` in 7.0
  * Deprecate not setting the `framework.uid.time_based_uuid_version` config option; it will default to `7` in 7.0
  * Deprecate not setting the `framework.validation.email_validation_mode` config option; it will default to `html5` in 7.0
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/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
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AttributeLoaderTest.php b/src/Symfony/Component/Validator/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

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,10 @@`
`30`	`30`	`use Symfony\Component\Validator\Constraints\Valid;`
`31`	`31`	`use Symfony\Component\Validator\Mapping\ClassMetadata;`
`32`	`32`	`use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;`
	`33`	`+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;`
`33`	`34`	`use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;`
`34`	`35`
`35`		`-class AnnotationLoaderTest extends TestCase`
	`36`	`+class AttributeLoaderTest extends TestCase`
`36`	`37`	`{`
`37`	`38`	`public function testLoadClassMetadataReturnsTrueIfSuccessful()`
`38`	`39`	`{`
`@@ -212,7 +213,7 @@ public function testLoadGroupSequenceProviderAnnotation()`
`212`	`213`
`213`	`214`	`protected function createAnnotationLoader(): AnnotationLoader`
`214`	`215`	`{`
`215`		`- return new AnnotationLoader();`
	`216`	`+ return new AttributeLoader();`
`216`	`217`	`}`
`217`	`218`
`218`	`219`	`protected function getFixtureNamespace(): string`