diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Routing] removed unused property of Router

Browse Source
This commit is contained in:
Tobias Schultze 2012-05-22 02:28:43 +02:00
parent e4e3ce6cc2
commit 53aaf76ad0
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
View File

@ -33,15 +33,13 @@ class Router extends BaseRouter implements WarmableInterface
* @param mixed $resource The main resource to load * @param mixed $resource The main resource to load
* @param array $options An array of options * @param array $options An array of options
* @param RequestContext $context The context * @param RequestContext $context The context
* @param array $defaults The default values
*/ */
public function __construct(ContainerInterface $container, $resource, array $options = array(), RequestContext $context = null, array $defaults = array()) public function __construct(ContainerInterface $container, $resource, array $options = array(), RequestContext $context = null)
{ {
$this->container = $container; $this->container = $container;
$this->resource = $resource; $this->resource = $resource;
$this->context = null === $context ? new RequestContext() : $context; $this->context = null === $context ? new RequestContext() : $context;
$this->defaults = $defaults;
$this->setOptions($options); $this->setOptions($options);
} }

13
src/Symfony/Component/Routing/Router.php
View File

@ -24,7 +24,6 @@ class Router implements RouterInterface
{ {
protected $matcher; protected $matcher;
protected $generator; protected $generator;
protected $defaults;
protected $context; protected $context;
protected $loader; protected $loader;
protected $collection; protected $collection;
@ -38,14 +37,12 @@ class Router implements RouterInterface
* @param mixed $resource The main resource to load * @param mixed $resource The main resource to load
* @param array $options An array of options * @param array $options An array of options
* @param RequestContext $context The context * @param RequestContext $context The context
* @param array $defaults The default values
*/ */
public function __construct(LoaderInterface $loader, $resource, array $options = array(), RequestContext $context = null, array $defaults = array()) public function __construct(LoaderInterface $loader, $resource, array $options = array(), RequestContext $context = null)
{ {
$this->loader = $loader; $this->loader = $loader;
$this->resource = $resource; $this->resource = $resource;
$this->context = null === $context ? new RequestContext() : $context; $this->context = null === $context ? new RequestContext() : $context;
$this->defaults = $defaults;
$this->setOptions($options); $this->setOptions($options);
} }
@ -195,7 +192,7 @@ class Router implements RouterInterface
} }
if (null === $this->options['cache_dir'] || null === $this->options['matcher_cache_class']) { if (null === $this->options['cache_dir'] || null === $this->options['matcher_cache_class']) {
return $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context, $this->defaults); return $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
} }
$class = $this->options['matcher_cache_class']; $class = $this->options['matcher_cache_class'];
@ -213,7 +210,7 @@ class Router implements RouterInterface
require_once $cache; require_once $cache;
return $this->matcher = new $class($this->context, $this->defaults); return $this->matcher = new $class($this->context);
} }
/** /**
@ -228,7 +225,7 @@ class Router implements RouterInterface
} }
if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) { if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) {
return $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->defaults); return $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context);
} }
$class = $this->options['generator_cache_class']; $class = $this->options['generator_cache_class'];
@ -246,6 +243,6 @@ class Router implements RouterInterface
require_once $cache; require_once $cache;
return $this->generator = new $class($this->context, $this->defaults); return $this->generator = new $class($this->context);
} }
} }