[2.7] setDefaultOptions is renamed to configureOptions

Author: wouterj

Form/Type/RouteTypeType.php

@@ -12,14 +12,18 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class RouteTypeType extends AbstractType
 {
     protected $routeTypes = array();
     protected $translator;
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
         $choices = array();
         foreach ($this->routeTypes as $routeType) {
@@ -32,6 +36,16 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         ));
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @todo Remove when Symfony <2.7 support is dropped.
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * Register a route type
      *

Tests/Unit/Form/Type/RouteTypeTypeTest.php

@@ -19,16 +19,14 @@ class RouteTypeTypeTest extends \PHPUnit_Framework_Testcase
     public function setUp()
     {
         $this->type = new RouteTypeType;
-        $this->ori = $this->getMock(
-            'Symfony\Component\OptionsResolver\OptionsResolverInterface');
     }
 
     public function testSetDefaultOptions()
     {
         $type = new RouteTypeType;
         $optionsResolver = new OptionsResolver();
 
-        $type->setDefaultOptions($optionsResolver);
+        $type->configureOptions($optionsResolver);
 
         $options = $optionsResolver->resolve();
 
@@ -40,7 +38,8 @@ public function testDefaultsSet()
         $this->type->addRouteType('foobar');
         $this->type->addRouteType('barfoo');
 
-        $this->ori->expects($this->once())
+        $optionsResolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolver');
+        $optionsResolver->expects($this->once())
             ->method('setDefaults')
             ->with(array(
                 'choices' => array(
@@ -50,6 +49,6 @@ public function testDefaultsSet()
                 'translation_domain' => 'CmfRoutingBundle',
             ));
 
-        $this->type->setDefaultOptions($this->ori);
+        $this->type->configureOptions($optionsResolver);
     }
 }