Skip to content

Commit 0b37f82

Browse files
committed
starting version 1.1 with symfony 2.2 only. fix symfony#50
1 parent 0c16093 commit 0b37f82

File tree

7 files changed

+7
-219
lines changed

7 files changed

+7
-219
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ php:
55
- 5.4
66

77
env:
8-
- SYMFONY_VERSION=2.1.*
98
- SYMFONY_VERSION=2.2.*
109
- SYMFONY_VERSION=dev-master
1110

ChainRouter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ChainRouter implements RouterInterface, RequestMatcherInterface, WarmableI
3030
private $context;
3131

3232
/**
33-
* @var Symfony\Component\Routing\RouterInterface[]
33+
* @var \Symfony\Component\Routing\RouterInterface[]
3434
*/
3535
private $routers = array();
3636

DynamicRouter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
1111
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
1212
use Symfony\Component\Routing\RequestContextAwareInterface;
13+
use Symfony\Component\Routing\Exception\RouteNotFoundException;
1314
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
15+
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
1416

1517
use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
1618

NestedMatcher/ConfigurableUrlMatcher.php

Lines changed: 0 additions & 70 deletions
This file was deleted.

ProviderBasedGenerator.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,7 @@ public function generate($name, $parameters = array(), $absolute = false)
4343

4444
// the Route has a cache of its own and is not recompiled as long as it does not get modified
4545
$compiledRoute = $route->compile();
46-
47-
// handle symfony 2.1 and 2.2
48-
// getHostTokens exists only since 2.2
49-
$hostTokens = null;
50-
if (method_exists($compiledRoute, 'getHostTokens')) {
51-
$hostTokens = $compiledRoute->getHostTokens();
52-
}
46+
$hostTokens = $compiledRoute->getHostTokens();
5347

5448
return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $absolute, $hostTokens);
5549
}

Tests/NestedMatcher/ConfigurableUrlMatcherTest.php

Lines changed: 0 additions & 137 deletions
This file was deleted.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"minimum-stability": "dev",
1515
"require": {
1616
"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"
1919
},
2020
"autoload": {
2121
"psr-0": { "Symfony\\Cmf\\Component\\Routing": "" }
2222
},
2323
"target-dir": "Symfony/Cmf/Component/Routing",
2424
"extra": {
2525
"branch-alias": {
26-
"dev-master": "1.0-dev"
26+
"dev-master": "1.1-dev"
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)