Merge pull request #211 from KnpLabs/sf2.7

Allowed Symfony 2.7 version

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     fast_finish: true
     allow_failures:
         - php: hhvm
-        - env: SYMFONY_VERSION='2.7.*@dev'
+        - env: SYMFONY_VERSION='2.8.*@dev'
         - php: 7.0
     include:
         - php: 5.4
@@ -16,15 +16,17 @@ matrix:
         - php: 5.4
           env: SYMFONY_VERSION='2.6.*'
         - php: 5.4
-          env: SYMFONY_VERSION='2.7.*@dev'
+          env: SYMFONY_VERSION='2.7.*'
+        - php: 5.4
+          env: SYMFONY_VERSION='2.8.*@dev'
 
 before_script:
     - composer selfupdate
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony=$SYMFONY_VERSION; else composer install; fi;
     - phantomjs --version
     - phantomjs --webdriver=4444 &
     - php -S localhost:8080 -t features/Context/fixtures &
-    
+
 script:
     - ./bin/phpspec run -fpretty
     - ./bin/behat --verbose

Routing/Loader/ConventionalLoader.php

@@ -14,7 +14,7 @@ class ConventionalLoader extends YamlFileLoader
         'prefix', 'defaults', 'requirements', 'options', 'collections', 'resources'
     );
     private static $supportedActionKeys = array(
-        'pattern', 'defaults', 'requirements', 'options'
+        'pattern', 'defaults', 'requirements', 'options', 'methods'
     );
     private $yaml;
 
@@ -370,6 +370,9 @@ private function overrideRouteParams($shortname, Route $route, $params)
             if (isset($params['options'])) {
                 $route->setOptions($params['options']);
             }
+            if (isset($params['methods'])) {
+                $route->setMethods($params['methods']);
+            }
         }
     }
 

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php":                      ">=5.4",
-        "symfony/symfony":          "~2.4,<2.7",
+        "symfony/symfony":          "~2.4",
         "nelmio/alice":             "~1.5",
         "fzaninotto/faker":         "~1.2"
     },

features/csrf_protection.feature

@@ -23,10 +23,10 @@ Feature: CSRF protection for unsafe requests
         App:Foo:show: ~
         App:Foo:delete:
             defaults: { _check_csrf: true }
-            requirements: { method: delete }
+            methods: GET|DELETE
         App:Foo:deleteUnsafe:
             defaults: { _check_csrf: false, _controller: App:Foo:delete }
-            requirements: { method: delete }
+            methods: DELETE
         """
         And I write in "App/Resources/views/Foo/show.html.twig":
         """

spec/Knp/RadBundle/Routing/Loader/ConventionalLoaderSpec.php

@@ -446,7 +446,7 @@ function it_should_throw_exception_if_unsupported_action_route_param_provided($y
         ));
 
         $this->shouldThrow(new InvalidArgumentException(
-            '`unsopported_key` parameter is not supported by `App:Admin\Cheeses:show` action route. Use one of [pattern, defaults, requirements, options].'
+            '`unsopported_key` parameter is not supported by `App:Admin\Cheeses:show` action route. Use one of [pattern, defaults, requirements, options, methods].'
         ))->duringLoad('routing.yml');
     }