Fix symfony 2.8 build

Author: killerwolf

.travis.yml

@@ -28,7 +28,6 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION=3.0.*
   allow_failures:
-    - env: SYMFONY_VERSION=2.8.*
     - env: SYMFONY_VERSION=3.0.*
   fast_finish: true
 

Admin/RouteAdmin.php

@@ -150,9 +150,9 @@ protected function configureFieldsForDefaults($dynamicDefaults)
         $textType = $isSf28 ? 'Symfony\Component\Form\Extension\Core\Type\TextType' : 'text';
 
         $defaults = array(
-            '_controller' => array('_controller', $textType, array('required' => false)),
-            '_template' => array('_template', $textType, array('required' => false)),
-            'type' => array('type', $isSf28 ? 'Symfony\Cmf\Bundle\RoutingBundle\Form\Type\RouteTypeType' : 'cmf_routing_route_type', array(
+            '_controller' => array('_controller', Sf2CompatUtil::getFormTypeName('text'), array('required' => false)),
+            '_template' => array('_template', Sf2CompatUtil::getFormTypeName('text'), array('required' => false)),
+            'type' => array('type', Sf2CompatUtil::getFormTypeName('cmf_routing_route_type'), array(
                 'empty_value' => '',
                 'required' => false,
             )),

Controller/RedirectController.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Controller;
 
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Cmf\Component\Routing\RedirectRouteInterface;
 
@@ -53,10 +54,10 @@ public function redirectAction(RedirectRouteInterface $contentDocument)
         if (empty($url)) {
             $routeTarget = $contentDocument->getRouteTarget();
             if ($routeTarget) {
-                $url = $this->router->generate($routeTarget, $contentDocument->getParameters(), true);
+                $url = $this->router->generate($routeTarget, $contentDocument->getParameters(), UrlGeneratorInterface::ABSOLUTE_URL);
             } else {
                 $routeName = $contentDocument->getRouteName();
-                $url = $this->router->generate($routeName, $contentDocument->getParameters(), true);
+                $url = $this->router->generate($routeName, $contentDocument->getParameters(), UrlGeneratorInterface::ABSOLUTE_URL);
             }
         }
 

Tests/Functional/Routing/DynamicRouterTest.php

@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
@@ -347,7 +348,7 @@ public function testGenerate()
     public function testGenerateAbsolute()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute/child');
-        $url = $this->router->generate($route, array('test' => 'value'), true);
+        $url = $this->router->generate($route, array('test' => 'value'), UrlGeneratorInterface::ABSOLUTE_URL);
         $this->assertEquals('http://localhost/testroute/child?test=value', $url);
     }
 

composer.json

@@ -23,9 +23,9 @@
         "symfony-cmf/testing": "~1.2,>=1.2.7",
         "doctrine/phpcr-odm": "~1.3",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
-        "matthiasnoback/symfony-config-test": "0.*",
+        "matthiasnoback/symfony-config-test": "^1.3.1",
         "phpunit/php-code-coverage": "@stable",
-        "sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
+        "sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
         "symfony/monolog-bundle": "~2.3",
         "doctrine/orm": "~2.3",
         "doctrine/data-fixtures": "1.*,>=1.0.0-alpha3"