Skip to content

Commit e1ca3b5

Browse files
alexandre-dauboisalexandre-daubois
committed
[FrameworkBundle][Validator] Remove remaining deprecations
1 parent 9b8f1e3 commit e1ca3b5

File tree

22 files changed

+110
-196
lines changed

22 files changed

+110
-196
lines changed

‎UPGRADE-7.0.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ FrameworkBundle
210210
* Make the `framework.uid.default_uuid_version` config option default to `7`
211211
* Make the `framework.uid.time_based_uuid_version` config option default to `7`
212212
* Make the `framework.validation.email_validation_mode` config option default to `html5`
213+
* Remove the `framework.validation.enable_annotations` config option, use `framework.validation.enable_attributes` instead
214+
* Remove the `framework.serializer.enable_annotations` config option, use `framework.serializer.enable_attributes` instead
213215

214216
HttpFoundation
215217
--------------
@@ -475,6 +477,9 @@ Validator
475477
* Remove the annotation reader parameter from the constructor signature of `AnnotationLoader`
476478
* Remove `ValidatorBuilder::setDoctrineAnnotationReader()`
477479
* Remove `ValidatorBuilder::addDefaultDoctrineAnnotationReader()`
480+
* Remove `ValidatorBuilder::enableAnnotationMapping()`, use `ValidatorBuilder::enableAttributeMapping()` instead
481+
* Remove `ValidatorBuilder::disableAnnotationMapping()`, use `ValidatorBuilder::disableAttributeMapping()` instead
482+
* Remove `AnnotationLoader`, use `AttributeLoader` instead
478483

479484
VarDumper
480485
---------

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"symfony/stopwatch": "^6.4|^7.0",
4040
"symfony/translation": "^6.4|^7.0",
4141
"symfony/uid": "^6.4|^7.0",
42-
"symfony/validator": "^6.4|^7.0",
42+
"symfony/validator": "^7.0",
4343
"symfony/var-dumper": "^6.4|^7.0",
4444
"doctrine/collections": "^1.0|^2.0",
4545
"doctrine/data-fixtures": "^1.1",
@@ -61,7 +61,7 @@
6161
"symfony/property-info": "<6.4",
6262
"symfony/security-bundle": "<6.4",
6363
"symfony/security-core": "<6.4",
64-
"symfony/validator": "<6.4"
64+
"symfony/validator": "<7.0"
6565
},
6666
"autoload": {
6767
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ CHANGELOG
2222
* Make the `framework.uid.default_uuid_version` config option default to `7`
2323
* Make the `framework.uid.time_based_uuid_version` config option default to `7`
2424
* Make the `framework.validation.email_validation_mode` config option default to `html5`
25+
* Remove the `framework.validation.enable_annotations` config option, use `framework.validation.enable_attributes` instead
26+
* Remove the `framework.serializer.enable_annotations` config option, use `framework.serializer.enable_attributes` instead
2527

2628
6.4
2729
---

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,6 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
989989
->{$enableIfStandalone('symfony/validator', Validation::class)}()
990990
->children()
991991
->scalarNode('cache')->end()
992-
->booleanNode('enable_annotations')->end()
993992
->booleanNode('enable_attributes')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
994993
->arrayNode('static_method')
995994
->defaultValue(['loadValidatorMetadata'])
@@ -1090,24 +1089,9 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
10901089
$rootNode
10911090
->children()
10921091
->arrayNode('serializer')
1093-
->validate()
1094-
->always(function ($v) {
1095-
if (isset($v['enable_annotations'])) {
1096-
trigger_deprecation('symfony/framework-bundle', '6.4', 'Option "enable_annotations" at "framework.serializer" is deprecated. Use the "enable_attributes" option instead.');
1097-
1098-
if (!isset($v['enable_attributes'])) {
1099-
$v['enable_attributes'] = $v['enable_annotations'];
1100-
} else {
1101-
throw new LogicException('The "enable_annotations" and "enable_attributes" options at path "framework.serializer" must not be both set. Only the "enable_attributes" option must be used.');
1102-
}
1103-
}
1104-
1105-
return $v;
1106-
})->end()
11071092
->info('serializer configuration')
11081093
->{$enableIfStandalone('symfony/serializer', Serializer::class)}()
11091094
->children()
1110-
->booleanNode('enable_annotations')->end()
11111095
->booleanNode('enable_attributes')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
11121096
->scalarNode('name_converter')->end()
11131097
->scalarNode('circular_reference_handler')->end()

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@
266266

267267
<xsd:attribute name="enabled" type="xsd:boolean" />
268268
<xsd:attribute name="cache" type="xsd:string" />
269-
<xsd:attribute name="enable-annotations" type="xsd:boolean" />
270269
<xsd:attribute name="enable-attributes" type="xsd:boolean" />
271270
<xsd:attribute name="static-method" type="xsd:boolean" />
272271
<xsd:attribute name="translation-domain" type="xsd:string" />
@@ -320,7 +319,6 @@
320319
<xsd:element name="default-context" type="metadata" minOccurs="0" maxOccurs="1" />
321320
</xsd:choice>
322321
<xsd:attribute name="enabled" type="xsd:boolean" />
323-
<xsd:attribute name="enable-annotations" type="xsd:boolean" />
324322
<xsd:attribute name="enable-attributes" type="xsd:boolean" />
325323
<xsd:attribute name="name-converter" type="xsd:string" />
326324
<xsd:attribute name="circular-reference-handler" type="xsd:string" />

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"symfony/translation": "^6.4|^7.0",
4848
"symfony/twig-bundle": "^6.4|^7.0",
4949
"symfony/twig-bridge": "^6.4|^7.0",
50-
"symfony/validator": "^6.4|^7.0",
50+
"symfony/validator": "^7.0",
5151
"symfony/yaml": "^6.4|^7.0",
5252
"twig/twig": "^2.13|^3.0.4",
5353
"web-token/jwt-checker": "^3.1",

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"symfony/translation-contracts": "^2.5|^3",
4444
"symfony/uid": "^6.4|^7.0",
4545
"symfony/validator": "^6.4|^7.0",
46-
"symfony/var-exporter": "^6.4|^7.0",
46+
"symfony/var-exporter": "^7.0",
4747
"psr/cache": "^1.0|^2.0|^3.0",
4848
"twig/twig": "^2.13|^3.0.4"
4949
},
@@ -65,7 +65,7 @@
6565
"symfony/translation": "<6.4",
6666
"symfony/translation-contracts": "<2.5",
6767
"symfony/twig-bridge": "<6.4",
68-
"symfony/validator": "<6.4",
68+
"symfony/validator": "<7.0",
6969
"symfony/var-dumper": "<6.4",
7070
"twig/twig": "<2.13"
7171
},

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
"symfony/ldap": "^6.4|^7.0",
3232
"symfony/string": "^6.4|^7.0",
3333
"symfony/translation": "^6.4|^7.0",
34-
"symfony/validator": "^6.4|^7.0",
34+
"symfony/validator": "^7.0",
3535
"psr/log": "^1|^2|^3"
3636
},
3737
"conflict": {
3838
"symfony/event-dispatcher": "<6.4",
3939
"symfony/http-foundation": "<6.4",
4040
"symfony/security-guard": "<6.4",
4141
"symfony/ldap": "<6.4",
42-
"symfony/validator": "<6.4"
42+
"symfony/validator": "<7.0"
4343
},
4444
"autoload": {
4545
"psr-4": { "Symfony\\Component\\Security\\Core\\": "" },

‎src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function testDenormalizeWithNestedAttributesWithoutMetadata()
142142

143143
public function testDenormalizeWithSnakeCaseNestedAttributes()
144144
{
145-
$factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
145+
$factory = new ClassMetadataFactory(new AnnotationLoader());
146146
$normalizer = new ObjectNormalizer($factory, new CamelCaseToSnakeCaseNameConverter());
147147
$data = [
148148
'one' => [
@@ -155,7 +155,7 @@ public function testDenormalizeWithSnakeCaseNestedAttributes()
155155

156156
public function testNormalizeWithSnakeCaseNestedAttributes()
157157
{
158-
$factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
158+
$factory = new ClassMetadataFactory(new AnnotationLoader());
159159
$normalizer = new ObjectNormalizer($factory, new CamelCaseToSnakeCaseNameConverter());
160160
$dummy = new SnakeCaseNestedDummy();
161161
$dummy->fooBar = 'fooBar';

‎src/Symfony/Component/Validator/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ CHANGELOG
1515
* Remove the annotation reader parameter from the constructor signature of `AnnotationLoader`
1616
* Remove `ValidatorBuilder::setDoctrineAnnotationReader()`
1717
* Remove `ValidatorBuilder::addDefaultDoctrineAnnotationReader()`
18+
* Remove `ValidatorBuilder::enableAnnotationMapping()`, use `ValidatorBuilder::enableAttributeMapping()` instead
19+
* Remove `ValidatorBuilder::disableAnnotationMapping()`, use `ValidatorBuilder::disableAttributeMapping()` instead
20+
* Remove `AnnotationLoader`, use `AttributeLoader` instead
1821

1922
6.4
2023
---

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy