Merge remote-tracking branch 'origin/master'

core/lib/Thelia/Form/CartAdd.php

@@ -84,7 +84,7 @@ class CartAdd extends BaseForm
                 "required" => true
 
             ))
-            ->add("quantity", "text", array(
+            ->add("quantity", "number", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
                     new Constraints\Callback(array("methods" => array(

local/modules/DebugBar/DataCollector/PropelCollector.php

@@ -40,7 +40,9 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa
 
     protected $peakMemory = 0;
 
-    public function __construct()
+    protected $alternativeLogger;
+
+    public function __construct(LoggerInterface $alternativeLogger = null)
     {
         $serviceContainer = Propel::getServiceContainer();
         $serviceContainer->setLogger('defaultLogger', $this);
@@ -54,6 +56,8 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa
             'commit',
             'rollBack',
         ));
+
+        $this->alternativeLogger = $alternativeLogger;
     }
 
     /**
@@ -118,6 +122,10 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa
         list($sql, $duration_str) = $this->parseAndLogSqlQuery($message);
 
         $message = "$sql ($duration_str)";
+
+        if ($this->alternativeLogger) {
+            $this->alternativeLogger->info($message);
+        }
     }
 
     /**

local/modules/DebugBar/Listeners/DebugBarListeners.php

@@ -50,7 +50,7 @@ class DebugBarListeners extends BaseAction implements EventSubscriberInterface {
         //$debugBar->addCollector(new RequestDataCollector());
         $debugBar->addCollector(new TimeDataCollector());
         $debugBar->addCollector(new MemoryCollector());
-        $debugBar->addCollector(new PropelCollector());
+        $debugBar->addCollector(new PropelCollector(\Thelia\Log\Tlog::getInstance()));
     }
 
     /**