Merge pull request #357 from dunglas/fix_tests

Update dependencies and fix tests

Author: dunglas

.travis.yml

@@ -8,26 +8,23 @@ cache:
 
 php:
     - 5.5
+    - 5.6
     - 7.0
-    - nightly
     - hhvm
 
 matrix:
     fast_finish: true
     include:
-        - php: 5.6
+        - php: 7.0
           env: SYMFONY_VERSION=2.7.*
-        - php: 5.6
-          env: SYMFONY_VERSION=2.8.*@dev
-        - php: 5.6
-          env: SYMFONY_VERSION="3.0.*@dev"
+        - php: 7.0
+          env: SYMFONY_VERSION=2.8.*
+        - php: 7.0
+          env: SYMFONY_VERSION=3.0.*
         - php: 7.0
 
     allow_failures:
-        - php: 7.0
-        - php: nightly
-        - env: SYMFONY_VERSION=2.8.*@dev
-        - env: SYMFONY_VERSION="3.0.*@dev"
+        - env: SYMFONY_VERSION=3.0.*
 
 before_install:
     - composer self-update

Tests/Routing/RouterTest.php

@@ -14,8 +14,9 @@
 use Dunglas\ApiBundle\Routing\Router;
 use Prophecy\Argument;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Router as SymfonyRouter;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -49,7 +50,7 @@ public function testGetRouteCollection()
     public function testGenerate()
     {
         $mockedRouter = $this->prophesize('Symfony\Component\Routing\RouterInterface');
-        $mockedRouter->generate('foo', [], false)->willReturn('/bar')->shouldBeCalled();
+        $mockedRouter->generate('foo', [], RouterInterface::ABSOLUTE_PATH)->willReturn('/bar')->shouldBeCalled();
 
         $router = new Router($mockedRouter->reveal());
         $this->assertSame('/bar', $router->generate('foo'));

composer.json

@@ -30,12 +30,11 @@
     "behat/mink": "~1.5",
     "behat/mink-extension": "~2.0",
     "behat/mink-browserkit-driver": "~1.1",
-    "behatch/contexts": "dev-master#eef7ab39ca896796bf3ba25a0fa5a95f15276eb7",
+    "behatch/contexts": "~2.3",
     "symfony/finder": "~2.3",
-    "phpunit/phpunit": "~4.6",
     "doctrine/orm": "~2.2,>=2.2.3",
     "doctrine/doctrine-bundle": "~1.2",
-    "php-mock/php-mock-phpunit": "^0.3"
+    "php-mock/php-mock-phpunit": "~1.1"
   },
   "suggest": {
     "doctrine/doctrine-bundle": "To use the Doctrine ORM bridge.",