Merge pull request #54 from symfony-cmf/start-1.1

starting version 1.1 with symfony 2.2 only
symfony-cmf · Apr 30, 2013 · bf35d48 · bf35d48
2 parents a98a795 + a4442ac
commit bf35d48
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 218 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ php:
     - 5.4
 
 env:
-  - SYMFONY_VERSION=2.1.*
   - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=dev-master
 

diff --git a/NestedMatcher/ConfigurableUrlMatcher.php b/NestedMatcher/ConfigurableUrlMatcher.php
diff --git a/ProviderBasedGenerator.php b/ProviderBasedGenerator.php
@@ -43,13 +43,7 @@ public function generate($name, $parameters = array(), $absolute = false)
 
         // the Route has a cache of its own and is not recompiled as long as it does not get modified
         $compiledRoute = $route->compile();
-
-        // handle symfony 2.1 and 2.2
-        // getHostTokens exists only since 2.2
-        $hostTokens = null;
-        if (method_exists($compiledRoute, 'getHostTokens')) {
-            $hostTokens = $compiledRoute->getHostTokens();
-        }
+        $hostTokens = $compiledRoute->getHostTokens();
 
         return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostTokens);
     }

diff --git a/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php b/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.2",
-        "symfony/routing": ">=2.1,<2.3-dev",
-        "symfony/http-kernel": ">=2.1,<2.3-dev"
+        "symfony/routing": ">=2.2,<2.3-dev",
+        "symfony/http-kernel": ">=2.2,<2.3-dev"
     },
     "suggest": {
         "symfony/http-foundation": "ChainRouter/DynamicRouter have optional support for Request instances, several enhancers require a Request instances, >=2.1,<2.3-dev"
@@ -26,7 +26,7 @@
     "target-dir": "Symfony/Cmf/Component/Routing",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         }
     }
 }