[FrameworkBundle] Deprecate not setting some options (uid, validation)

Author: Jean-Beru

CHANGELOG.md

@@ -17,6 +17,9 @@ CHANGELOG
  * Deprecate not setting the `framework.session.cookie_secure` config option; it will default to `auto` in 7.0
  * Deprecate not setting the `framework.session.cookie_samesite` config option; it will default to `lax` in 7.0
  * Deprecate not setting the `framework.session.handler_id` config option; it will default to `session.handler.native_file` when `framework.session.save_path` is set or `null` otherwise 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
 
 6.3
 ---

DependencyInjection/Configuration.php

@@ -1018,6 +1018,15 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
     private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
+            ->validate()
+                ->always(function ($v) {
+                    if ($v['validation']['enabled'] && !\array_key_exists('email_validation_mode', $v['validation'])) {
+                        trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.validation.email_validation_mode" config option is deprecated. It will default to "html5" in 7.0.');
+                    }
+
+                    return $v;
+                })
+            ->end()
             ->children()
                 ->arrayNode('validation')
                     ->info('validation configuration')
@@ -2350,14 +2359,30 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
     private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
+            ->validate()
+                ->always(function ($v) {
+                    if ($v['uid']['enabled']) {
+                        if (!\array_key_exists('default_uuid_version', $v['uid'])) {
+                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.uid.default_uuid_version" config option is deprecated. It will default to "7" in 7.0.');
+                        }
+
+                        if (!\array_key_exists('time_based_uuid_version', $v['uid'])) {
+                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.uid.time_based_uuid_version" config option is deprecated. It will default to "7" in 7.0.');
+                        }
+                    }
+
+                    $v['uid'] += ['default_uuid_version' => 6, 'time_based_uuid_version' => 6];
+
+                    return $v;
+                })
+            ->end()
             ->children()
                 ->arrayNode('uid')
                     ->info('Uid configuration')
                     ->{$enableIfStandalone('symfony/uid', UuidFactory::class)}()
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->enumNode('default_uuid_version')
-                            ->defaultValue(6)
                             ->values([7, 6, 4, 1])
                         ->end()
                         ->enumNode('name_based_uuid_version')
@@ -2368,7 +2393,6 @@ private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIf
                             ->cannotBeEmpty()
                         ->end()
                         ->enumNode('time_based_uuid_version')
-                            ->defaultValue(6)
                             ->values([7, 6, 1])
                         ->end()
                         ->scalarNode('time_based_uuid_node')

Tests/DependencyInjection/Fixtures/php/full.php

@@ -58,6 +58,7 @@
     ],
     'validation' => [
         'enabled' => true,
+        'email_validation_mode' => 'html5',
     ],
     'annotations' => false,
     'serializer' => [

Tests/DependencyInjection/Fixtures/php/validation_annotations.php

@@ -9,6 +9,7 @@
     'validation' => [
         'enabled' => true,
         'enable_annotations' => true,
+        'email_validation_mode' => 'html5',
     ],
 ]);
 

Tests/DependencyInjection/Fixtures/php/validation_auto_mapping.php

@@ -7,6 +7,7 @@
     'php_errors' => ['log' => true],
     'property_info' => ['enabled' => true],
     'validation' => [
+        'email_validation_mode' => 'html5',
         'auto_mapping' => [
             'App\\' => ['foo', 'bar'],
             'Symfony\\' => ['a', 'b'],

Tests/DependencyInjection/Fixtures/php/validation_legacy_annotations.php

@@ -11,6 +11,7 @@
     'validation' => [
         'enabled' => true,
         'enable_annotations' => true,
+        'email_validation_mode' => 'html5',
     ],
 ]);
 

Tests/DependencyInjection/Fixtures/php/validation_mapping.php

@@ -6,6 +6,7 @@
     'handle_all_throwables' => true,
     'php_errors' => ['log' => true],
     'validation' => [
+        'email_validation_mode' => 'html5',
         'mapping' => [
             'paths' => [
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files',

Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php

@@ -8,6 +8,7 @@
     'secret' => 's3cr3t',
     'validation' => [
         'enabled' => true,
+        'email_validation_mode' => 'html5',
         'static_method' => ['loadFoo', 'loadBar'],
     ],
 ]);

Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php

@@ -8,6 +8,7 @@
     'secret' => 's3cr3t',
     'validation' => [
         'enabled' => true,
+        'email_validation_mode' => 'html5',
         'static_method' => false,
     ],
 ]);

Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php

@@ -6,6 +6,7 @@
     'handle_all_throwables' => true,
     'php_errors' => ['log' => true],
     'validation' => [
+        'email_validation_mode' => 'html5',
         'translation_domain' => 'messages',
     ],
 ]);