symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
Lines changed: 0 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/Fixtures/LazyChoiceListImpl.php
Lines changed: 29 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/Fixtures/LazyChoiceListImpl.php
Lines changed: 29 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/Fixtures/LazyChoiceListInvalidImpl.php
Lines changed: 22 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/Fixtures/LazyChoiceListInvalidImpl.php
Lines changed: 22 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
Lines changed: 5 additions & 27 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
Lines changed: 5 additions & 27 deletions
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Extension\Core\ChoiceList;
 
-trigger_error('The '.__NAMESPACE__.'\ChoiceListInterface interface is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Form\ChoiceList\ChoiceListInterface instead.', E_USER_DEPRECATED);
-
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface as BaseChoiceListInterface;
 use Symfony\Component\Form\FormConfigBuilder;
 
 
@@ -639,7 +639,7 @@ public function testCreateViewFlatAttrAsArray()
             null, // group
             array(
                 'B' => array('attr1' => 'value1'),
-                'C' => array('attr2' => 'value2')
+                'C' => array('attr2' => 'value2'),
             )
         );
 
@@ -730,6 +730,9 @@ function ($object, $key, $value) {
         $this->assertFlatViewWithAttr($view);
     }
 
+    /**
+     * @group legacy
+     */
     public function testCreateViewForLegacyChoiceList()
     {
         $preferred = array(new ChoiceView('Preferred', 'x', 'x'));
 
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\ChoiceList\Fixtures;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\LazyChoiceList;
+
+class LazyChoiceListImpl extends LazyChoiceList
+{
+    private $choiceList;
+
+    public function __construct($choiceList)
+    {
+        $this->choiceList = $choiceList;
+    }
+
+    protected function loadChoiceList()
+    {
+        return $this->choiceList;
+    }
+}
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\ChoiceList\Fixtures;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\LazyChoiceList;
+
+class LazyChoiceListInvalidImpl extends LazyChoiceList
+{
+    protected function loadChoiceList()
+    {
+        return new \stdClass();
+    }
+}
@@ -12,24 +12,25 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\ChoiceList;
 
 use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
-use Symfony\Component\Form\Extension\Core\ChoiceList\LazyChoiceList;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Tests\Extension\Core\ChoiceList\Fixtures\LazyChoiceListImpl;
+use Symfony\Component\Form\Tests\Extension\Core\ChoiceList\Fixtures\LazyChoiceListInvalidImpl;
 
 /**
  * @group legacy
  */
 class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var LazyChoiceListTest_Impl
+     * @var LazyChoiceListImpl
      */
     private $list;
 
     protected function setUp()
     {
         parent::setUp();
 
-        $this->list = new LazyChoiceListTest_Impl(new SimpleChoiceList(array(
+        $this->list = new LazyChoiceListImpl(new SimpleChoiceList(array(
             'a' => 'A',
             'b' => 'B',
             'c' => 'C',
@@ -92,31 +93,8 @@ public function testGetValuesForChoices()
      */
     public function testLoadChoiceListShouldReturnChoiceList()
     {
-        $list = new LazyChoiceListTest_InvalidImpl();
+        $list = new LazyChoiceListInvalidImpl();
 
         $list->getChoices();
     }
 }
-
-class LazyChoiceListTest_Impl extends LazyChoiceList
-{
-    private $choiceList;
-
-    public function __construct($choiceList)
-    {
-        $this->choiceList = $choiceList;
-    }
-
-    protected function loadChoiceList()
-    {
-        return $this->choiceList;
-    }
-}
-
-class LazyChoiceListTest_InvalidImpl extends LazyChoiceList
-{
-    protected function loadChoiceList()
-    {
-        return new \stdClass();
-    }
-}