[Form] Deprecated ArrayKeyChoiceList

webmozart · webmozart · commit 5386752bf9cf · 2015-11-26T18:38:25.000+01:00
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -251,6 +251,9 @@ Form
        <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\TextType" />
    </service>
    ```
+   
+ * The class `ArrayKeyChoiceList` was deprecated and will be removed in Symfony
+   3.0. Use `ArrayChoiceList` instead.
 
 Translator
 ----------
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -312,6 +312,9 @@ UPGRADE FROM 2.x to 3.0
  * The `Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList` class has been removed in
    favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
 
+ * The `Symfony\Component\Form\ChoiceList\ArrayKeyChoiceList` class has been removed in
+   favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
+
 ### FrameworkBundle
 
  * The `config:debug`, `container:debug`, `router:debug`, `translation:debug`
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayKeyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayKeyChoiceList.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Form\ChoiceList;
 
+@trigger_error('The '.__NAMESPACE__.'\ArrayKeyChoiceList class is deprecated since version 2.8 and will be removed in 3.0. Use '.__NAMESPACE__.'\ArrayChoiceList instead.', E_USER_DEPRECATED);
+
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 
 /**
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayKeyChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayKeyChoiceListTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @group legacy
  */
 class ArrayKeyChoiceListTest extends AbstractChoiceListTest
 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
	`18`	`+ *`
	`19`	`+ * @group legacy`
`18`	`20`	`*/`
`19`	`21`	`class ArrayKeyChoiceListTest extends AbstractChoiceListTest`
`20`	`22`	`{`