Merge branch '2.5'
* 2.5: TwigExtractor tests require the Finder component [Routing] fix BC Conflicts: src/Symfony/Bridge/Twig/composer.json
This commit is contained in:
commit
923c13f974
@ -21,6 +21,7 @@
|
||||
"twig/twig": "~1.12"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/finder": "~2.3",
|
||||
"symfony/form": "~2.6",
|
||||
"symfony/http-kernel": "~2.2",
|
||||
"symfony/routing": "~2.2",
|
||||
@ -34,6 +35,7 @@
|
||||
"symfony/expression-language": "~2.4"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/finder": "",
|
||||
"symfony/form": "For using the FormExtension",
|
||||
"symfony/http-kernel": "For using the HttpKernelExtension",
|
||||
"symfony/routing": "For using the RoutingExtension",
|
||||
|
@ -61,6 +61,9 @@ class Route implements \Serializable
|
||||
*/
|
||||
private $compiled;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private $condition;
|
||||
|
||||
/**
|
||||
@ -130,8 +133,10 @@ class Route implements \Serializable
|
||||
$this->options = $data['options'];
|
||||
$this->schemes = $data['schemes'];
|
||||
$this->methods = $data['methods'];
|
||||
$this->condition = $data['condition'];
|
||||
|
||||
if (isset($data['condition'])) {
|
||||
$this->condition = $data['condition'];
|
||||
}
|
||||
if (isset($data['compiled'])) {
|
||||
$this->compiled = $data['compiled'];
|
||||
}
|
||||
|
Reference in New Issue
Block a user