From 3675428ecc2758579bc90c3402984fce1220059c Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 11:47:03 +0200 Subject: [PATCH 1/2] update CartAdd form --- core/lib/Thelia/Form/CartAdd.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Form/CartAdd.php b/core/lib/Thelia/Form/CartAdd.php index fbecd25e1..53496c513 100755 --- a/core/lib/Thelia/Form/CartAdd.php +++ b/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( From 541bd3a4da5d2306ee460a941a781fd8daa54ee3 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 16 Sep 2013 11:59:56 +0200 Subject: [PATCH 2/2] debugbar log query also use Tlog --- .../modules/DebugBar/DataCollector/PropelCollector.php | 10 +++++++++- local/modules/DebugBar/Listeners/DebugBarListeners.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/local/modules/DebugBar/DataCollector/PropelCollector.php b/local/modules/DebugBar/DataCollector/PropelCollector.php index b0d503b18..dff0e6871 100644 --- a/local/modules/DebugBar/DataCollector/PropelCollector.php +++ b/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); + } } /** diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php index f789a9a13..edcd5cb21 100644 --- a/local/modules/DebugBar/Listeners/DebugBarListeners.php +++ b/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())); } /**