merged branch Tobion/hostname-serialize (PR #6008)

This PR was merged into the master branch.

Commits
-------

c865220 [Routing] fix missing hostname serialization in Route

Discussion
----------

[Routing] fix missing hostname serialization in Route
This commit is contained in:
Fabien Potencier 2012-11-14 07:11:14 +01:00
commit 777aa5085d

View File

@ -25,6 +25,11 @@ class Route implements \Serializable
*/ */
private $pattern; private $pattern;
/**
* @var string
*/
private $hostnamePattern;
/** /**
* @var array * @var array
*/ */
@ -45,11 +50,6 @@ class Route implements \Serializable
*/ */
private $compiled; private $compiled;
/**
* @var string
*/
private $hostnamePattern;
private static $compilers = array(); private static $compilers = array();
/** /**
@ -85,6 +85,7 @@ class Route implements \Serializable
{ {
return serialize(array( return serialize(array(
'pattern' => $this->pattern, 'pattern' => $this->pattern,
'hostnamePattern' => $this->hostnamePattern,
'defaults' => $this->defaults, 'defaults' => $this->defaults,
'requirements' => $this->requirements, 'requirements' => $this->requirements,
'options' => $this->options, 'options' => $this->options,
@ -95,6 +96,7 @@ class Route implements \Serializable
{ {
$data = unserialize($data); $data = unserialize($data);
$this->pattern = $data['pattern']; $this->pattern = $data['pattern'];
$this->hostnamePattern = $data['hostnamePattern'];
$this->defaults = $data['defaults']; $this->defaults = $data['defaults'];
$this->requirements = $data['requirements']; $this->requirements = $data['requirements'];
$this->options = $data['options']; $this->options = $data['options'];