Update for 7.1

MatTheCat · MatTheCat · commit 286bab134aee · 2023-11-18T15:46:09.000+01:00
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+* Deprecate not configuring the `default_protocol` option of the `UrlType`, it will default to `null` in 8.0
+
 7.0
 ---
 
@@ -18,7 +23,6 @@ CHANGELOG
  * Deprecate `PostSubmitEvent::setData()`, use `PreSubmitDataEvent::setData()` or `SubmitDataEvent::setData()` instead
  * Add `duplicate_preferred_choices` option in `ChoiceType`
  * Add `$duplicatePreferredChoices` parameter to `ChoiceListFactoryInterface::createView()`
- * Deprecate not configuring the `default_protocol` option of the `UrlType`, it will default to `null` in 7.0
 
 6.3
 ---
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -40,7 +40,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'default_protocol' => static function (Options $options) {
-                trigger_deprecation('symfony/form', '6.4', 'Not configuring the "default_protocol" option is deprecated. It will default to "null" in 7.0.');
+                trigger_deprecation('symfony/form', '7.1', 'Not configuring the "default_protocol" option when using the UrlType is deprecated. It will default to "null" in 8.0.');
 
                 return 'http';
             },
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -25,7 +25,7 @@ class UrlTypeTest extends TextTypeTest
      */
     public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
     {
-        $this->expectDeprecation('Since symfony/form 6.4: Not configuring the "default_protocol" option is deprecated. It will default to "null" in 7.0.');
+        $this->expectDeprecation('Since symfony/form 7.1: Not configuring the "default_protocol" option when using the UrlType is deprecated. It will default to "null" in 8.0.');
         $form = $this->factory->create(static::TESTED_TYPE, 'name');
 
         $form->submit('www.domain.com');

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function configureOptions(OptionsResolver $resolver): void`
`40`	`40`	`{`
`41`	`41`	`$resolver->setDefaults([`
`42`	`42`	`'default_protocol' => static function (Options $options) {`
`43`		`- trigger_deprecation('symfony/form', '6.4', 'Not configuring the "default_protocol" option is deprecated. It will default to "null" in 7.0.');`
	`43`	`+ trigger_deprecation('symfony/form', '7.1', 'Not configuring the "default_protocol" option when using the UrlType is deprecated. It will default to "null" in 8.0.');`
`44`	`44`
`45`	`45`	`return 'http';`
`46`	`46`	`},`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class UrlTypeTest extends TextTypeTest`
`25`	`25`	`*/`
`26`	`26`	`public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()`
`27`	`27`	`{`
`28`		`- $this->expectDeprecation('Since symfony/form 6.4: Not configuring the "default_protocol" option is deprecated. It will default to "null" in 7.0.');`
	`28`	`+ $this->expectDeprecation('Since symfony/form 7.1: Not configuring the "default_protocol" option when using the UrlType is deprecated. It will default to "null" in 8.0.');`
`29`	`29`	`$form = $this->factory->create(static::TESTED_TYPE, 'name');`
`30`	`30`
`31`	`31`	`$form->submit('www.domain.com');`