Merge branch 'cleanmaster' into modules

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

core/lib/Thelia/Controller/Admin/SessionController.php

@@ -99,7 +99,7 @@ class SessionController extends BaseAdminController
             $this->getSecurityContext()->setAdminUser($user);
 
             // Log authentication success
-            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user);
+            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user, false);
 
             /**
              * FIXME: we have tou find a way to send cookie

core/lib/Thelia/Controller/BaseController.php

@@ -147,7 +147,7 @@ abstract class BaseController extends ContainerAware
     }
 
     /**
-     * @return \Symfony\Component\HttpFoundation\Request
+     * @return \Thelia\Core\HttpFoundation\Request
      */
     protected function getRequest()
     {

core/lib/Thelia/Core/HttpFoundation/Request.php

@@ -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;
+    }
 }

core/lib/Thelia/Model/AdminLog.php

@@ -18,7 +18,7 @@ class AdminLog extends BaseAdminLog
      * @param Request    $request
      * @param Base\Admin $adminUser
      */
-    public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null) {
+    public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true) {
 
 		$log = new AdminLog();
 
@@ -29,7 +29,7 @@ class AdminLog extends BaseAdminLog
 	       	->setResource($resource)
 	       	->setAction($action)
             ->setMessage($message)
-	       	->setRequest($request->__toString())
+	       	->setRequest($request->toString($withRequestContent))
 	    ;
 
         try {

core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

@@ -3,11 +3,10 @@ namespace Thelia\Tests\Action;
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\ProductQuery;
 use Thelia\Model\RewritingUrlQuery;
 use Thelia\Model\ConfigQuery;
-use Thelia\Model\ProductQuery;
 use Thelia\Rewriting\RewritingResolver;
-use Thelia\Tools\URL;
 
 /**
  * Class RewrittenUrlTestTrait