fixed wrong merge
This commit is contained in:
parent
d10dec9bf3
commit
59409b47c8
@ -266,13 +266,8 @@ class Router implements RouterInterface
|
|||||||
} else {
|
} else {
|
||||||
$class = $this->options['generator_cache_class'];
|
$class = $this->options['generator_cache_class'];
|
||||||
$cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
|
$cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
|
||||||
<<<<<<< HEAD
|
|
||||||
if (!$cache->isFresh($class)) {
|
|
||||||
$dumper = $this->getGeneratorDumperInstance();
|
|
||||||
=======
|
|
||||||
if (!$cache->isFresh()) {
|
if (!$cache->isFresh()) {
|
||||||
$dumper = new $this->options['generator_dumper_class']($this->getRouteCollection());
|
$dumper = $this->getGeneratorDumperInstance();
|
||||||
>>>>>>> 2.3
|
|
||||||
|
|
||||||
$options = array(
|
$options = array(
|
||||||
'class' => $class,
|
'class' => $class,
|
||||||
|
Reference in New Issue
Block a user