Merge pull request #300 from symfony-cmf/remove_deprecations

Remove deprecations

Author: dbu

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/Functional/Doctrine/Phpcr/RouteTest.php

@@ -40,14 +40,14 @@ public function testPersist()
 
         $this->getDm()->persist($route);
         $this->getDm()->flush();
-        $this->assertEquals('/testroute', $route->getPattern());
+        $this->assertEquals('/testroute', $route->getPath());
 
         $this->getDm()->clear();
 
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute');
 
         $this->assertNotNull($route->getContent());
-        $this->assertEquals('/testroute', $route->getPattern());
+        $this->assertEquals('/testroute', $route->getPath());
 
         $this->assertEquals('y', $route->getDefault('x'));
         $defaults = $route->getDefaults();
@@ -93,13 +93,13 @@ public function testPersistEmptyOptions()
     public function testRootRoute()
     {
         $root = $this->getDm()->find(null, self::ROUTE_ROOT);
-        $this->assertEquals('/', $root->getPattern());
+        $this->assertEquals('/', $root->getPath());
     }
 
     public function testSetPattern()
     {
         $root = $this->getDm()->find(null, self::ROUTE_ROOT);
-        $root->setPattern('/{test}');
+        $root->setPath('/{test}');
         $this->assertEquals('{test}', $root->getVariablePattern());
     }
 
@@ -110,7 +110,7 @@ public function testSetPattern()
      */
     public function testSetPatternInvalid(Route $route)
     {
-        $route->setPattern('/impossible');
+        $route->setPath('/impossible');
     }
 
     /**
@@ -120,7 +120,7 @@ public function testInvalidIdPrefix()
     {
         $root = $this->getDm()->find(null, self::ROUTE_ROOT);
         $root->setPrefix('/changed'); // simulate a problem with the prefix setter listener
-        $this->assertEquals('/', $root->getPattern());
+        $this->assertEquals('/', $root->getPath());
     }
 
     /**
@@ -129,7 +129,7 @@ public function testInvalidIdPrefix()
     public function testPrefixNonpersisted()
     {
         $route = new Route();
-        $route->getPattern();
+        $route->getPath();
     }
 
     public function testDefaultFormat()
@@ -146,6 +146,6 @@ public function testDefaultFormat()
 
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/format');
 
-        $this->assertEquals('/format.{_format}', $route->getPattern());
+        $this->assertEquals('/format.{_format}', $route->getPath());
     }
 }

Tests/Functional/Routing/DynamicRouterTest.php

@@ -141,7 +141,7 @@ public function testNotAllowed()
         // do not set a content here, or we need a valid request and so on...
         $route = new Route();
         $route->setPosition($root, 'notallowed');
-        $route->setRequirement('_method', 'GET');
+        $route->setMethods(array('GET'));
         $route->setDefault(RouteObjectInterface::CONTROLLER_NAME, 'testController');
         $this->getDm()->persist($route);
         $this->getDm()->flush();

Tests/Resources/app/config/test_routing.yml

@@ -1,3 +1,3 @@
 symfony_route:
-    pattern:  /symfony_route_test
+    path:     /symfony_route_test
     defaults: { _controller: Test:controller }

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);
     }
 }