Merge pull request #169 from symfony-cmf/prepare-1.4

use stable dependencies
symfony-cmf · Mar 31, 2016 · b93704c · b93704c
2 parents 8f17286 + 4702c26
commit b93704c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DynamicRouter.php b/DynamicRouter.php
@@ -210,7 +210,7 @@ public function supports($name)
      *                                   request method is not allowed
      *
      * @deprecated Use matchRequest exclusively to avoid problems. This method will be removed in version 2.0
-     * 
+     *
      * @api
      */
     public function match($pathinfo)

diff --git a/composer.json b/composer.json
@@ -18,11 +18,11 @@
         "psr/log": "1.*"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.3@dev",
+        "symfony-cmf/testing": "^1.3",
         "symfony/dependency-injection": "^2.0.5|3.*",
         "symfony/config": "^2.2|3.*",
         "symfony/event-dispatcher": "^2.1|3.*",
-        "friendsofsymfony/jsrouting-bundle": "@dev"
+        "friendsofsymfony/jsrouting-bundle": "^1.1"
     },
     "suggest": {
         "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
-Original file line number
+Diff line change
@@ Expand Up / @@ -210,7 +210,7 @@ public function supports($name) @@
          *                                   request method is not allowed
          *
          * @deprecated Use matchRequest exclusively to avoid problems. This method will be removed in version 2.0
-         *
+         *
          * @api
          */
         public function match($pathinfo)
@@ Expand Down @@