dawehner
diff --git a/‎.travis.yml
Lines changed: 0 additions & 1 deletion b/‎.travis.yml
Lines changed: 0 additions & 1 deletion
diff --git a/‎NestedMatcher/ConfigurableUrlMatcher.php
Lines changed: 0 additions & 70 deletions b/‎NestedMatcher/ConfigurableUrlMatcher.php
Lines changed: 0 additions & 70 deletions
diff --git a/‎ProviderBasedGenerator.php
Lines changed: 1 addition & 7 deletions b/‎ProviderBasedGenerator.php
Lines changed: 1 addition & 7 deletions
diff --git a/‎Tests/NestedMatcher/ConfigurableUrlMatcherTest.php
Lines changed: 0 additions & 137 deletions b/‎Tests/NestedMatcher/ConfigurableUrlMatcherTest.php
Lines changed: 0 additions & 137 deletions
diff --git a/‎composer.json
Lines changed: 3 additions & 3 deletions b/‎composer.json
Lines changed: 3 additions & 3 deletions
@@ -5,7 +5,6 @@ php:
     - 5.4
 
 env:
-  - SYMFONY_VERSION=2.1.*
   - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=dev-master
 
 
@@ -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);
     }
 
@@ -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"
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`"minimum-stability": "dev",`
`15`	`15`	`"require": {`
`16`	`16`	`"php": ">=5.3.2",`
`17`		`- "symfony/routing": ">=2.1,<2.3-dev",`
`18`		`- "symfony/http-kernel": ">=2.1,<2.3-dev"`
	`17`	`+ "symfony/routing": ">=2.2,<2.3-dev",`
	`18`	`+ "symfony/http-kernel": ">=2.2,<2.3-dev"`
`19`	`19`	`},`
`20`	`20`	`"suggest": {`
`21`	`21`	`"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 @@`
`26`	`26`	`"target-dir": "Symfony/Cmf/Component/Routing",`
`27`	`27`	`"extra": {`
`28`	`28`	`"branch-alias": {`
`29`		`- "dev-master": "1.0-dev"`
	`29`	`+ "dev-master": "1.1-dev"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`