Merge branch 'cleanmaster' into modules

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
This commit is contained in:
Etienne Roudeix
2013-12-16 09:57:35 +01:00
14 changed files with 46 additions and 18 deletions

View File

@@ -34,6 +34,11 @@ use Symfony\Component\HttpFoundation\Request as BaseRequest;
class Request extends BaseRequest
{
private $excludeContent = array(
'username',
'password'
);
public function getProductId()
{
return $this->get("product_id");
@@ -66,4 +71,17 @@ class Request extends BaseRequest
{
return parent::getSession();
}
public function toString($withContent = true)
{
$string =
sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
$this->headers."\r\n";
if (true === $withContent) {
$string .= $this->getContent();
}
return $string;
}
}