TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cs and refactor FormFirewall raw values usage

Browse Source 
modified:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewallQuery.php
	modified:   core/lib/Thelia/Model/Tax.php
This commit is contained in:
lovenunu
2014-07-14 21:06:11 +02:00
committed by Benjamin Perche
parent 5f6871154c
commit 13cb3dbbdc
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/lib/Thelia/Form/FirewallForm.php
View File

@@ -22,8 +22,14 @@ use Thelia\Model\FormFirewallQuery;
*/ */
abstract class FirewallForm extends BaseForm abstract class FirewallForm extends BaseForm
{ {
/**
* Those values are for a "normal" security context
*/
const DEFAULT_TIME_TO_WAIT = 1;
const DEFAULT_ATTEMPTS = 3;
/** @var \Thelia\Model\FormFirewall */ /** @var \Thelia\Model\FormFirewall */
protected static $cachedInstance; protected static $cachedInstance;
public function __construct(Request $request, $type = "form", $data = array(), $options = array()) public function __construct(Request $request, $type = "form", $data = array(), $options = array())
{ {
@@ -81,7 +87,7 @@ abstract class FirewallForm extends BaseForm
*/ */
public function getConfigTime() public function getConfigTime()
{ {
return ConfigQuery::read("form_firewall_time_to_wait", 1); return ConfigQuery::read("form_firewall_time_to_wait", static::DEFAULT_TIME_TO_WAIT);
} }
/** /**
@@ -91,6 +97,6 @@ abstract class FirewallForm extends BaseForm
*/ */
public function getConfigAttempts() public function getConfigAttempts()
{ {
return ConfigQuery::read("form_firewall_attempts", 2); return ConfigQuery::read("form_firewall_attempts", static::DEFAULT_ATTEMPTS);
} }
} }

1
core/lib/Thelia/Model/FormFirewallQuery.php
View File

@@ -4,7 +4,6 @@ namespace Thelia\Model;
use Thelia\Model\Base\FormFirewallQuery as BaseFormFirewallQuery; use Thelia\Model\Base\FormFirewallQuery as BaseFormFirewallQuery;
/** /**
* Skeleton subclass for performing query and update operations on the 'form_firewall' table. * Skeleton subclass for performing query and update operations on the 'form_firewall' table.
* *

6
core/lib/Thelia/Model/Tax.php
View File

@@ -59,14 +59,14 @@ class Tax extends BaseTax
if (!class_exists($class)) { if (!class_exists($class)) {
throw new TaxEngineException('Recorded type `' . $class . '` does not exists', TaxEngineException::BAD_RECORDED_TYPE); throw new TaxEngineException('Recorded type `' . $class . '` does not exists', TaxEngineException::BAD_RECORDED_TYPE);
} }
/** @var \Thelia\TaxEngine\BaseTaxType $instance */ /** @var \Thelia\TaxEngine\BaseTaxType $instance */
$instance = new $class; $instance = new $class;
if (!$instance instanceof BaseTaxType) { if (!$instance instanceof BaseTaxType) {
throw new TaxEngineException('Recorded type `' . $class . '` does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE); throw new TaxEngineException('Recorded type `' . $class . '` does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE);
} }
$instance->loadRequirements($this->getRequirements()); $instance->loadRequirements($this->getRequirements());
return $instance; return $instance;
} }